You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2005/05/08 19:23:34 UTC

svn commit: r169145 - in /geronimo/trunk: assemblies/j2ee-server/project.xml itests/naming/common/project.xml modules/assembly/src/plan/j2ee-client-plan.xml modules/assembly/src/plan/j2ee-server-tomcat-plan.xml modules/axis/src/etc/META-INF/geronimo-service.xml

Author: dain
Date: Sun May  8 10:23:32 2005
New Revision: 169145

URL: http://svn.apache.org/viewcvs?rev=169145&view=rev
Log:
Removed lingering uses of axis-commons-discover
Removed hardcoded version numbers from plans

Modified:
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/itests/naming/common/project.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
    geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=169145&r1=169144&r2=169145&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Sun May  8 10:23:32 2005
@@ -516,9 +516,9 @@
         </dependency>
 
         <dependency>
-            <groupId>axis</groupId>
+            <groupId>commons-discovery</groupId>
             <artifactId>commons-discovery</artifactId>
-            <version>${axis_commons_discovery_version}</version>
+            <version>${commons_discovery_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>

Modified: geronimo/trunk/itests/naming/common/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/itests/naming/common/project.xml?rev=169145&r1=169144&r2=169145&view=diff
==============================================================================
--- geronimo/trunk/itests/naming/common/project.xml (original)
+++ geronimo/trunk/itests/naming/common/project.xml Sun May  8 10:23:32 2005
@@ -87,9 +87,9 @@
         </dependency>
 
         <dependency>
-            <groupId>axis</groupId>
+            <groupId>commons-discovery</groupId>
             <artifactId>commons-discovery</artifactId>
-            <version>${axis_commons_discovery_version}</version>
+            <version>${commons_discovery_version}</version>
         </dependency>
         <dependency>
             <groupId>axis</groupId>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=169145&r1=169144&r2=169145&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Sun May  8 10:23:32 2005
@@ -73,11 +73,11 @@
 
     <!--client side web services-->
     <dependency>
-        <uri>geronimo/jars/geronimo-axis-1.0-SNAPSHOT.jar</uri>
+        <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
     </dependency>
 
     <dependency>
-        <uri>geronimo/jars/geronimo-webservices-1.0-SNAPSHOT.jar</uri>
+        <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
     </dependency>
 
 <!--    <dependency>-->

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml?rev=169145&r1=169144&r2=169145&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml Sun May  8 10:23:32 2005
@@ -61,22 +61,22 @@
         <uri>tomcat/jars/servlets-invoker-${tomcat_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-beanutils/jars/commons-beanutils-1.6.1.jar</uri>
+        <uri>commons-beanutils/jars/commons-beanutils-${commons_beanutils_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-collections/jars/commons-collections-2.1.jar</uri>
+        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-digester/jars/commons-digester-1.6.jar</uri>
+        <uri>commons-digester/jars/commons-digester-${commons_digester_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-el/jars/commons-el-1.0.jar</uri>
+        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-modeler/jars/commons-modeler-1.1.jar</uri>
+        <uri>commons-modeler/jars/commons-modeler-${commons_modeler_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>regexp/jars/regexp-1.3.jar</uri>
+        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>mx4j/jars/mx4j-${mx4j_version}.jar</uri>

Modified: geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml?rev=169145&r1=169144&r2=169145&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml (original)
+++ geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml Sun May  8 10:23:32 2005
@@ -34,10 +34,10 @@
         <uri>wsdl4j/jars/wsdl4j-${wsdl4j_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>axis/jars/commons-discovery-${axis_commons_discovery_version}.jar</uri>
+        <uri>commons-discovery/jars/commons-discovery-${commons_discovery_version}.jar</uri>
     </dependency>
 <!--    <dependency>-->
 <!--        <uri>ews/jars/ews-${ews_version}.jar</uri>-->
 <!--    </dependency>-->
 
-</service>
\ No newline at end of file
+</service>