geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r997452 - in /geronimo/server/trunk/plugins/axis: axis/src/main/history/dependencies.xml geronimo-axis-builder/pom.xml geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java pom.xml
Date Wed, 15 Sep 2010 18:51:14 GMT
Author: rickmcguire
Date: Wed Sep 15 18:51:14 2010
New Revision: 997452

URL: http://svn.apache.org/viewvc?rev=997452&view=rev
Log:
some dependency tweaks to at last get the code attempting to compile

Modified:
    geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
    geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
    geronimo/server/trunk/plugins/axis/pom.xml

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=997452&r1=997451&r2=997452&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 Wed Sep 15 18:51:14
2010
@@ -32,13 +32,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jsr173_api</artifactId>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -73,11 +73,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml?rev=997452&r1=997451&r2=997452&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml Wed Sep 15 18:51:14 2010
@@ -46,6 +46,12 @@
             <artifactId>geronimo-axis</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-webservices-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?rev=997452&r1=997451&r2=997452&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
Wed Sep 15 18:51:14 2010
@@ -71,7 +71,7 @@ public class AxisServiceRefBuilder exten
         serviceRefQNameSet = buildQNameSet(eeNamespaces, "service-ref");
     }
 
-    protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+    protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) {
         return specDD.selectChildren(serviceRefQNameSet).length > 0;
     }
 

Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=997452&r1=997451&r2=997452&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Wed Sep 15 18:51:14 2010
@@ -60,7 +60,7 @@
             <dependency>
                 <groupId>org.apache.ws.scout</groupId>
                 <artifactId>scout</artifactId>
-                <version>1.2.1-SNAPSHOT</version>
+                <version>1.2.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -79,7 +79,13 @@
             <dependency>
                 <groupId>org.apache.juddi</groupId>
                 <artifactId>uddi-ws</artifactId>
-                <version>3.0.1-SNAPSHOT</version>
+                <version>3.0.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>



Mime
View raw message