From 34363c11354a81bd1b3299a4e72b1d92f963d767 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 17 Jan 2010 19:49:17 +0000
Subject: Tidy up test composite structure

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900205 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/META-INF/sca-contribution.xml   |  4 ++-
 .../src/main/resources/emailgateway.composite      | 32 +++++++++++++++++++
 .../emailgateway/EmailGatewayTestCase.java         |  2 +-
 .../test/resources/META-INF/sca-contribution.xml   |  4 ++-
 .../src/test/resources/emailgateway-test.composite | 32 +++++++++++++++++++
 .../src/test/resources/emailgateway.composite      | 37 ----------------------
 6 files changed, 71 insertions(+), 40 deletions(-)
 create mode 100644 sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
 create mode 100644 sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
 delete mode 100644 sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite

(limited to 'sandbox/travelsample')

diff --git a/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
index 6c14befa9d..7d8aa000cc 100644
--- a/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/emailgateway/src/main/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" >
     <export.java package="com.tuscanyscatours.emailgateway" />
     <export.java package="com.tuscanyscatours.emailgateway.impl" />
+    <deployable composite="e:emailgateway" />
 </contribution>
diff --git a/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite b/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
new file mode 100644
index 0000000000..a401b2a96e
--- /dev/null
+++ b/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:e="http://emailgateway" 
+           targetNamespace="http://emailgateway" 
+           name="emailgateway">
+
+    <component name="EmailGateway">
+        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
+        <service name="EmailGateway">
+            <binding.ws uri="http://localhost:8088/EmailGateway" />
+        </service>
+    </component>
+</composite>
diff --git a/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java b/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
index e820d30915..8b0ecba024 100644
--- a/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
+++ b/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
@@ -44,7 +44,7 @@ public class EmailGatewayTestCase {
     public static void setUpBeforeClass() throws Exception {
         SCANodeFactory factory = SCANodeFactory.newInstance();
         node =
-            factory.createSCANode("emailgateway.composite",
+            factory.createSCANode(null,
                                   new SCAContribution("emailgateway", "./target/classes"),
                                   new SCAContribution("emailgateway-test", "./target/test-classes"));
         node.start();
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-test.composite b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
new file mode 100644
index 0000000000..8305356bda
--- /dev/null
+++ b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           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>
+
+</composite>
diff --git a/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite b/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
deleted file mode 100644
index f2ed1f345c..0000000000
--- a/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<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">
-    <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>
-- 
cgit v1.2.3