geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1075218 - in /geronimo/server/trunk: plugins/axis/axis/pom.xml plugins/axis/axis/src/main/history/dependencies.xml pom.xml
Date Mon, 28 Feb 2011 06:24:37 GMT
Author: genspring
Date: Mon Feb 28 06:24:37 2011
New Revision: 1075218

URL: http://svn.apache.org/viewvc?rev=1075218&view=rev
Log:
Reenable openejb-axis to the axis dependency to avoid a CNF issue

Modified:
    geronimo/server/trunk/plugins/axis/axis/pom.xml
    geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=1075218&r1=1075217&r2=1075218&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/pom.xml Mon Feb 28 06:24:37 2011
@@ -65,18 +65,27 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>axis</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-<!-- openejb-axis may be needed, but does not seem to be ready yet -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.openejb</groupId>-->
-            <!--<artifactId>openejb-axis</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-axis</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+        </dependency>        
 
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>

Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1075218&r1=1075217&r2=1075218&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml Mon Feb 28 06:24:37
2011
@@ -46,4 +46,14 @@
         <artifactId>uddi-ws</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-axis</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1075218&r1=1075217&r2=1075218&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Feb 28 06:24:37 2011
@@ -1207,6 +1207,10 @@
                         <groupId>cglib</groupId>
                         <artifactId>cglib-nodep</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>axis</groupId>
+                        <artifactId>axis</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message