Exclude Tuscany runtime dependencies from the travel sample distribution default build (TUSCANY-3462)

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

3 files changed, 76 insertions, 27 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml
new file mode 100644
index 0000000000..ed61a17af3
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml
@@ -0,0 +1,28 @@
+<!--

+    * 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.

+-->

+<component>

+

+    <files>

+        <file>

+            <source>../src/main/resources/build-defs.xml</source>

+            <outputDirectory>util</outputDirectory>

+        </file>

+    </files>

+

+</component>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
index 0784bd0bc0..0a35eef5ff 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
@@ -17,17 +17,6 @@
     * under the License.
 -->
 <component>
-    <fileSets>
-
-        <fileSet>
-            <directory>bundle/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>tuscany-sca-manifest.jar</include>
-            </includes>
-        </fileSet>
-
-    </fileSets>
 
     <files>
         <file>
@@ -48,20 +37,6 @@
     </files>
 
     <dependencySets>
-        <!-- Add all the Tuscany modules to the modules directory -->
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <includes>
-                <include>*:*</include>
-            </includes>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:scatours*</exclude>
-            </excludes>
-            <scope>runtime</scope>
-        </dependencySet>
-
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>util</outputDirectory>
@@ -72,6 +47,7 @@
             </includes>
             <scope>runtime</scope>
         </dependencySet>
+
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>contributions</outputDirectory>
@@ -82,6 +58,7 @@
             </includes>
             <scope>runtime</scope>
         </dependencySet>
+
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>launchers</outputDirectory>
@@ -92,6 +69,7 @@
             </includes>
             <scope>runtime</scope>
         </dependencySet>
+
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>services</outputDirectory>
@@ -102,16 +80,18 @@
             </includes>
             <scope>runtime</scope>
         </dependencySet>
+
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>clients</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <includes>
                 <include>org.apache.tuscany.sca:scatours-client-*</include>
             </includes>
             <scope>runtime</scope>
         </dependencySet>
+
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>domainconfig</outputDirectory>
@@ -121,7 +101,6 @@
             </includes>
             <scope>runtime</scope>
         </dependencySet>
-
     </dependencySets>
 
 </component>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml
new file mode 100644
index 0000000000..90db09cfbe
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml
@@ -0,0 +1,42 @@
+<!--

+    * 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.

+-->

+<component>

+

+    <files>

+        <file>

+            <source>../src/main/resources/build-defs-selfcontained.xml</source>

+            <outputDirectory>util</outputDirectory>

+            <destName>build-defs.xml</destName>

+        </file>

+    </files>

+

+    <dependencySets>

+        <!-- Add all the Tuscany dependencies to the lib directory -->

+        <dependencySet>

+            <useProjectArtifact>false</useProjectArtifact>

+            <outputDirectory>lib</outputDirectory>

+            <unpack>false</unpack>

+            <excludes>

+                <exclude>org.apache.tuscany.sca:scatours*</exclude>

+            </excludes>

+            <scope>runtime</scope>

+        </dependencySet>

+    </dependencySets>

+

+</component>