From 4100cfc367e2825b82065c87cd4771ce2dcfbc4c Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 16 Sep 2010 20:13:11 +0000
Subject: Merge commits r996988, r996991, r996994, r996998, r997259 and r997886
 from 1.6.1 branch (TUSCANY-3676)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997908 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/distribution/src/main/assembly/bin.xml         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml')

diff --git a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
index 9e959d4bf1..71fc5a86f1 100644
--- a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
@@ -101,6 +101,7 @@
                 <exclude>*/**/*.svg</exclude>
                 <!-- Sample specific work file/folders to exclude -->
                 <exclude>pom.xml</exclude>
+                <exclude>pom-distribution.xml</exclude>
                 <exclude>calculator-distributed/work</exclude>
                 <exclude>calculator-distributed/work/**/*</exclude>
                 <exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
@@ -123,8 +124,6 @@
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
                 <exclude>feed-aggregator-webapp/target/war</exclude>
-                <exclude>store-dojo</exclude>
-                <exclude>store-dojo/**/*</exclude>
                 <exclude>store-webapp/target</exclude>
                 <exclude>store-webapp/target/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
@@ -227,6 +226,10 @@
                 <exclude>helloworld-ws-deep-webapp/work/**/*</exclude>
                 <exclude>helloworld-ws-service-webapp</exclude>
                 <exclude>helloworld-ws-service-webapp/**/*</exclude>
+                <exclude>store-dojo</exclude>
+                <exclude>store-dojo/**/*</exclude>
+                <exclude>zipcode-jaxws/</exclude>
+                <exclude>zipcode-jaxws/**/*</exclude>
             </excludes>
         </fileSet>
         <!-- Add all the demos to the demos directory -->
@@ -375,6 +378,15 @@
         </fileSet-->
     </fileSets>
 
+    <files>
+        <!-- Add the subsetted distribution pom.xml to the samples directory -->
+        <file>
+            <source>../samples/pom-distribution.xml</source>
+            <outputDirectory>tuscany-sca-${tuscany.version}/samples</outputDirectory>
+            <destName>pom.xml</destName>
+        </file>
+    </files>
+
     <dependencySets>
         <!-- Add all the Tuscany modules to the modules directory -->
         <dependencySet>
-- 
cgit v1.2.3