[patch] Patch introducing patternsets and macros

patchOrganizeBuild1.txt (text/plain), 17.93 KB, created by Marc Guillemot on 2008-12-05 03:03:45 UTC

(hide)

Description: Patch introducing patternsets and macros

Filename:

MIME Type:

Creator: Marc Guillemot

Created: 2008-12-05 03:03:45 UTC

Size: 17.93 KB

patch

obsolete

>Index: /home/marc/EWorkspaceOS/tomcat-trunk/build.xml >=================================================================== >--- /home/marc/EWorkspaceOS/tomcat-trunk/build.xml (revision 723640) >+++ /home/marc/EWorkspaceOS/tomcat-trunk/build.xml (working copy) >@@ -157,7 +157,109 @@ > > <target name="build-only" depends="build-prepare,compile,package" /> > >- <target name="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}"/> >@@ -163,18 +265,7 @@ > <filter token="target.jdk" value="${compile.target}"/> > > <!-- Common Annotations 1.0 JAR File --> >- <jar jarfile="${annotations-api.jar}"> >- <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> >+ <jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"/> > > <!-- Servlet 2.5 Implementation JAR File --> > <filter token="implementation.revision" >@@ -189,9 +280,7 @@ > <include name="META-INF/**" /> > </fileset> > <fileset dir="${tomcat.classes}"> >- <include name="javax/servlet/*" /> >- <include name="javax/servlet/http/*" /> >- <include name="javax/servlet/resources/*" /> >+ <patternset refid="files.servlet-api"/> > <!-- Javadoc and i18n exclusions --> > <exclude name="**/package.html" /> > <exclude name="**/LocalStrings_*" /> >@@ -211,7 +300,7 @@ > <include name="META-INF/**" /> > </fileset> > <fileset dir="${tomcat.classes}"> >- <include name="javax/servlet/jsp/**" /> >+ <patternset refid="files.jsp-api"/> > <!-- Javadoc and i18n exclusions --> > <exclude name="**/package.html" /> > <exclude name="**/LocalStrings_*" /> >@@ -219,14 +308,7 @@ > </jar> > > <!-- JSP 2.1 EL Implementation JAR File --> >- <jar jarfile="${el-api.jar}"> >- <fileset dir="${tomcat.classes}"> >- <include name="javax/el/*" /> >- <!-- Javadoc and i18n exclusions --> >- <exclude name="**/package.html" /> >- <exclude name="**/LocalStrings_*" /> >- </fileset> >- </jar> >+ <jarIt jarfile="${el-api.jar}" filesId="files.el-api"/> > > <!-- Bootstrap JAR File --> > <copy tofile="res/manifest.tmp" >@@ -237,17 +319,7 @@ > <jar jarfile="${bootstrap.jar}" > manifest="res/manifest.tmp"> > <fileset dir="${tomcat.classes}"> >- <include name="org/apache/catalina/startup/Bootstrap.class" /> >- <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/*" /> >+ <patternset refid="files.bootstrap"/> > <!-- Javadoc and i18n exclusions --> > <exclude name="**/package.html" /> > <exclude name="**/LocalStrings_*" /> >@@ -255,100 +327,28 @@ > </jar> > > <!-- Tomcat-juli JAR File --> >- <jar jarfile="${tomcat-juli.jar}"> >- <fileset dir="${tomcat.classes}"> >- <include name="org/apache/juli/**" /> >- <!-- Javadoc and i18n exclusions --> >- <exclude name="**/package.html" /> >- <exclude name="**/LocalStrings_*" /> >- </fileset> >- </jar> >+ <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli"/> > > <!-- Catalina Main JAR File --> >- <jar jarfile="${catalina.jar}"> >- <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> >+ <jarIt jarfile="${catalina.jar}" filesId="files.catalina"/> > > <!-- Catalina GroupCom/Tribes JAR File --> >- <jar jarfile="${catalina-tribes.jar}"> >- <fileset dir="${tomcat.classes}"> >- <exclude name="**/package.html" /> >- <exclude name="**/LocalStrings_*" /> >- <!-- 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> >+ <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"/> >+ >+ <!-- Catalina Cluster/HA JAR File --> >+ <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"/> > > <!-- Catalina Ant Tasks JAR File --> >- <jar jarfile="${catalina-ant.jar}"> >- <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> >+ <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"/> > > <!-- Protocol handlers - Coyote --> >- <jar jarfile="${tomcat-coyote.jar}"> >- <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> >+ <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"/> > > <!-- Jasper Implementation JAR File --> >- <jar jarfile="${jasper.jar}"> >- <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> >+ <jarIt jarfile="${jasper.jar}" filesId="files.jasper"/> > > <!-- Jasper EL Implementation JAR File --> >- <jar jarfile="${jasper-el.jar}"> >- <fileset dir="${tomcat.classes}"> >- <include name="org/apache/el/**" /> >- <!-- Javadoc and i18n exclusions --> >- <exclude name="**/package.html" /> >- <exclude name="**/LocalStrings_*" /> >- </fileset> >- </jar> >+ <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el"/> > > <!-- i18n JARs --> > <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"> >Index: /home/marc/EWorkspaceOS/tomcat-trunk/res/maven/mvn-pub.xml >=================================================================== >--- /home/marc/EWorkspaceOS/tomcat-trunk/res/maven/mvn-pub.xml (revision 723640) >+++ /home/marc/EWorkspaceOS/tomcat-trunk/res/maven/mvn-pub.xml (working copy) >@@ -117,85 +117,33 @@ > <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"> >- <antcall target="maven-deploy"><!--Deploy annotations--> >- <param name="file" value="${tomcat.lib.path}/annotations-api.jar"/> >- <param name="groupId" value="org.apache.tomcat"/> >- <param name="artifactId" value="annotations-api"/> >- <param name="pom" value="${tomcat.pom.path}/annotations-api.pom"/> >- </antcall> >- <antcall target="maven-deploy"><!--Deploy Servlet api--> >- <param name="file" value="${tomcat.lib.path}/servlet-api.jar"/> >- <param name="groupId" value="org.apache.tomcat"/> >- <param name="artifactId" value="servlet-api"/> >- <param name="pom" value="${tomcat.pom.path}/servlet-api.pom"/> >- </antcall> >- <antcall target="maven-deploy"><!--Deploy expression lanaguage api--> >- <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> >+ <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--> > <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"/> View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]