You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/07/30 19:31:22 UTC
svn commit: r681137 - in /tuscany/java/sca: distribution/
distribution/bundle/ modules/binding-atom-abdera/ modules/binding-ws-axis2/
modules/databinding-json/ modules/interface-java-jaxws/ samples/
samples/zipcode-jaxws/ tools/java2wsdl/ tools/wsdl2java/
Author: rfeng
Date: Wed Jul 30 10:31:21 2008
New Revision: 681137
URL: http://svn.apache.org/viewvc?rev=681137&view=rev
Log:
Merge the fix from 1.3 branch for TUSCANY-2509, TUSCANY-2506
Modified:
tuscany/java/sca/distribution/bundle/pom.xml
tuscany/java/sca/distribution/pom.xml
tuscany/java/sca/modules/binding-atom-abdera/pom.xml
tuscany/java/sca/modules/binding-ws-axis2/pom.xml
tuscany/java/sca/modules/databinding-json/pom.xml
tuscany/java/sca/modules/interface-java-jaxws/pom.xml
tuscany/java/sca/samples/pom.xml
tuscany/java/sca/samples/zipcode-jaxws/pom.xml
tuscany/java/sca/tools/java2wsdl/pom.xml
tuscany/java/sca/tools/wsdl2java/pom.xml
Modified: tuscany/java/sca/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/bundle/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ tuscany/java/sca/distribution/bundle/pom.xml Wed Jul 30 10:31:21 2008
@@ -459,6 +459,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>
<!-- dependencies to keep in the shaded pom.xml -->
Modified: tuscany/java/sca/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/distribution/pom.xml (original)
+++ tuscany/java/sca/distribution/pom.xml Wed Jul 30 10:31:21 2008
@@ -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>
Modified: tuscany/java/sca/modules/binding-atom-abdera/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom-abdera/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-atom-abdera/pom.xml (original)
+++ tuscany/java/sca/modules/binding-atom-abdera/pom.xml Wed Jul 30 10:31:21 2008
@@ -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>
Modified: tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/pom.xml Wed Jul 30 10:31:21 2008
@@ -343,6 +343,11 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <!-- Exclude XmlSchema 1.3.1 -->
+ <exclusion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -379,6 +384,12 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <!-- Exclude XmlSchema 1.3.1 -->
+ <exclusion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
@@ -419,6 +430,14 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+
+
+ <!-- Exclude XmlSchema 1.3.1 -->
+ <exclusion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/databinding-json/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-json/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-json/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-json/pom.xml Wed Jul 30 10:31:21 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: tuscany/java/sca/modules/interface-java-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/java/sca/modules/interface-java-jaxws/pom.xml Wed Jul 30 10:31:21 2008
@@ -162,7 +162,7 @@
<executions>
<execution>
<id>wsimport</id>
- <phase>generate-sources</phase>
+ <phase>generate-test-sources</phase>
<goals>
<goal>wsimport</goal>
</goals>
Modified: tuscany/java/sca/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/samples/pom.xml (original)
+++ tuscany/java/sca/samples/pom.xml Wed Jul 30 10:31:21 2008
@@ -96,6 +96,7 @@
<module>store-distributed</module>
<module>supplychain</module>
<module>web-resource</module>
+ <module>zipcode-jaxws</module>
</modules>
</profile>
</profiles>
Modified: tuscany/java/sca/samples/zipcode-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/zipcode-jaxws/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/samples/zipcode-jaxws/pom.xml (original)
+++ tuscany/java/sca/samples/zipcode-jaxws/pom.xml Wed Jul 30 10:31:21 2008
@@ -53,13 +53,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-feed</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
Modified: tuscany/java/sca/tools/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/java2wsdl/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/tools/java2wsdl/pom.xml (original)
+++ tuscany/java/sca/tools/java2wsdl/pom.xml Wed Jul 30 10:31:21 2008
@@ -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>
Modified: tuscany/java/sca/tools/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/wsdl2java/pom.xml?rev=681137&r1=681136&r2=681137&view=diff
==============================================================================
--- tuscany/java/sca/tools/wsdl2java/pom.xml (original)
+++ tuscany/java/sca/tools/wsdl2java/pom.xml Wed Jul 30 10:31:21 2008
@@ -160,6 +160,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>
@@ -225,7 +231,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>