From d0e341390747a2acb0dcca1de8679d4ada848b97 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 16 Sep 2009 15:49:01 +0000
Subject: [PATCH] Add the extra JARs, update version numbers and add a note
 about some issues I saw on Windows.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@815849 13f79535-47bb-0310-9956-ffa450edef68
---
 res/maven/mvn-pub.xml            | 94 +++++++++++++++++++++++++++-------------
 res/maven/mvn.properties.default | 10 +++--
 2 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index cc6cb8460..f83adf8a9 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project name="Tomcat 7.0" default="" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="Tomcat 7.0 Maven Deployment" default="" basedir="." xmlns:artifact="urn:maven-artifact-ant">
 
   <!--
     Built for using Maven 2.0.4
@@ -119,44 +119,76 @@
   
   <macrodef name="doMavenDeploy">
     <attribute name="artifactId"/>
-    <attribute name="jarFileName" default="@{artifactId}.jar" description="only need to be specified if not same as artifactId"/>
+    <attribute name="jarFileName" default="@{artifactId}.jar" />
+    <attribute name="groupId" default="org.apache.tomcat" />
+    <attribute name="file" default="${tomcat.lib.path}/@{jarFileName}" />
+    <attribute name="pom" default="@{artifactId}.pom" />
+  	<!-- How to handle sources ? -->
+    <attribute name="src" default="NONE" />
     <sequential>
       <antcall target="maven-deploy">
-        <param name="file" value="${tomcat.lib.path}/@{jarFileName}"/>
-        <param name="groupId" value="org.apache.tomcat"/>
+        <param name="file" value="@{file}"/>
+        <param name="groupId" value="@{groupId}"/>
         <param name="artifactId" value="@{artifactId}"/>
-        <param name="pom" value="${tomcat.pom.path}/@{artifactId}.pom"/>
+        <param name="pom" value="${tomcat.pom.path}/@{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="tomcat-api" /> <!--Deploy Tomcat 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"/>
-      <param name="artifactId" value="juli"/>
-      <param name="pom" value="${tomcat.pom.path}/juli-extras.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Extras Juli Adapters-->
-      <param name="file" value="${tomcat.extras.path}/tomcat-juli-adapters.jar"/>
-      <param name="groupId" value="org.apache.tomcat.extras"/>
-      <param name="artifactId" value="juli-adapters"/>
-      <param name="pom" value="${tomcat.pom.path}/juli-adapters.pom"/>
-    </antcall>
+  	<!-- Standard jars in bin directory -->
+  	<!-- Skip bootstrap.jar - it is just a subset of catalina.jar -->
+  	<doMavenDeploy artifactId="juli" file="${tomcat.bin.path}/tomcat-juli.jar"/>
+  	    
+  	<!-- Standard jars in lib directory -->
+  	<doMavenDeploy artifactId="annotations-api"/>
+  	<doMavenDeploy artifactId="catalina"/>
+    <doMavenDeploy artifactId="catalina-ant"/>
+    <doMavenDeploy artifactId="catalina-ha"/>
+    <doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/>
+    <doMavenDeploy artifactId="el-api"/>
+    <doMavenDeploy artifactId="jasper"/>
+    <doMavenDeploy artifactId="jasper-el"/>
+    <doMavenDeploy artifactId="jasper-jdt"/>
+    <doMavenDeploy artifactId="jsp-api"/>
+    <doMavenDeploy artifactId="servlet-api"/>
+    <doMavenDeploy artifactId="tomcat-api" />
+    <doMavenDeploy artifactId="coyote" jarFileName="tomcat-coyote.jar"/>
+    <doMavenDeploy artifactId="dbcp" jarFileName="tomcat-dbcp.jar"/>
+    <doMavenDeploy artifactId="tomcat-i18n-es" />
+    <doMavenDeploy artifactId="tomcat-i18n-fr" />
+    <doMavenDeploy artifactId="tomcat-i18n-ja" />
+
+    <!-- Extras jars -->
+    <doMavenDeploy artifactId="juli" groupId="org.apache.tomcat.extras"
+    	file="${tomcat.extras.path}/tomcat-juli.jar" pom="juli-extras.pom"/>
+    <doMavenDeploy artifactId="juli-adapters" groupId="org.apache.tomcat.extras"
+        file="${tomcat.extras.path}/tomcat-juli-adapters.jar" />
+    <doMavenDeploy artifactId="catalina-jmx-remote"
+    	groupId="org.apache.tomcat.extras"
+        file="${tomcat.extras.path}/catalina-jmx-remote.jar" />
+    <doMavenDeploy artifactId="catalina-ws" groupId="org.apache.tomcat.extras"
+        file="${tomcat.extras.path}/catalina-ws.jar" />
+  	
+  	<!-- Emedded jars -->
+  	<!-- Skip DBCP & Jasper-JDT - optional and can use standard ones above -->
+    <doMavenDeploy artifactId="core" groupId="org.apache.tomcat.embed"
+        file="${tomcat.embed.path}/tomcat-embed-core.jar"
+    	pom="embed-core.pom"
+        src="${tomcat.embed.path}/tomcat-embed-core-src.jar"/>
+    <doMavenDeploy artifactId="jasper" groupId="org.apache.tomcat.embed"
+        file="${tomcat.embed.path}/tomcat-embed-japser.jar"
+    	pom="embed-jasper.pom"
+        src="${tomcat.embed.path}/tomcat-embed-jasper-src.jar"/>
+    <doMavenDeploy artifactId="logging-juli" groupId="org.apache.tomcat.embed"
+        file="${tomcat.embed.path}/tomcat-embed-logging-juli.jar"
+        pom="embed-logging-juli.pom"
+        src="${tomcat.embed.path}/tomcat-embed-logging-juli-src.jar"/>
+    <doMavenDeploy artifactId="logging-log4j" groupId="org.apache.tomcat.embed"
+        file="${tomcat.embed.path}/tomcat-embed-logging-juli.jar"
+        pom="embed-logging-log4j.pom"
+        src="${tomcat.embed.path}/tomcat-embed-logging-log4j-src.jar"/>
+  	
   </target>
 
   <target name="deploy-snapshot">
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index b5785117e..2fd5ac192 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -27,6 +27,9 @@ maven.gpg.exec=C:/software/GNU/GnuPG/gpg.exe
 maven.gpg.passphrase=*****
 
 
+# You'll also need to install jsch 0.1.42 and manually configure
+# wagon-ssh 1.0-beta-2 to use the updated jsch
+# You'll also need jzlib 1.0.7
 maven.home=/development/maven-2.0.4
 #Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name
 maven.bin=mvn.bat
@@ -34,22 +37,23 @@ maven.bin=mvn.bat
 #Maven snapshot properties
 maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
 maven.snapshot.repo.repositoryId=apache.snapshots
-maven.snapshot.deploy.version=6.T.X-SNAPSHOT
+maven.snapshot.deploy.version=7.0.0
 
 #Maven release properties for Tomcat staging
 maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
 maven.release.repo.repositoryId=tomcat-staging
-maven.release.deploy.version=6.T.X
+maven.release.deploy.version=7.0.0
 
 #Maven release properties for the main ASF repo
 maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
 maven.asf.release.repo.repositoryId=apache.releases
-maven.asf.release.deploy.version=6.T.T
+maven.asf.release.deploy.version=7.0.0
 
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
 tomcat.bin.path=../../output/build/bin
+tomcat.embed.path=../../output/embed
 tomcat.extras.path=../../output/extras
 
 #Where do we find the POM files
-- 
2.11.0