Remove workarounds for TUSCANY-3267 (now fixed)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@813793 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 0 insertions, 14 deletions

diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite
index dd99554824..75001d947b 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite
@@ -26,8 +26,6 @@
     <component name="PaymentClient">
         <implementation.java class="scatours.payment.client.PaymentClientImpl" />
         <reference name="payment">
-            <!-- use interface.wsdl to work around TUSCANY-3267 -->
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
             <binding.ws uri="http://localhost:8080/Payment" />
         </reference>
     </component>
diff --git a/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
index 7d28880eef..26f1fd8f23 100644
--- a/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
@@ -24,8 +24,6 @@
     <component name="Payment">

         <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />

         <service name="Payment">

-            <!-- use interface.wsdl to work around TUSCANY-3267 -->

-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />

             <binding.ws uri="http://localhost:8081/Payment"/>

         </service>

         <reference name="customerRegistry" target="CustomerRegistry"/>

diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite
index 1f1eb8f1fa..f192bf9659 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite
@@ -26,8 +26,6 @@
      <component name="PaymentComponent">
         <implementation.spring location="Payment-context.xml"/>
         <service name="Payment">
-            <!-- use interface.wsdl to work around TUSCANY-3267 -->
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
             <binding.ws uri="http://localhost:8081/Payment"/>
         </service>
         <reference name="creditCardPaymentReference">
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite
index 04fc0ad03a..14c6a00951 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite
@@ -26,8 +26,6 @@
     <component name="PaymentClient">
         <implementation.java class="payment.client.PaymentClientImpl" />
         <reference name="payment">
-            <!-- use interface.wsdl to work around TUSCANY-3267 -->
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
             <binding.ws uri="http://localhost:8081/Payment" />
         </reference>
     </component>   
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/payment.composite
index 6affd216fb..b864c43931 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/payment.composite
@@ -26,8 +26,6 @@
      <component name="PaymentComponent">
         <implementation.spring location="Payment-context.xml"/>
         <service name="Payment">
-            <!-- use interface.wsdl to work around TUSCANY-3267 -->
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
             <binding.ws uri="http://localhost:8081/Payment"/>
         </service>
         <reference name="creditCardPayment">
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/payment-client.composite
index 1921665d83..e983bd1d52 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/payment-client.composite
+++ b/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/payment-client.composite
@@ -26,8 +26,6 @@
     <component name="PaymentClient">
         <implementation.java class="payment.client.PaymentClientImpl" />
         <reference name="payment">
-            <!-- use interface.wsdl to work around TUSCANY-3267 -->
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
             <binding.ws uri="http://localhost:8081/Payment" />
         </reference>
     </component> 
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index c19b9d4cb2..211367d857 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -83,9 +83,7 @@
                 <module>payment-spring-contribution</module>

                 <module>payment-spring-scatag-contribution</module>

                 <module>payment-bpel-contribution</module>

-                <!-- currently broken because of TUSCANY-3267

                 <module>payment-groovy-contribution</module>

-                -->

                 <module>policy-client</module>

             </modules>

         </profile>