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

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946460 13f79535-47bb-0310-9956-ffa450edef68
---
 .../travelsample/domainconfig/fullapp/build.xml    |  4 +--
 .../travelsample/domainconfig/fullapp/pom.xml      |  6 ++--
 .../src/main/resources/workspace-binaries.xml      | 42 ++++++++++++++++++++++
 .../src/main/resources/workspace-distribution.xml  | 42 ----------------------
 .../domainconfig/introducing/build.xml             |  4 +--
 .../travelsample/domainconfig/introducing/pom.xml  |  6 ++--
 .../src/main/resources/workspace-binaries.xml      | 30 ++++++++++++++++
 .../src/main/resources/workspace-distribution.xml  | 30 ----------------
 8 files changed, 82 insertions(+), 82 deletions(-)
 create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml
 delete mode 100644 sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
 create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml
 delete mode 100644 sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml

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

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
index 12229733f0..931bbc3ead 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
@@ -30,9 +30,9 @@
         </copy>
         <copy todir="target/jar-classes/fullapp">
             <fileset dir="src/main/resources">
-                <include name="workspace-distribution.xml"/>
+                <include name="workspace-binaries.xml"/>
             </fileset>
-            <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+            <globmapper from="workspace-binaries.xml" to="workspace.xml"/>
         </copy>
     </target>
 </project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
index 8ac5c0a7fc..03766729c3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
@@ -34,7 +34,7 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <excludes>
-                    <exclude>workspace-distribution.xml</exclude>
+                    <exclude>workspace-binaries.xml</exclude>
                 </excludes>
             </resource>
         </resources>
@@ -54,9 +54,9 @@
                                 </copy>
                                 <copy todir="target/jar-classes/fullapp">
                                     <fileset dir="src/main/resources">
-                                        <include name="workspace-distribution.xml"/>
+                                        <include name="workspace-binaries.xml"/>
                                     </fileset>
-                                    <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+                                    <globmapper from="workspace-binaries.xml" to="workspace.xml"/>
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml
new file mode 100644
index 0000000000..a7a3b01895
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml
@@ -0,0 +1,42 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+  <contribution location="file:../contributions/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../contributions/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../contributions/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../contributions/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../contributions/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../contributions/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../contributions/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../contributions/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <!-- the following line should be payment-spring-policy but this doesn't work when using the domain manager (TUSCANY-3476) -->
+  <contribution location="file:../contributions/scatours-contribution-payment-java-policy.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../contributions/scatours-contribution-creditcard-payment-jaxb-policy.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../contributions/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../contributions/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../contributions/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:../domainconfig/fullapp/cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
\ No newline at end of file
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
deleted file mode 100644
index a7a3b01895..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
+++ /dev/null
@@ -1,42 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:../contributions/scatours-contribution-common.jar"  uri="common"/>
-  <contribution location="file:../contributions/scatours-contribution-currency.jar"  uri="currency"/>
-  <contribution location="file:../contributions/scatours-contribution-hotel.jar"  uri="hotel"/>
-  <contribution location="file:../contributions/scatours-contribution-flight.jar"  uri="flight"/>
-  <contribution location="file:../contributions/scatours-contribution-car.jar"  uri="car"/>
-  <contribution location="file:../contributions/scatours-contribution-trip.jar"  uri="trip"/>
-  <contribution location="file:../contributions/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
-  <contribution location="file:../contributions/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
-  <!-- the following line should be payment-spring-policy but this doesn't work when using the domain manager (TUSCANY-3476) -->
-  <contribution location="file:../contributions/scatours-contribution-payment-java-policy.jar"  uri="fullapp-payment"/>
-  <contribution location="file:../contributions/scatours-contribution-creditcard-payment-jaxb-policy.jar"  uri="fullapp-creditcard"/>
-  <contribution location="file:../contributions/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
-  <contribution location="file:../contributions/scatours-contribution-scatours.jar"  uri="scatours"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
-  <contribution location="file:../contributions/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
-  <contribution location="file:../domainconfig/fullapp/cloud" uri="http://tuscany.apache.org/cloud"/>  
-</workspace>
\ No newline at end of file
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
index 8d3fb63a4a..19058058c3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
@@ -30,9 +30,9 @@
         </copy>
         <copy todir="target/jar-classes/introducing">
             <fileset dir="src/main/resources">
-                <include name="workspace-distribution.xml"/>
+                <include name="workspace-binaries.xml"/>
             </fileset>
-            <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+            <globmapper from="workspace-binaries.xml" to="workspace.xml"/>
         </copy>
     </target>
 </project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
index 046a92980d..001bf09f23 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
@@ -34,7 +34,7 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <excludes>
-                    <exclude>workspace-distribution.xml</exclude>
+                    <exclude>workspace-binaries.xml</exclude>
                 </excludes>
             </resource>
         </resources>
@@ -54,9 +54,9 @@
                                 </copy>
                                 <copy todir="target/jar-classes/introducing">
                                     <fileset dir="src/main/resources">
-                                        <include name="workspace-distribution.xml"/>
+                                        <include name="workspace-binaries.xml"/>
                                     </fileset>
-                                    <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+                                    <globmapper from="workspace-binaries.xml" to="workspace.xml"/>
                                 </copy>
                             </tasks>
                         </configuration>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml
new file mode 100644
index 0000000000..5c058ee325
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml
@@ -0,0 +1,30 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:../domainconfig/introducing/cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-tours.jar"
+           uri="introducing-tours"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-trips.jar"
+           uri="introducing-trips"/>
+    <contribution location="file:../contributions/scatours-contribution-introducing-client.jar"
+           uri="introducing-client"/>
+</workspace>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
deleted file mode 100644
index 5c058ee325..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
+++ /dev/null
@@ -1,30 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-    <contribution location="file:../domainconfig/introducing/cloud"
-           uri="http://tuscany.apache.org/cloud"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-tours.jar"
-           uri="introducing-tours"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-trips.jar"
-           uri="introducing-trips"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-client.jar"
-           uri="introducing-client"/>
-</workspace>
-- 
cgit v1.2.3