Return-Path: 
 <dev-return-95112-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 46966 invoked from network); 8 Apr 2009 04:12:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 8 Apr 2009 04:12:13 -0000
Received: (qmail 11441 invoked by uid 500); 8 Apr 2009 04:12:12 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 11376 invoked by uid 500); 8 Apr 2009 04:12:11 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 11365 invoked by uid 99); 8 Apr 2009 04:12:11 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2009 04:12:11 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2009 04:12:10 +0000
Received: by eris.apache.org (Postfix, from userid 1221)
	id 5F1732388B99; Wed,  8 Apr 2009 04:11:50 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r762906 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt
 build.xml
 res/maven/mvn-pub.xml webapps/docs/changelog.xml
Date: Wed, 08 Apr 2009 04:11:48 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090408041150.5F1732388B99@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Tue Apr  7 19:08:39 2009
New Revision: 762906

URL: http://svn.apache.org/viewvc?rev=762906&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46351
Build script re-factoring. Patch provided by Marc Guillemot

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  7 19:08:39 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751295
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751295

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=762906&r1=762905&r2=762906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr  7 19:08:39 2009
@@ -56,15 +56,6 @@
   http://svn.apache.org/viewvc?rev=757335&view=rev (to remove the Catalina dep)
   +1: markt, billbarker
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46351
-  Build script re-factoring
-  Patch provided by Marc Guillemot
-  http://svn.apache.org/viewvc?rev=729681&view=rev
-  +1: markt, jim, pero
-   0: fhanik - not sure its needed in 6.0 branch if all is working with the old script
-   0: funkman - ditto
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46815
   http://svn.apache.org/viewvc?rev=751289&view=rev
   http://svn.apache.org/viewvc?rev=753039&view=rev

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=762906&r1=762905&r2=762906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Tue Apr  7 19:08:39 2009
@@ -142,24 +142,114 @@
 
   <target name="build-only" depends="build-prepare,compile,package" />
 
+  <!-- Pattern sets for jar files -->
+  <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/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}"/>
 
     <!-- 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"
@@ -174,9 +264,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_*" />
@@ -196,7 +284,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_*" />
@@ -204,30 +292,13 @@
     </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 -->
     <jar jarfile="${bootstrap.jar}"
         manifest="res/bootstrap.jar.manifest">
       <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_*" />
@@ -235,99 +306,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/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>
+    <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"/>
+
     <!-- 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-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">
@@ -768,4 +768,4 @@
     </jar>
   </target>
 
-</project>
+</project>
\ No newline at end of file

Modified: tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml?rev=762906&r1=762905&r2=762906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml Tue Apr  7 19:08:39 2009
@@ -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"/>

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=762906&r1=762905&r2=762906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr  7 19:08:39 2009
@@ -70,6 +70,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>46351</bug>: Refactor the build script. Patch provided by Marc
+        Guillemot. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 6.0.19 (remm)">
   <subsection name="Catalina">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org