Author: nash
Date: Wed May 19 21:47:13 2010
New Revision: 946422
URL: http://svn.apache.org/viewvc?rev=946422&view=rev
Log:
Merge revision r945281 from 1.0 release branch
Removed:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/main/resources/CreditCardPayment.wsdl
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml?rev=946422&r1=946421&r2=946422&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
Wed May 19 21:47:13 2010
@@ -257,7 +257,7 @@
<target name="run-payment-python">
<java classname="scatours.payment.PaymentLauncher" fork="true"
failonerror="true">
<classpath>
- <pathelement location="scatours-launcher-payment-groovy.jar"/>
+ <pathelement location="scatours-launcher-payment-python.jar"/>
<path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml?rev=946422&r1=946421&r2=946422&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
Wed May 19 21:47:13 2010
@@ -22,11 +22,6 @@
<target name="wsdljava">
<antcall target="wsimport">
- <param name="wsdlfile" value="CreditCardPayment.wsdl"/>
- <param name="javaclass"
value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>
- <param name="package"
value="com.tuscanyscatours.payment.creditcard"/>
- </antcall>
- <antcall target="wsimport">
<param name="wsdlfile" value="EmailGateway.wsdl"/>
<param name="javaclass"
value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>
<param name="package" value="com.tuscanyscatours.emailgateway"/>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml?rev=946422&r1=946421&r2=946422&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
Wed May 19 21:47:13 2010
@@ -119,24 +119,6 @@
</configuration>
</execution>
<execution>
- <id>payment.creditcard</id>
- <phase>process-sources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
-
<packageName>com.tuscanyscatours.payment.creditcard</packageName>
-
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
- </wsdlFiles>
-
<sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-
<staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
- <verbose>false</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </execution>
- <execution>
<id>emailgateway</id>
<phase>process-sources</phase>
<goals>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml?rev=946422&r1=946421&r2=946422&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
Wed May 19 21:47:13 2010
@@ -17,16 +17,11 @@
* under the License.
-->
-<project name="scatours-contribution-payment-pythin" default="compile">
+<project name="scatours-contribution-payment-python" default="compile">
<import file="../../antdefs.xml"/>
<target name="wsdljava">
<antcall target="wsimport">
- <param name="wsdlfile" value="CreditCardPayment.wsdl"/>
- <param name="javaclass"
value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>
- <param name="package"
value="com.tuscanyscatours.payment.creditcard"/>
- </antcall>
- <antcall target="wsimport">
<param name="wsdlfile" value="EmailGateway.wsdl"/>
<param name="javaclass"
value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>
<param name="package" value="com.tuscanyscatours.emailgateway"/>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml?rev=946422&r1=946421&r2=946422&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
Wed May 19 21:47:13 2010
@@ -119,24 +119,6 @@
</configuration>
</execution>
<execution>
- <id>payment.creditcard</id>
- <phase>process-sources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
-
<packageName>com.tuscanyscatours.payment.creditcard</packageName>
-
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
- </wsdlFiles>
-
<sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-
<staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
- <verbose>false</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </execution>
- <execution>
<id>emailgateway</id>
<phase>process-sources</phase>
<goals>
