Author: nash
Date: Wed May 19 22:02:22 2010
New Revision: 946441
URL: http://svn.apache.org/viewvc?rev=946441&view=rev
Log:
Merge revision r945293 from 1.0 release branch
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/resources/EmailGateway.wsdl
- copied unchanged from r945293,
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/src/main/resources/EmailGateway.wsdl
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml?rev=946441&r1=946440&r2=946441&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
Wed May 19 22:02:22 2010
@@ -25,6 +25,12 @@
<property name="package-path"
value="../util/scatours-util-launcher-common.jar"/>
<target name="wsdljava">
+ <!-- Include the Java classes for EmailGateway in this jar file as a
workaround for TUSCANY-3556. -->
+ <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"/>
+ </antcall>
<antcall target="wsimport">
<param name="wsdlfile" value="Payment.wsdl"/>
<param name="javaclass"
value="com/tuscanyscatours/payment/Payment.class"/>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml?rev=946441&r1=946440&r2=946441&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
Wed May 19 22:02:22 2010
@@ -142,6 +142,25 @@
<xnocompile>true</xnocompile>
</configuration>
</execution>
+ <!-- Include the Java classes for EmailGateway in this jar
file as a workaround for TUSCANY-3556. -->
+ <execution>
+ <id>emailgateway</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>wsimport</goal>
+ </goals>
+ <configuration>
+
<packageName>com.tuscanyscatours.emailgateway</packageName>
+
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+ <wsdlFiles>
+ <wsdlFile>EmailGateway.wsdl</wsdlFile>
+ </wsdlFiles>
+
<sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+
<staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
+ <verbose>false</verbose>
+ <xnocompile>true</xnocompile>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>