From fc45320f5ef2d8843ec7677dc6e0b5757faa5b37 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 22:09:43 +0000
Subject: Merge revision r946097 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946453 13f79535-47bb-0310-9956-ffa450edef68
---
 .../payment-groovy/src/test/resources/META-INF/sca-contribution.xml      | 1 +
 .../src/main/resources/META-INF/sca-contribution.xml                     | 1 -
 .../src/main/resources/META-INF/sca-contribution.xml                     | 1 -
 .../payment-python/src/test/resources/META-INF/sca-contribution.xml      | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sca-java-1.x/trunk/tutorials')

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
index 378e09009b..156cd0a182 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
@@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
index 0fd7cb9910..5f8c0bbb18 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-callback/src/main/resources/META-INF/sca-contribution.xml
@@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
index 0fd7cb9910..5f8c0bbb18 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-reference-pass/src/main/resources/META-INF/sca-contribution.xml
@@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
index 378e09009b..156cd0a182 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/test/resources/META-INF/sca-contribution.xml
@@ -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>
-- 
cgit v1.2.3