Tidy up test composite structure

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

2 files changed, 7 insertions, 10 deletions

diff --git a/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
index 47a544538e..cc141d7703 100644
--- a/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,9 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+              xmlns:e="http://emailgateway-test">

     <import.java package="com.tuscanyscatours.emailgateway" />

     <import.java package="com.tuscanyscatours.emailgateway.impl" />

+    <deployable composite="e:emailgateway-test" />

 </contribution>

diff --git a/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
index f2ed1f345c..8305356bda 100644
--- a/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
+++ b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
@@ -19,19 +19,14 @@
 -->

 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 

            xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

-           xmlns:c="http://creditcard" 

-           targetNamespace="http://creditcard" 

-           name="emailgateway">

+           xmlns:e="http://emailgateway-test" 

+           targetNamespace="http://emailgateway-test" 

+           name="emailgateway-test">

     <component name="EmailGatewayClient">

         <implementation.java class="scatours.emailgateway.client.impl.EmailGatewayClientImpl" />

         <reference name="emailGateway">

             <binding.ws uri="http://localhost:8088/EmailGateway" />

         </reference>

     </component>

-    <component name="EmailGateway">

-        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />

-        <service name="EmailGateway">

-            <binding.ws uri="http://localhost:8088/EmailGateway" />

-        </service>

-    </component>

+

 </composite>