Fix for TUSCANY-2509, TUSCANY-2506 and TUSCANY-2508 (to include zipcode-jaxws into the build)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@680620 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 40 insertions, 13 deletions

diff --git a/branches/sca-java-1.3/distribution/bundle/pom.xml b/branches/sca-java-1.3/distribution/bundle/pom.xml
index fa6e8d7bfd..653e9a5fba 100644
--- a/branches/sca-java-1.3/distribution/bundle/pom.xml
+++ b/branches/sca-java-1.3/distribution/bundle/pom.xml
@@ -460,6 +460,15 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
             <version>${pom.version}</version>
+            <exclusions>
+
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/branches/sca-java-1.3/distribution/pom.xml b/branches/sca-java-1.3/distribution/pom.xml
index 85ff1aeb4d..340786c063 100644
--- a/branches/sca-java-1.3/distribution/pom.xml
+++ b/branches/sca-java-1.3/distribution/pom.xml
@@ -82,14 +82,20 @@
                     <groupId>javax.mail</groupId>
                     <artifactId>mail</artifactId>
                 </exclusion>
+                <!--
                 <exclusion>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
                 </exclusion>
-                     <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-                     </exclusion>
+                -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
             </exclusions>
        </dependency>
         <dependency>
diff --git a/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml b/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml
index 01b0adeeb3..e52f6757ec 100644
--- a/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml
+++ b/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml
@@ -82,6 +82,12 @@
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
             <version>0.3.0-incubating</version> 
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>    
         
         <dependency>
diff --git a/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml b/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml
index a9096fccef..9db11b473d 100644
--- a/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml
+++ b/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml
@@ -162,7 +162,7 @@
                 <executions>
                     <execution>
                         <id>wsimport</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <goals>
                             <goal>wsimport</goal>
                         </goals>
diff --git a/branches/sca-java-1.3/samples/pom.xml b/branches/sca-java-1.3/samples/pom.xml
index bd19d34c95..cb231cc40f 100644
--- a/branches/sca-java-1.3/samples/pom.xml
+++ b/branches/sca-java-1.3/samples/pom.xml
@@ -94,6 +94,7 @@
                 <module>store</module>
                 <module>supplychain</module>
                 <module>web-resource</module>
+                <module>zipcode-jaxws</module>
             </modules>
         </profile>
     </profiles>
diff --git a/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml b/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml
index eb0598198a..be9277c9a2 100644
--- a/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml
+++ b/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml
@@ -53,13 +53,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-feed</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
             <version>1.3-SNAPSHOT</version>
             <scope>runtime</scope>
diff --git a/branches/sca-java-1.3/tools/java2wsdl/pom.xml b/branches/sca-java-1.3/tools/java2wsdl/pom.xml
index 88c53e510c..3c6a7717fa 100644
--- a/branches/sca-java-1.3/tools/java2wsdl/pom.xml
+++ b/branches/sca-java-1.3/tools/java2wsdl/pom.xml
@@ -133,6 +133,12 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/branches/sca-java-1.3/tools/wsdl2java/pom.xml b/branches/sca-java-1.3/tools/wsdl2java/pom.xml
index 56e7efcafe..b48afd6b68 100644
--- a/branches/sca-java-1.3/tools/wsdl2java/pom.xml
+++ b/branches/sca-java-1.3/tools/wsdl2java/pom.xml
@@ -161,6 +161,12 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -226,7 +232,7 @@
                 <executions>
                     <execution>
                         <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
                             <javaPackage>org.example.creditscore.doclit</javaPackage>