You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/07/23 16:48:09 UTC

svn commit: r797091 - in /webservices/juddi/trunk/juddi-tomcat: ./ bootstrap/ build.xml package.properties pom.xml

Author: kstam
Date: Thu Jul 23 14:48:08 2009
New Revision: 797091

URL: http://svn.apache.org/viewvc?rev=797091&view=rev
Log:
JUDDI-270 upgrading to the latest tomcat

Modified:
    webservices/juddi/trunk/juddi-tomcat/   (props changed)
    webservices/juddi/trunk/juddi-tomcat/bootstrap/   (props changed)
    webservices/juddi/trunk/juddi-tomcat/build.xml
    webservices/juddi/trunk/juddi-tomcat/package.properties
    webservices/juddi/trunk/juddi-tomcat/pom.xml

Propchange: webservices/juddi/trunk/juddi-tomcat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 23 14:48:08 2009
@@ -0,0 +1 @@
+target

Propchange: webservices/juddi/trunk/juddi-tomcat/bootstrap/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 23 14:48:08 2009
@@ -0,0 +1 @@
+target

Modified: webservices/juddi/trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/build.xml?rev=797091&r1=797090&r2=797091&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/build.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/build.xml Thu Jul 23 14:48:08 2009
@@ -9,7 +9,9 @@
 		<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"/>
+		-->
 	</target>
 	
 	<target name="copy-resources" depends="unzip-tomcat">

Modified: webservices/juddi/trunk/juddi-tomcat/package.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/package.properties?rev=797091&r1=797090&r2=797091&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/package.properties (original)
+++ webservices/juddi/trunk/juddi-tomcat/package.properties Thu Jul 23 14:48:08 2009
@@ -1 +1 @@
-apache.tomcat.version=5.5.23
+apache.tomcat.version=5.5.27

Modified: webservices/juddi/trunk/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/pom.xml?rev=797091&r1=797090&r2=797091&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/pom.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/pom.xml Thu Jul 23 14:48:08 2009
@@ -34,8 +34,8 @@
     </dependency>
     <dependency>
       <artifactId>apache-tomcat</artifactId>
-      <groupId>tomcat</groupId>
-      <version>5.5.23</version> 
+      <groupId>org.apache.juddi.bootstrap</groupId>
+      <version>5.5.27</version> 
       <type>zip</type>
     </dependency>
     <dependency>
@@ -50,12 +50,14 @@
      <version>SNAPSHOT</version>
      <type>jar</type>
     </dependency>
+    <!-- 
     <dependency>
     <artifactId>juddi-soapconsole</artifactId>
      <groupId>org.apache.juddi</groupId>
      <version>SNAPSHOT</version>
      <type>war</type>
     </dependency>
+     -->
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
@@ -78,13 +80,15 @@
             <phase>compile</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}"/>
+		<property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.juddi.bootstrap.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}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org