From 4140d84ab1259cc7500e36fb761f21c5ee01fba9 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 19 Sep 2008 06:38:53 +0000
Subject: Upgrade to Axis2 1.4.1 and its transitive dependencies such as
 XmlSchema and Axiom based on the patches from Ram for TUSCANY-2606

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@696937 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/tools/java2wsdl/pom.xml                   | 103 ++++---------------
 java/sca/tools/maven/maven-osgi-junit/pom.xml      |   2 +-
 java/sca/tools/runtime-inspector/pom.xml           |   2 +-
 java/sca/tools/wsdl2java/pom.xml                   | 112 +++++----------------
 .../wsdl2java/generate/JavaInterfaceEmitter.java   |  13 +--
 5 files changed, 55 insertions(+), 177 deletions(-)

(limited to 'java/sca/tools')

diff --git a/java/sca/tools/java2wsdl/pom.xml b/java/sca/tools/java2wsdl/pom.xml
index a760c26d1b..e9c97b283c 100644
--- a/java/sca/tools/java2wsdl/pom.xml
+++ b/java/sca/tools/java2wsdl/pom.xml
@@ -27,42 +27,42 @@
     </parent>
     <artifactId>tuscany-java2wsdl</artifactId>
     <name>Apache Tuscany SCA Java2WSDL Tool</name>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
-
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>1.6.2</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>wsdl4j</groupId>
@@ -74,51 +74,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
+ 
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -126,11 +86,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -138,13 +97,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen</artifactId>
             <version>2.2.3</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen-ecore</artifactId>
@@ -152,26 +109,12 @@
         </dependency>
 
         <dependency>
-            <groupId>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
         </dependency>
-
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -192,7 +135,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>        
+            </plugin>
             <plugin>
                 <groupId>org.apache.tuscany.sdo</groupId>
                 <artifactId>tuscany-sdo-plugin</artifactId>
@@ -202,7 +145,8 @@
                         <id>generate-sdo</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
+                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl
+                            </schemaFile>
                             <javaPackage>org.example.creditscore.doclit</javaPackage>
                             <noNotification>true</noNotification>
                             <noContainer>true</noContainer>
@@ -216,20 +160,15 @@
             </plugin>
         </plugins>
     </build>
-
     <repositories>
         <repository>
-            <!-- <id>eclipse.emf</id>
-            <url>http://download.eclipse.org/tools/emf/maven2</url> -->
-            <!-- <id>osuosl.org</id>
-            <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
             <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
             <id>indiana</id>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
+            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/
+            </url>
             <snapshots>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </snapshots>
         </repository>
     </repositories>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/java/sca/tools/maven/maven-osgi-junit/pom.xml b/java/sca/tools/maven/maven-osgi-junit/pom.xml
index 278ef80f71..2df4e01909 100644
--- a/java/sca/tools/maven/maven-osgi-junit/pom.xml
+++ b/java/sca/tools/maven/maven-osgi-junit/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/sca/tools/runtime-inspector/pom.xml b/java/sca/tools/runtime-inspector/pom.xml
index 6c5e314e15..ea6078bf7d 100644
--- a/java/sca/tools/runtime-inspector/pom.xml
+++ b/java/sca/tools/runtime-inspector/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/tools/wsdl2java/pom.xml b/java/sca/tools/wsdl2java/pom.xml
index c47f096dee..6f13c6ca5e 100644
--- a/java/sca/tools/wsdl2java/pom.xml
+++ b/java/sca/tools/wsdl2java/pom.xml
@@ -27,7 +27,6 @@
     </parent>
     <artifactId>tuscany-wsdl2java</artifactId>
     <name>Apache Tuscany SCA WSDL2Java Tool</name>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -35,31 +34,36 @@
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-tools</artifactId>
             <version>1.1.1</version>
         </dependency>
-
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
             <version>2.1.7</version>
         </dependency>
-
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.1</version>
         </dependency>
-
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -72,23 +76,20 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
-
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>1.6.2</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>wsdl4j</groupId>
@@ -100,51 +101,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
+ 
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -152,11 +113,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -164,42 +124,24 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen</artifactId>
             <version>2.2.3</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>codegen-ecore</artifactId>
             <version>2.2.3</version>
         </dependency>
-
+ 
         <dependency>
-            <groupId>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
         </dependency>
-
-
-
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -230,7 +172,8 @@
                         <id>generate-sdo</id>
                         <phase>generate-test-sources</phase>
                         <configuration>
-                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
+                            <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl
+                            </schemaFile>
                             <javaPackage>org.example.creditscore.doclit</javaPackage>
                             <noNotification>true</noNotification>
                             <noContainer>true</noContainer>
@@ -244,7 +187,6 @@
             </plugin>
         </plugins>
     </build>
-
     <repositories>
         <repository>
             <snapshots>
@@ -256,17 +198,13 @@
             <layout>legacy</layout>
         </repository>
         <repository>
-            <!-- <id>eclipse.emf</id>
-                <url>http://download.eclipse.org/tools/emf/maven2</url> -->
-            <!-- <id>osuosl.org</id>
-                <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
             <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
             <id>indiana</id>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
+            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/
+            </url>
             <snapshots>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </snapshots>
         </repository>
     </repositories>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/java/sca/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/java/sca/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index a2220abe55..08c7131208 100644
--- a/java/sca/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/java/sca/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
@@ -26,6 +26,7 @@ import java.util.List;
 
 import javax.xml.namespace.QName;
 
+import org.apache.axis2.description.AxisBindingOperation;
 import org.apache.axis2.description.AxisMessage;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.util.FileWriter;
@@ -129,20 +130,20 @@ public class JavaInterfaceEmitter extends JavaEmitter {
     }
 
     @Override
-    protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+    protected Element getInputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
         return getElement(doc,
                           "input",
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
+                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
+                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
                           headerParameterQNameList);
     }
 
     @Override
-    protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+    protected Element getOutputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
         return getElement(doc,
                           "output",
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
+                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
+                          operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
                           headerParameterQNameList);
     }
 
-- 
cgit v1.2.3