Author: nash
Date: Wed May 19 22:09:43 2010
New Revision: 946453
URL: http://svn.apache.org/viewvc?rev=946453&view=rev
Log:
Merge revision r946097 from 1.0 release branch
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml?rev=946453&r1=946452&r2=946453&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
Wed May 19 22:09:43 2010
@@ -19,5 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:tours="http://tuscanyscatours.com/"; >
+ <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="tours:paymentClient" />
</contribution>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml?rev=946453&r1=946452&r2=946453&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
Wed May 19 22:09:43 2010
@@ -19,6 +19,5 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="scatours:payment" />
</contribution>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml?rev=946453&r1=946452&r2=946453&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
Wed May 19 22:09:43 2010
@@ -19,6 +19,5 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:scatours="http://tuscanyscatours.com/";>
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="scatours:payment" />
</contribution>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml?rev=946453&r1=946452&r2=946453&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
Wed May 19 22:09:43 2010
@@ -19,5 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:tours="http://tuscanyscatours.com/"; >
+ <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="tours:paymentClient" />
</contribution>
