Reverse the commit for revision r946311

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

23 files changed, 6 insertions, 6 deletions

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
index 2cbf5348b1..8ac5c0a7fc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
@@ -48,12 +48,12 @@
                             <tasks>

                                 <mkdir dir="target/jar-classes/fullapp"/>

                                 <copy todir="target/jar-classes/fullapp">

-                                    <fileset dir="src/main/resources/fullapp">

+                                    <fileset dir="src/main/resources">

                                         <exclude name="workspace*.xml"/>

                                     </fileset>

                                 </copy>

                                 <copy todir="target/jar-classes/fullapp">

-                                    <fileset dir="src/main/resources/fullapp">

+                                    <fileset dir="src/main/resources">

                                         <include name="workspace-distribution.xml"/>

                                     </fileset>

                                     <globmapper from="workspace-distribution.xml" to="workspace.xml"/>

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
index 284376538a..284376538a 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-bespoketrip.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
index b6d9d51cbc..b6d9d51cbc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-bespoketrip.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-coordination.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
index b42457154f..b42457154f 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-coordination.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-creditcard.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
index 5c66ff2796..5c66ff2796 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-creditcard.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-currency.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
index 185112122c..185112122c 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-currency.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-packagedtrip.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
index 323700b4a0..323700b4a0 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-packagedtrip.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-payment.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
index b27b57fad5..b27b57fad5 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-payment.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-shoppingcart.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
index 7bec251965..7bec251965 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-shoppingcart.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-ui.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
index e86bef1c56..e86bef1c56 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/cloud/fullapp-ui.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
index c54cfa3416..c54cfa3416 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/domain.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
index a7a3b01895..a7a3b01895 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace-distribution.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
index 8f1efcd1fd..8f1efcd1fd 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
index 9df2fe06f9..046a92980d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
@@ -48,12 +48,12 @@
                             <tasks>

                                 <mkdir dir="target/jar-classes/introducing"/>

                                 <copy todir="target/jar-classes/introducing">

-                                    <fileset dir="src/main/resources/introducing">

+                                    <fileset dir="src/main/resources">

                                         <exclude name="workspace*.xml"/>

                                     </fileset>

                                 </copy>

                                 <copy todir="target/jar-classes/introducing">

-                                    <fileset dir="src/main/resources/introducing">

+                                    <fileset dir="src/main/resources">

                                         <include name="workspace-distribution.xml"/>

                                     </fileset>

                                     <globmapper from="workspace-distribution.xml" to="workspace.xml"/>

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
index 5d400e1be8..5d400e1be8 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
index adf8f0e9cb..adf8f0e9cb 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ClientNode.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
index 6e8f7fadb6..6e8f7fadb6 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/ToursNode.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
index 9e4b454941..9e4b454941 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/TripsNode.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
index ec0f71484b..ec0f71484b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/domain.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
index 5c058ee325..5c058ee325 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace-distribution.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
index 59468135c1..59468135c1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
index 668c9178b2..36de2a93e4 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
@@ -32,7 +32,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>

                 </fileset>

             </classpath>

-            <arg value="../../domainconfig/fullapp/target/classes/fullapp"/>

+            <arg value="../../domainconfig/fullapp/target/classes"/>

         </java>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
index fd111f8c0f..9d8c28b8e1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
@@ -32,7 +32,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>

                 </fileset>

             </classpath>

-            <arg value="../../domainconfig/introducing/target/classes/introducing"/>

+            <arg value="../../domainconfig/introducing/target/classes"/>

         </java>

     </target>

 </project>