You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/02/06 05:34:37 UTC
svn commit: r741401 - in
/webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat: build.xml pom.xml
Author: tcunning
Date: Fri Feb 6 04:34:36 2009
New Revision: 741401
URL: http://svn.apache.org/viewvc?rev=741401&view=rev
Log:
JUDDI-184
Fix juddi-tomcat so that we can use any maven version.
Modified:
webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/build.xml
webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/pom.xml
Modified: webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/build.xml?rev=741401&r1=741400&r2=741401&view=diff
==============================================================================
--- webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/build.xml (original)
+++ webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/build.xml Fri Feb 6 04:34:36 2009
@@ -6,20 +6,19 @@
<target name="unzip-tomcat">
<mkdir dir="${basedir}/target/tomcat"/>
- <unzip dest="${basedir}/target/tomcat" src="${dependency.tomcat.zip}"/>
- <copy file="${dependency.juddi.war}" tofile="${webapps.dir}/juddi.war"/>
- <unzip dest="${webapps.dir}/juddi" src="${dependency.juddi.war}"/>
- <copy file="${dependency.soap-console.war}" tofile="${webapps.dir}/juddi-console.war"/>
+ <unzip dest="${basedir}/target/tomcat" src="target/apache-tomcat-5.5.23.zip"/>
+ <unzip dest="${webapps.dir}/juddi" src="target/juddi-web-2.0rc6.war"/>
+ <copy file="${basedir}/target/juddi-soapconsole-2.0rc6.war" tofile="${webapps.dir}/juddi-console.war"/>
</target>
<target name="copy-resources" depends="unzip-tomcat">
<copy file="juddi.xml" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/conf/Catalina/localhost"/>
- <copy file="${dependency.derby.jar}" todir="${common.lib.dir}"/>
- <copy file="${dependency.axis.jar}" todir="${common.lib.dir}"/>
- <copy file="${dependency.axis-saaj.jar}" todir="${common.lib.dir}"/>
- <copy file="${dependency.axis-jaxrpc.jar}" todir="${common.lib.dir}"/>
- <copy file="${dependency.commons-discovery.jar}" todir="${common.lib.dir}"/>
+ <copy file="${basedir}/target/derby-10.1.2.1.jar" todir="${common.lib.dir}"/>
+ <copy file="${basedir}/target/axis-1.4.jar" todir="${common.lib.dir}"/>
+ <copy file="${basedir}/target/axis-saaj-1.4.jar" todir="${common.lib.dir}"/>
+ <copy file="${basedir}/target/axis-jaxrpc-1.4.jar" todir="${common.lib.dir}"/>
+ <copy file="${basedir}/target/commons-discovery-0.2.jar" todir="${common.lib.dir}"/>
<replace file="${webapps.dir}/juddi/WEB-INF/juddi.properties">
<replacetoken>juddi-sql/mysql</replacetoken>
<replacevalue>juddi-sql/derby</replacevalue>
Modified: webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/pom.xml?rev=741401&r1=741400&r2=741401&view=diff
==============================================================================
--- webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/pom.xml (original)
+++ webservices/juddi/branches/juddi-2.0rc6/juddi-tomcat/pom.xml Fri Feb 6 04:34:36 2009
@@ -11,6 +11,7 @@
<version>2.0rc6</version>
<name>juddi-tomcat Packaging</name>
<url>http://maven.apache.org</url>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>commons-discovery</groupId>
@@ -28,7 +29,7 @@
<version>1.4</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
+ <groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>1.4</version>
</dependency>
@@ -50,8 +51,8 @@
<version>2.0rc6</version>
<type>jar</type>
</dependency>
- <dependency>
- <artifactId>juddi-soapconsole</artifactId>
+ <dependency>
+ <artifactId>juddi-soapconsole</artifactId>
<groupId>org.apache.juddi</groupId>
<version>2.0rc6</version>
<type>war</type>
@@ -64,26 +65,91 @@
</dependencies>
<build>
<plugins>
- <plugin>
+<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.4</version>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <artifactId>juddi-soapconsole</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>2.0rc6</version>
+ <type>war</type>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.4</version>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>2.0rc6</version>
+ <type>jar</type>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-web</artifactId>
+ <version>2.0rc6</version>
+ <type>war</type>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <artifactId>apache-tomcat</artifactId>
+ <groupId>tomcat</groupId>
+ <version>5.5.23</version>
+ <type>zip</type>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+</plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>package</id>
+ <phase>package</phase>
<configuration>
<tasks>
- <property name="dependency.soap-console.war" value="${maven.dependency.org.apache.juddi.juddi-soapconsole.war.path}"/>
- <property name="dependency.axis.jar" value="${maven.dependency.axis.axis.jar.path}"/>
- <property name="dependency.axis-saaj.jar" value="${maven.dependency.org.apache.axis.axis-saaj.jar.path}"/>
- <property name="dependency.axis-jaxrpc.jar" value="${maven.dependency.org.apache.axis.axis-jaxrpc.jar.path}"/>
- <property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}"/>
- <property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}"/>
- <property name="dependency.tomcat.zip" value="${maven.dependency.tomcat.apache-tomcat.zip.path}"/>
- <echo>${dependency.tomcat.zip}"</echo>
- <property name="dependency.juddi.war" value="${maven.dependency.org.apache.juddi.juddi-web.war.path}"/>
- <property name="dependency.juddi.jar" value="${maven.dependency.org.apache.juddi.juddi.jar.path}"/>
-
<ant antfile="${basedir}/build.xml">
<target name="package-tomcat"/>
</ant>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org