From 9c82d03135b16be14ccc567c6d282001d5ec27d6 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 Oct 2010 15:20:21 +0000
Subject: TUSCANY-3729: Apply r1023208 changes to 1.x trunk except for deletion
 of unreleased modules and samples

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

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

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 b616731e71..3f4251595d 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
@@ -102,8 +102,6 @@
                 <exclude>*/target/wsdl2java-source/**/*</exclude>
                 <exclude>*/**/*.svg</exclude>
                 <!-- Sample specific work file/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>pom-distribution.xml</exclude>
                 <exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
                 <exclude>calculator-webapp/target/sample-calculator-webapp/**/*</exclude>
                 <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp</exclude>
@@ -112,8 +110,6 @@
                 <exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp/**/*</exclude>
                 <exclude>chat-webapp/target/sample-chat-webapp</exclude>
                 <exclude>chat-webapp/target/sample-chat-webapp/**/*</exclude>
-                <exclude>domain-webapp/target/sample-domain-webapp</exclude>
-                <exclude>domain-webapp/target/sample-domain-webapp/**/*</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
@@ -136,7 +132,6 @@
                 <exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp.war</exclude>
                 <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp.war</exclude>
                 <exclude>chat-webapp/target/sample-chat-webapp.war</exclude>
-                <exclude>domain-webapp/target/sample-domain-webapp.war</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp.war</exclude>
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp.war</exclude>
                 <exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp.war</exclude>
@@ -145,49 +140,6 @@
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
                 <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
                 <exclude>store-webapp/target/sample-helloworld-store-webapp.war</exclude>
-                <!-- Modules excluded from distribution as work is in progress... -->
-                <exclude>calculator2</exclude>
-                <exclude>calculator2/**/*</exclude>
-                <exclude>calculator-lean</exclude>
-                <exclude>calculator-lean/**/*</exclude>
-                <exclude>calculator-osgi</exclude>
-                <exclude>calculator-osgi/**/*</exclude>
-                <exclude>calculator-rcp</exclude>
-                <exclude>calculator-rcp/**/*</exclude>
-                <exclude>chat2-webapp</exclude>
-                <exclude>chat2-webapp/**/*</exclude>
-                <exclude>customer-dojo</exclude>
-                <exclude>customer-dojo/**/*</exclude>
-                <exclude>customer-dojo-webapp</exclude>
-                <exclude>customer-dojo-webapp/**/*</exclude>
-                <exclude>helloworld-distributed</exclude>
-                <exclude>helloworld-distributed/**/*</exclude>
-                <exclude>helloworld-jsp</exclude>
-                <exclude>helloworld-jsp/**/*</exclude>
-                <exclude>helloworld-servlet</exclude>
-                <exclude>helloworld-servlet/**/*</exclude>
-                <exclude>helloworld-web</exclude>
-                <exclude>helloworld-web/**/*</exclude>
-                <exclude>helloworld-web-callback</exclude>
-                <exclude>helloworld-web-callback/**/*</exclude>
-                <exclude>loanapplication</exclude>
-                <exclude>loanapplication/**/*</exclude>
-                <exclude>helloworld-ws-reference-lean</exclude>
-                <exclude>helloworld-ws-reference-lean/**/*</exclude>
-                <exclude>spi-implementation-pojo</exclude>
-                <exclude>spi-implementation-pojo/**/*</exclude>
-		    <exclude>helloworld-jms-webapp</exclude>
-                <exclude>helloworld-jms-webapp/**/*</exclude>
-                <exclude>domain-webapp</exclude>
-                <exclude>domain-webapp/**/*</exclude>
-                <exclude>calculator-ws-secure-webapp</exclude>
-                <exclude>calculator-ws-secure-webapp/**/*</exclude>
-                <exclude>helloworld-ws-deep-webapp</exclude>
-                <exclude>helloworld-ws-deep-webapp/**/*</exclude>
-                <exclude>helloworld-ws-service-webapp</exclude>
-                <exclude>helloworld-ws-service-webapp/**/*</exclude>
-                <exclude>zipcode-jaxws/</exclude>
-                <exclude>zipcode-jaxws/**/*</exclude>
             </excludes>
         </fileSet>
         <!-- Add all the demos to the demos directory -->
@@ -274,14 +226,6 @@
                 <include>tuscany-sca-manifest.jar</include>
             </includes>
         </fileSet>
-        <!-- Add the node launcher webapp to the modules directory -->
-        <fileSet>
-            <directory>../modules/node2-launcher-webapp/target</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}/modules</outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
 
         <!-- temporary fix since maven dependencies of rampart seems to refere to SNAPSHOT versions of the parent pom --> 
         <!--fileSet>
@@ -293,15 +237,6 @@
         </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