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/29 05:50:43 UTC
svn commit: r680620 - in /tuscany/branches/sca-java-1.3: distribution/
distribution/bundle/ modules/binding-atom-abdera/
modules/interface-java-jaxws/ samples/ samples/zipcode-jaxws/
tools/java2wsdl/ tools/wsdl2java/
Author: rfeng
Date: Mon Jul 28 20:50:40 2008
New Revision: 680620
URL: http://svn.apache.org/viewvc?rev=680620&view=rev
Log:
Fix for TUSCANY-2509, TUSCANY-2506 and TUSCANY-2508 (to include zipcode-jaxws into the build)
Modified:
tuscany/branches/sca-java-1.3/distribution/bundle/pom.xml
tuscany/branches/sca-java-1.3/distribution/pom.xml
tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml
tuscany/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml
tuscany/branches/sca-java-1.3/samples/pom.xml
tuscany/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml
tuscany/branches/sca-java-1.3/tools/java2wsdl/pom.xml
tuscany/branches/sca-java-1.3/tools/wsdl2java/pom.xml
Modified: tuscany/branches/sca-java-1.3/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/distribution/bundle/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/distribution/bundle/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/distribution/bundle/pom.xml Mon Jul 28 20:50:40 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.3/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/distribution/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/distribution/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/distribution/pom.xml Mon Jul 28 20:50:40 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/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/pom.xml Mon Jul 28 20:50:40 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/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/interface-java-jaxws/pom.xml Mon Jul 28 20:50:40 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/branches/sca-java-1.3/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/samples/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/samples/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/samples/pom.xml Mon Jul 28 20:50:40 2008
@@ -94,6 +94,7 @@
<module>store</module>
<module>supplychain</module>
<module>web-resource</module>
+ <module>zipcode-jaxws</module>
</modules>
</profile>
</profiles>
Modified: tuscany/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/samples/zipcode-jaxws/pom.xml Mon Jul 28 20:50:40 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.3/tools/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/tools/java2wsdl/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/tools/java2wsdl/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/tools/java2wsdl/pom.xml Mon Jul 28 20:50:40 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/branches/sca-java-1.3/tools/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/tools/wsdl2java/pom.xml?rev=680620&r1=680619&r2=680620&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/tools/wsdl2java/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/tools/wsdl2java/pom.xml Mon Jul 28 20:50:40 2008
@@ -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>