Attachment #22997 for bug #46351

View | Details | Raw Unified | Return to bug 46351
Collapse All | Expand All





  <target name="build-only" depends="build-prepare,compile,package" />

	<!-- -->
	<patternset id="files.annotations-api">
        <include name="javax/annotation/*" />
        <include name="javax/annotation/security/*" />
        <include name="javax/ejb/*" />
        <include name="javax/persistence/*" />
        <include name="javax/xml/ws/*" />
	</patternset>

	<patternset id="files.servlet-api">
        <include name="javax/servlet/*" />
        <include name="javax/servlet/http/*" />
        <include name="javax/servlet/resources/*" />
	</patternset>
	
	<patternset id="files.jsp-api">
        <include name="javax/servlet/jsp/**" />
	</patternset>

	<patternset id="files.el-api">
		<include name="javax/el/*" />
	</patternset>

	<patternset id="files.bootstrap">
        <include name="org/apache/catalina/startup/Bootstrap.*" />
        <include name="org/apache/catalina/startup/catalina.properties" />
        <include name="org/apache/catalina/startup/CatalinaProperties.*" />
        <include name="org/apache/catalina/startup/ClassLoaderFactory.*" />
        <include name="org/apache/catalina/startup/Tool.*" />
        <include name="org/apache/catalina/loader/StandardClassLoader*.*" />
        <include name="org/apache/catalina/loader/Extension.*" />
        <include name="org/apache/catalina/loader/Reloader.*" />
        <include name="org/apache/catalina/security/SecurityClassLoad.*" />
        <include name="org/apache/naming/JndiPermission.*" />
        <include name="org/apache/tomcat/util/compat/*" />
	</patternset>

	<patternset id="files.tomcat-juli">
        <include name="org/apache/juli/**" />
	</patternset>

	<patternset id="files.catalina">
        <include name="org/apache/*" />
        <include name="org/apache/catalina/**" />
        <include name="org/apache/naming/**" />
        <!-- Modules -->
        <exclude name="org/apache/catalina/ant/**" />
        <exclude name="org/apache/catalina/cluster/**" />
        <exclude name="org/apache/catalina/ha/**" />
        <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
        <exclude name="org/apache/catalina/tribes/**" />
        <exclude name="org/apache/catalina/launcher/**" />
        <exclude name="org/apache/catalina/storeconfig/**" />
        <exclude name="org/apache/naming/factory/webservices/**" />
	</patternset>

	<patternset id="files.catalina-tribes">
        <include name="org/apache/catalina/tribes/**" />
	</patternset>

	<patternset id="files.catalina-ha">
        <include name="org/apache/catalina/ha/**" />
	</patternset>

	<patternset id="files.catalina-ant">
        <include name="org/apache/catalina/ant/*" />
        <include name="org/apache/catalina/ant/jmx/*" />
        <include name="org/apache/catalina/util/Base64.*" />
	</patternset>

	<patternset id="files.tomcat-coyote">
	    <include name="org/apache/coyote/**" />
	    <include name="org/apache/tomcat/jni/**" />
	    <include name="org/apache/jk/**" />
	    <include name="org/apache/tomcat/util/**" />
	</patternset>

	<patternset id="files.jasper">
        <include name="org/apache/*" />
        <include name="org/apache/jasper/**" />
	</patternset>
	
	<patternset id="files.jasper-el">
	    <include name="org/apache/el/**" />
	</patternset>


	<macrodef name="jarIt" description="utility macro for standard JAR packaging">
		<attribute name="jarfile" description="the name of the JAR file to create"/>
		<attribute name="filesId" description="the patternset id of the files to use"/>
		<sequential>
		    <jar  jarfile="@{jarfile}">
		      <fileset dir="${tomcat.classes}">
		      	<patternset refid="@{filesId}"/>
		        <!-- Javadoc and i18n exclusions -->
		        <exclude name="**/package.html" />
		        <exclude name="**/LocalStrings_*" />
		      </fileset>
		    </jar>
		</sequential>
	</macrodef>
	
    <target name="package" >
    <!-- Common filtering tokens for JAR manifests-->
    <filter token="source.jdk" value="${compile.source}"/>
    <filter token="target.jdk" value="${compile.target}"/>

    <filter token="target.jdk" value="${compile.target}"/>

    <!-- Common Annotations 1.0 JAR File -->
    <jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"/>
      <fileset dir="${tomcat.classes}">
        <include name="javax/annotation/*" />
        <include name="javax/annotation/security/*" />
        <include name="javax/ejb/*" />
        <include name="javax/persistence/*" />
        <include name="javax/xml/ws/*" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- Servlet 2.5 Implementation JAR File -->
    <filter token="implementation.revision"

        <include name="META-INF/**" />
      </fileset>
      <fileset dir="${tomcat.classes}">
      	<patternset refid="files.servlet-api"/>
        <include name="javax/servlet/http/*" />
        <include name="javax/servlet/resources/*" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />

        <include name="META-INF/**" />
      </fileset>
      <fileset dir="${tomcat.classes}">
      	<patternset refid="files.jsp-api"/>
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />

    </jar>

    <!-- JSP 2.1 EL Implementation JAR File -->
    <jarIt jarfile="${el-api.jar}" filesId="files.el-api"/>
      <fileset dir="${tomcat.classes}">
        <include name="javax/el/*" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- Bootstrap JAR File -->
    <copy tofile="res/manifest.tmp"

    <jar jarfile="${bootstrap.jar}"
        manifest="res/manifest.tmp">
      <fileset dir="${tomcat.classes}">
      	<patternset refid="files.bootstrap"/>
        <include name="org/apache/catalina/startup/catalina.properties" />
        <include name="org/apache/catalina/startup/CatalinaProperties.class" />
        <include name="org/apache/catalina/startup/ClassLoaderFactory.class" />
        <include name="org/apache/catalina/startup/Tool.class" />
        <include name="org/apache/catalina/loader/StandardClassLoader*.class" />
        <include name="org/apache/catalina/loader/Extension.class" />
        <include name="org/apache/catalina/loader/Reloader.class" />
        <include name="org/apache/catalina/security/SecurityClassLoad.class" />
        <include name="org/apache/naming/JndiPermission.class" />
        <include name="org/apache/tomcat/util/compat/*" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />

    </jar>

    <!-- Tomcat-juli JAR File -->
    <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli"/>
      <fileset dir="${tomcat.classes}">
        <include name="org/apache/juli/**" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- Catalina Main JAR File -->
    <jarIt jarfile="${catalina.jar}" filesId="files.catalina"/>
      <fileset dir="${tomcat.classes}">
        <include name="org/apache/*" />
        <include name="org/apache/catalina/**" />
        <include name="org/apache/naming/**" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
        <!-- Modules -->
        <exclude name="org/apache/catalina/ant/**" />
        <exclude name="org/apache/catalina/cluster/**" />
        <exclude name="org/apache/catalina/ha/**" />
        <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
        <exclude name="org/apache/catalina/tribes/**" />
        <exclude name="org/apache/catalina/launcher/**" />
        <exclude name="org/apache/catalina/storeconfig/**" />
        <exclude name="org/apache/naming/factory/webservices/**" />
      </fileset>
    </jar>

    <!-- Catalina GroupCom/Tribes JAR File -->
    <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"/>

	<!-- Catalina Cluster/HA JAR File -->
    <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"/>
        <!-- Modules -->
        <include name="org/apache/catalina/tribes/**" />
      </fileset>
    </jar>
    <!-- Catalina Cluster/HA JAR File -->
    <jar jarfile="${catalina-ha.jar}">
      <fileset dir="${tomcat.classes}">
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
        <!-- Modules -->
        <include name="org/apache/catalina/ha/**" />
      </fileset>
    </jar>

    <!-- Catalina Ant Tasks JAR File -->
    <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"/>
      <fileset dir="${tomcat.classes}">
        <include name="org/apache/catalina/ant/*" />
        <include name="org/apache/catalina/ant/jmx/*" />
        <include name="org/apache/catalina/util/Base64.class" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- Protocol handlers - Coyote -->
    <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"/>
      <fileset dir="${tomcat.classes}">
        <include name="org/apache/coyote/**" />
        <include name="org/apache/tomcat/jni/**" />
        <include name="org/apache/jk/**" />
        <include name="org/apache/tomcat/util/**" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- Jasper Implementation JAR File -->
    <jarIt jarfile="${jasper.jar}" filesId="files.jasper"/>
      <fileset dir="${tomcat.classes}">
        <include name="org/apache/*" />
        <include name="org/apache/jasper/**" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- Jasper EL Implementation JAR File -->
    <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el"/>
      <fileset dir="${tomcat.classes}">
        <include name="org/apache/el/**" />
        <!-- Javadoc and i18n exclusions -->
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
      </fileset>
    </jar>

    <!-- i18n JARs -->
    <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar">




    <delete file="${file}.asc"/>
  </target>
  
	<macrodef name="doMavenDeploy">
		<attribute name="artifactId"/>
		<attribute name="jarFileName" default="@{artifactId}.jar" description="only need to be specified if not same as artifactId"/>
		<sequential>
		    <antcall target="maven-deploy">
		      <param name="file" value="${tomcat.lib.path}/@{jarFileName}"/>
		      <param name="groupId" value="org.apache.tomcat"/>
		      <param name="artifactId" value="@{artifactId}"/>
		      <param name="pom" value="${tomcat.pom.path}/@{artifactId}.pom"/>
		    </antcall>
		</sequential>
	</macrodef>
	
  <target name="generic-deploy" depends="init-maven">
  	<doMavenDeploy artifactId="annotations-api"/> <!--Deploy annotations-->
  	<doMavenDeploy artifactId="servlet-api"/> <!--Deploy Servlet api-->
  	<doMavenDeploy artifactId="el-api"/> <!--Deploy expression lanaguage api-->
  	<doMavenDeploy artifactId="jsp-api"/> <!--Deploy JSP api-->
  	<doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar"/> <!--Deploy JULI-->
  	<doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/> <!--Deploy Tribes-->
  	<doMavenDeploy artifactId="jasper-el"/> <!--Deploy Jasper EL-->
  	<doMavenDeploy artifactId="jasper-jdt"/> <!--Deploy Jasper JDT-->
  	<doMavenDeploy artifactId="coyote" jarFileName="tomcat-coyote.jar"/> <!--Deploy Coyote-->
  	<doMavenDeploy artifactId="catalina"/> <!--Deploy Catalina-->
  	<doMavenDeploy artifactId="catalina-ha"/> <!--Deploy Catalina-HA-->
  	<doMavenDeploy artifactId="jasper"/> <!--Deploy Jasper -->
  	<doMavenDeploy artifactId="dbcp" jarFileName="tomcat-dbcp.jar"/> <!--Deploy DBCP-->
      <param name="file" value="${tomcat.lib.path}/el-api.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="el-api"/>
      <param name="pom" value="${tomcat.pom.path}/el-api.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy JSP api-->
      <param name="file" value="${tomcat.lib.path}/jsp-api.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="jsp-api"/>
      <param name="pom" value="${tomcat.pom.path}/jsp-api.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy JULI-->
      <param name="file" value="${tomcat.bin.path}/tomcat-juli.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="juli"/>
      <param name="pom" value="${tomcat.pom.path}/juli.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Tribes-->
      <param name="file" value="${tomcat.lib.path}/catalina-tribes.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="tribes"/>
      <param name="pom" value="${tomcat.pom.path}/tribes.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Jasper EL-->
      <param name="file" value="${tomcat.lib.path}/jasper-el.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="jasper-el"/>
      <param name="pom" value="${tomcat.pom.path}/jasper-el.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Jasper JDT-->
      <param name="file" value="${tomcat.lib.path}/jasper-jdt.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="jasper-jdt"/>
      <param name="pom" value="${tomcat.pom.path}/jasper-jdt.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Coyote-->
      <param name="file" value="${tomcat.lib.path}/tomcat-coyote.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="coyote"/>
      <param name="pom" value="${tomcat.pom.path}/coyote.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Catalina-->
      <param name="file" value="${tomcat.lib.path}/catalina.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="catalina"/>
      <param name="pom" value="${tomcat.pom.path}/catalina.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Catalina-HA-->
      <param name="file" value="${tomcat.lib.path}/catalina-ha.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="catalina-ha"/>
      <param name="pom" value="${tomcat.pom.path}/catalina-ha.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Jasper-->
      <param name="file" value="${tomcat.lib.path}/jasper.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="jasper"/>
      <param name="pom" value="${tomcat.pom.path}/jasper.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy DBCP-->
      <param name="file" value="${tomcat.lib.path}/tomcat-dbcp.jar"/>
      <param name="groupId" value="org.apache.tomcat"/>
      <param name="artifactId" value="dbcp"/>
      <param name="pom" value="${tomcat.pom.path}/dbcp.pom"/>
    </antcall>
    <antcall target="maven-deploy"><!--Deploy Extras Juli-->
      <param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
      <param name="groupId" value="org.apache.tomcat.extras"/>

Return to bug 46351

Lines 117-201 Link Here

(-)/home/marc/EWorkspaceOS/tomcat-trunk/res/maven/mvn-pub.xml (-78 / +26 lines)
117	<delete file="${file}.asc"/>	117	<delete file="${file}.asc"/>
118	</target>	118	</target>
119		119
		120	<macrodef name="doMavenDeploy">
		121	<attribute name="artifactId"/>
		122	<attribute name="jarFileName" default="@{artifactId}.jar" description="only need to be specified if not same as artifactId"/>
		123	<sequential>
		124	<antcall target="maven-deploy">
		125	<param name="file" value="${tomcat.lib.path}/@{jarFileName}"/>
		126	<param name="groupId" value="org.apache.tomcat"/>
		127	<param name="artifactId" value="@{artifactId}"/>
		128	<param name="pom" value="${tomcat.pom.path}/@{artifactId}.pom"/>
		129	</antcall>
		130	</sequential>
		131	</macrodef>
		132
120	<target name="generic-deploy" depends="init-maven">	133	<target name="generic-deploy" depends="init-maven">
121	<antcall target="maven-deploy"><!--Deploy annotations-->	134	<doMavenDeploy artifactId="annotations-api"/> <!--Deploy annotations-->
122	<param name="file" value="${tomcat.lib.path}/annotations-api.jar"/>	135	<doMavenDeploy artifactId="servlet-api"/> <!--Deploy Servlet api-->
123	<param name="groupId" value="org.apache.tomcat"/>	136	<doMavenDeploy artifactId="el-api"/> <!--Deploy expression lanaguage api-->
124	<param name="artifactId" value="annotations-api"/>	137	<doMavenDeploy artifactId="jsp-api"/> <!--Deploy JSP api-->
125	<param name="pom" value="${tomcat.pom.path}/annotations-api.pom"/>	138	<doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar"/> <!--Deploy JULI-->
126	</antcall>	139	<doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/> <!--Deploy Tribes-->
127	<antcall target="maven-deploy"><!--Deploy Servlet api-->	140	<doMavenDeploy artifactId="jasper-el"/> <!--Deploy Jasper EL-->
128	<param name="file" value="${tomcat.lib.path}/servlet-api.jar"/>	141	<doMavenDeploy artifactId="jasper-jdt"/> <!--Deploy Jasper JDT-->
129	<param name="groupId" value="org.apache.tomcat"/>	142	<doMavenDeploy artifactId="coyote" jarFileName="tomcat-coyote.jar"/> <!--Deploy Coyote-->
130	<param name="artifactId" value="servlet-api"/>	143	<doMavenDeploy artifactId="catalina"/> <!--Deploy Catalina-->
131	<param name="pom" value="${tomcat.pom.path}/servlet-api.pom"/>	144	<doMavenDeploy artifactId="catalina-ha"/> <!--Deploy Catalina-HA-->
132	</antcall>	145	<doMavenDeploy artifactId="jasper"/> <!--Deploy Jasper -->
133	<antcall target="maven-deploy"><!--Deploy expression lanaguage api-->	146	<doMavenDeploy artifactId="dbcp" jarFileName="tomcat-dbcp.jar"/> <!--Deploy DBCP-->
134	<param name="file" value="${tomcat.lib.path}/el-api.jar"/>
135	<param name="groupId" value="org.apache.tomcat"/>
136	<param name="artifactId" value="el-api"/>
137	<param name="pom" value="${tomcat.pom.path}/el-api.pom"/>
138	</antcall>
139	<antcall target="maven-deploy"><!--Deploy JSP api-->
140	<param name="file" value="${tomcat.lib.path}/jsp-api.jar"/>
141	<param name="groupId" value="org.apache.tomcat"/>
142	<param name="artifactId" value="jsp-api"/>
143	<param name="pom" value="${tomcat.pom.path}/jsp-api.pom"/>
144	</antcall>
145	<antcall target="maven-deploy"><!--Deploy JULI-->
146	<param name="file" value="${tomcat.bin.path}/tomcat-juli.jar"/>
147	<param name="groupId" value="org.apache.tomcat"/>
148	<param name="artifactId" value="juli"/>
149	<param name="pom" value="${tomcat.pom.path}/juli.pom"/>
150	</antcall>
151	<antcall target="maven-deploy"><!--Deploy Tribes-->
152	<param name="file" value="${tomcat.lib.path}/catalina-tribes.jar"/>
153	<param name="groupId" value="org.apache.tomcat"/>
154	<param name="artifactId" value="tribes"/>
155	<param name="pom" value="${tomcat.pom.path}/tribes.pom"/>
156	</antcall>
157	<antcall target="maven-deploy"><!--Deploy Jasper EL-->
158	<param name="file" value="${tomcat.lib.path}/jasper-el.jar"/>
159	<param name="groupId" value="org.apache.tomcat"/>
160	<param name="artifactId" value="jasper-el"/>
161	<param name="pom" value="${tomcat.pom.path}/jasper-el.pom"/>
162	</antcall>
163	<antcall target="maven-deploy"><!--Deploy Jasper JDT-->
164	<param name="file" value="${tomcat.lib.path}/jasper-jdt.jar"/>
165	<param name="groupId" value="org.apache.tomcat"/>
166	<param name="artifactId" value="jasper-jdt"/>
167	<param name="pom" value="${tomcat.pom.path}/jasper-jdt.pom"/>
168	</antcall>
169	<antcall target="maven-deploy"><!--Deploy Coyote-->
170	<param name="file" value="${tomcat.lib.path}/tomcat-coyote.jar"/>
171	<param name="groupId" value="org.apache.tomcat"/>
172	<param name="artifactId" value="coyote"/>
173	<param name="pom" value="${tomcat.pom.path}/coyote.pom"/>
174	</antcall>
175	<antcall target="maven-deploy"><!--Deploy Catalina-->
176	<param name="file" value="${tomcat.lib.path}/catalina.jar"/>
177	<param name="groupId" value="org.apache.tomcat"/>
178	<param name="artifactId" value="catalina"/>
179	<param name="pom" value="${tomcat.pom.path}/catalina.pom"/>
180	</antcall>
181	<antcall target="maven-deploy"><!--Deploy Catalina-HA-->
182	<param name="file" value="${tomcat.lib.path}/catalina-ha.jar"/>
183	<param name="groupId" value="org.apache.tomcat"/>
184	<param name="artifactId" value="catalina-ha"/>
185	<param name="pom" value="${tomcat.pom.path}/catalina-ha.pom"/>
186	</antcall>
187	<antcall target="maven-deploy"><!--Deploy Jasper-->
188	<param name="file" value="${tomcat.lib.path}/jasper.jar"/>
189	<param name="groupId" value="org.apache.tomcat"/>
190	<param name="artifactId" value="jasper"/>
191	<param name="pom" value="${tomcat.pom.path}/jasper.pom"/>
192	</antcall>
193	<antcall target="maven-deploy"><!--Deploy DBCP-->
194	<param name="file" value="${tomcat.lib.path}/tomcat-dbcp.jar"/>
195	<param name="groupId" value="org.apache.tomcat"/>
196	<param name="artifactId" value="dbcp"/>
197	<param name="pom" value="${tomcat.pom.path}/dbcp.pom"/>
198	</antcall>
199	<antcall target="maven-deploy"><!--Deploy Extras Juli-->	147	<antcall target="maven-deploy"><!--Deploy Extras Juli-->
200	<param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>	148	<param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
201	<param name="groupId" value="org.apache.tomcat.extras"/>	149	<param name="groupId" value="org.apache.tomcat.extras"/>

Lines 157-163 Link Here

(-)/home/marc/EWorkspaceOS/tomcat-trunk/build.xml (-118 / +118 lines)
157		157
158	<target name="build-only" depends="build-prepare,compile,package" />	158	<target name="build-only" depends="build-prepare,compile,package" />
159		159
160	<target name="package" >	160	<!-- -->
		161	<patternset id="files.annotations-api">
		162	<include name="javax/annotation/*" />
		163	<include name="javax/annotation/security/*" />
		164	<include name="javax/ejb/*" />
		165	<include name="javax/persistence/*" />
		166	<include name="javax/xml/ws/*" />
		167	</patternset>
		168
		169	<patternset id="files.servlet-api">
		170	<include name="javax/servlet/*" />
		171	<include name="javax/servlet/http/*" />
		172	<include name="javax/servlet/resources/*" />
		173	</patternset>
		174
		175	<patternset id="files.jsp-api">
		176	<include name="javax/servlet/jsp/**" />
		177	</patternset>
		178
		179	<patternset id="files.el-api">
		180	<include name="javax/el/*" />
		181	</patternset>
		182
		183	<patternset id="files.bootstrap">
		184	<include name="org/apache/catalina/startup/Bootstrap.*" />
		185	<include name="org/apache/catalina/startup/catalina.properties" />
		186	<include name="org/apache/catalina/startup/CatalinaProperties.*" />
		187	<include name="org/apache/catalina/startup/ClassLoaderFactory.*" />
		188	<include name="org/apache/catalina/startup/Tool.*" />
		189	<include name="org/apache/catalina/loader/StandardClassLoader." />
		190	<include name="org/apache/catalina/loader/Extension.*" />
		191	<include name="org/apache/catalina/loader/Reloader.*" />
		192	<include name="org/apache/catalina/security/SecurityClassLoad.*" />
		193	<include name="org/apache/naming/JndiPermission.*" />
		194	<include name="org/apache/tomcat/util/compat/*" />
		195	</patternset>
		196
		197	<patternset id="files.tomcat-juli">
		198	<include name="org/apache/juli/**" />
		199	</patternset>
		200
		201	<patternset id="files.catalina">
		202	<include name="org/apache/*" />
		203	<include name="org/apache/catalina/**" />
		204	<include name="org/apache/naming/**" />
		205	<!-- Modules -->
		206	<exclude name="org/apache/catalina/ant/**" />
		207	<exclude name="org/apache/catalina/cluster/**" />
		208	<exclude name="org/apache/catalina/ha/**" />
		209	<exclude name="org/apache/catalina/mbeans/JmxRemote*" />
		210	<exclude name="org/apache/catalina/tribes/**" />
		211	<exclude name="org/apache/catalina/launcher/**" />
		212	<exclude name="org/apache/catalina/storeconfig/**" />
		213	<exclude name="org/apache/naming/factory/webservices/**" />
		214	</patternset>
		215
		216	<patternset id="files.catalina-tribes">
		217	<include name="org/apache/catalina/tribes/**" />
		218	</patternset>
		219
		220	<patternset id="files.catalina-ha">
		221	<include name="org/apache/catalina/ha/**" />
		222	</patternset>
		223
		224	<patternset id="files.catalina-ant">
225	<include name="org/apache/catalina/ant/*" />
226	<include name="org/apache/catalina/ant/jmx/*" />
227	<include name="org/apache/catalina/util/Base64.*" />
228	</patternset>
229
230	<patternset id="files.tomcat-coyote">
231	<include name="org/apache/coyote/**" />
232	<include name="org/apache/tomcat/jni/**" />
233	<include name="org/apache/jk/**" />
234	<include name="org/apache/tomcat/util/**" />
235	</patternset>
236
237	<patternset id="files.jasper">
238	<include name="org/apache/*" />
239	<include name="org/apache/jasper/**" />
240	</patternset>
241
242	<patternset id="files.jasper-el">
243	<include name="org/apache/el/**" />
244	</patternset>
245
246
247	<macrodef name="jarIt" description="utility macro for standard JAR packaging">
248	<attribute name="jarfile" description="the name of the JAR file to create"/>
249	<attribute name="filesId" description="the patternset id of the files to use"/>
250	<sequential>
251	<jar jarfile="@{jarfile}">
252	<fileset dir="${tomcat.classes}">
253	<patternset refid="@{filesId}"/>
254	<!-- Javadoc and i18n exclusions -->
255	<exclude name="**/package.html" />
256	<exclude name="*/LocalStrings_" />
257	</fileset>
258	</jar>
259	</sequential>
260	</macrodef>
261
262	<target name="package" >
161	<!-- Common filtering tokens for JAR manifests-->	263	<!-- Common filtering tokens for JAR manifests-->
162	<filter token="source.jdk" value="${compile.source}"/>	264	<filter token="source.jdk" value="${compile.source}"/>
163	<filter token="target.jdk" value="${compile.target}"/>	265	<filter token="target.jdk" value="${compile.target}"/>
Lines 163-180 Link Here
163	<filter token="target.jdk" value="${compile.target}"/>	265	<filter token="target.jdk" value="${compile.target}"/>
164		266
165	<!-- Common Annotations 1.0 JAR File -->	267	<!-- Common Annotations 1.0 JAR File -->
166	<jar jarfile="${annotations-api.jar}">	268	<jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"/>
167	<fileset dir="${tomcat.classes}">
168	<include name="javax/annotation/*" />
169	<include name="javax/annotation/security/*" />
170	<include name="javax/ejb/*" />
171	<include name="javax/persistence/*" />
172	<include name="javax/xml/ws/*" />
173	<!-- Javadoc and i18n exclusions -->
174	<exclude name="**/package.html" />
175	<exclude name="*/LocalStrings_" />
176	</fileset>
177	</jar>
178		269
179	<!-- Servlet 2.5 Implementation JAR File -->	270	<!-- Servlet 2.5 Implementation JAR File -->
180	<filter token="implementation.revision"	271	<filter token="implementation.revision"
Lines 189-197 Link Here
189	<include name="META-INF/**" />	280	<include name="META-INF/**" />
190	</fileset>	281	</fileset>
191	<fileset dir="${tomcat.classes}">	282	<fileset dir="${tomcat.classes}">
192	<include name="javax/servlet/*" />	283	<patternset refid="files.servlet-api"/>
193	<include name="javax/servlet/http/*" />
194	<include name="javax/servlet/resources/*" />
195	<!-- Javadoc and i18n exclusions -->	284	<!-- Javadoc and i18n exclusions -->
196	<exclude name="**/package.html" />	285	<exclude name="**/package.html" />
197	<exclude name="*/LocalStrings_" />	286	<exclude name="*/LocalStrings_" />
Lines 211-217 Link Here
211	<include name="META-INF/**" />	300	<include name="META-INF/**" />
212	</fileset>	301	</fileset>
213	<fileset dir="${tomcat.classes}">	302	<fileset dir="${tomcat.classes}">
214	<include name="javax/servlet/jsp/**" />	303	<patternset refid="files.jsp-api"/>
215	<!-- Javadoc and i18n exclusions -->	304	<!-- Javadoc and i18n exclusions -->
216	<exclude name="**/package.html" />	305	<exclude name="**/package.html" />
217	<exclude name="*/LocalStrings_" />	306	<exclude name="*/LocalStrings_" />
Lines 219-232 Link Here
219	</jar>	308	</jar>
220		309
221	<!-- JSP 2.1 EL Implementation JAR File -->	310	<!-- JSP 2.1 EL Implementation JAR File -->
222	<jar jarfile="${el-api.jar}">	311	<jarIt jarfile="${el-api.jar}" filesId="files.el-api"/>
223	<fileset dir="${tomcat.classes}">
224	<include name="javax/el/*" />
225	<!-- Javadoc and i18n exclusions -->
226	<exclude name="**/package.html" />
227	<exclude name="*/LocalStrings_" />
228	</fileset>
229	</jar>
230		312
231	<!-- Bootstrap JAR File -->	313	<!-- Bootstrap JAR File -->
232	<copy tofile="res/manifest.tmp"	314	<copy tofile="res/manifest.tmp"
Lines 237-253 Link Here
237	<jar jarfile="${bootstrap.jar}"	319	<jar jarfile="${bootstrap.jar}"
238	manifest="res/manifest.tmp">	320	manifest="res/manifest.tmp">
239	<fileset dir="${tomcat.classes}">	321	<fileset dir="${tomcat.classes}">
240	<include name="org/apache/catalina/startup/Bootstrap.class" />	322	<patternset refid="files.bootstrap"/>
241	<include name="org/apache/catalina/startup/catalina.properties" />
242	<include name="org/apache/catalina/startup/CatalinaProperties.class" />
243	<include name="org/apache/catalina/startup/ClassLoaderFactory.class" />
244	<include name="org/apache/catalina/startup/Tool.class" />
245	<include name="org/apache/catalina/loader/StandardClassLoader*.class" />
246	<include name="org/apache/catalina/loader/Extension.class" />
247	<include name="org/apache/catalina/loader/Reloader.class" />
248	<include name="org/apache/catalina/security/SecurityClassLoad.class" />
249	<include name="org/apache/naming/JndiPermission.class" />
250	<include name="org/apache/tomcat/util/compat/*" />
251	<!-- Javadoc and i18n exclusions -->	323	<!-- Javadoc and i18n exclusions -->
252	<exclude name="**/package.html" />	324	<exclude name="**/package.html" />
253	<exclude name="*/LocalStrings_" />	325	<exclude name="*/LocalStrings_" />
Lines 255-354 Link Here
255	</jar>	327	</jar>
256		328
257	<!-- Tomcat-juli JAR File -->	329	<!-- Tomcat-juli JAR File -->
258	<jar jarfile="${tomcat-juli.jar}">	330	<jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli"/>
259	<fileset dir="${tomcat.classes}">
260	<include name="org/apache/juli/**" />
261	<!-- Javadoc and i18n exclusions -->
262	<exclude name="**/package.html" />
263	<exclude name="*/LocalStrings_" />
264	</fileset>
265	</jar>
266		331
267	<!-- Catalina Main JAR File -->	332	<!-- Catalina Main JAR File -->
268	<jar jarfile="${catalina.jar}">	333	<jarIt jarfile="${catalina.jar}" filesId="files.catalina"/>
269	<fileset dir="${tomcat.classes}">
270	<include name="org/apache/*" />
271	<include name="org/apache/catalina/**" />
272	<include name="org/apache/naming/**" />
273	<!-- Javadoc and i18n exclusions -->
274	<exclude name="**/package.html" />
275	<exclude name="*/LocalStrings_" />
276	<!-- Modules -->
277	<exclude name="org/apache/catalina/ant/**" />
278	<exclude name="org/apache/catalina/cluster/**" />
279	<exclude name="org/apache/catalina/ha/**" />
280	<exclude name="org/apache/catalina/mbeans/JmxRemote*" />
281	<exclude name="org/apache/catalina/tribes/**" />
282	<exclude name="org/apache/catalina/launcher/**" />
283	<exclude name="org/apache/catalina/storeconfig/**" />
284	<exclude name="org/apache/naming/factory/webservices/**" />
285	</fileset>
286	</jar>
287		334
288	<!-- Catalina GroupCom/Tribes JAR File -->	335	<!-- Catalina GroupCom/Tribes JAR File -->
289	<jar jarfile="${catalina-tribes.jar}">	336	<jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"/>
290	<fileset dir="${tomcat.classes}">	337
291	<exclude name="**/package.html" />	338	<!-- Catalina Cluster/HA JAR File -->
292	<exclude name="*/LocalStrings_" />	339	<jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"/>
293	<!-- Modules -->
294	<include name="org/apache/catalina/tribes/**" />
295	</fileset>
296	</jar>
297	<!-- Catalina Cluster/HA JAR File -->
298	<jar jarfile="${catalina-ha.jar}">
299	<fileset dir="${tomcat.classes}">
300	<exclude name="**/package.html" />
301	<exclude name="*/LocalStrings_" />
302	<!-- Modules -->
303	<include name="org/apache/catalina/ha/**" />
304	</fileset>
305	</jar>
306		340
307	<!-- Catalina Ant Tasks JAR File -->	341	<!-- Catalina Ant Tasks JAR File -->
308	<jar jarfile="${catalina-ant.jar}">	342	<jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"/>
309	<fileset dir="${tomcat.classes}">
310	<include name="org/apache/catalina/ant/*" />
311	<include name="org/apache/catalina/ant/jmx/*" />
312	<include name="org/apache/catalina/util/Base64.class" />
313	<!-- Javadoc and i18n exclusions -->
314	<exclude name="**/package.html" />
315	<exclude name="*/LocalStrings_" />
316	</fileset>
317	</jar>
318		343
319	<!-- Protocol handlers - Coyote -->	344	<!-- Protocol handlers - Coyote -->
320	<jar jarfile="${tomcat-coyote.jar}">	345	<jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"/>
321	<fileset dir="${tomcat.classes}">
322	<include name="org/apache/coyote/**" />
323	<include name="org/apache/tomcat/jni/**" />
324	<include name="org/apache/jk/**" />
325	<include name="org/apache/tomcat/util/**" />
326	<!-- Javadoc and i18n exclusions -->
327	<exclude name="**/package.html" />
328	<exclude name="*/LocalStrings_" />
329	</fileset>
330	</jar>
331		346
332	<!-- Jasper Implementation JAR File -->	347	<!-- Jasper Implementation JAR File -->
333	<jar jarfile="${jasper.jar}">	348	<jarIt jarfile="${jasper.jar}" filesId="files.jasper"/>
334	<fileset dir="${tomcat.classes}">
335	<include name="org/apache/*" />
336	<include name="org/apache/jasper/**" />
337	<!-- Javadoc and i18n exclusions -->
338	<exclude name="**/package.html" />
339	<exclude name="*/LocalStrings_" />
340	</fileset>
341	</jar>
342		349
343	<!-- Jasper EL Implementation JAR File -->	350	<!-- Jasper EL Implementation JAR File -->
344	<jar jarfile="${jasper-el.jar}">	351	<jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el"/>
345	<fileset dir="${tomcat.classes}">
346	<include name="org/apache/el/**" />
347	<!-- Javadoc and i18n exclusions -->
348	<exclude name="**/package.html" />
349	<exclude name="*/LocalStrings_" />
350	</fileset>
351	</jar>
352		352
353	<!-- i18n JARs -->	353	<!-- i18n JARs -->
354	<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar">	354	<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar">