Merge r999922 Exclude generated eclipse project files from the binary distribution and fix other inconsistencies

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

1 files changed, 49 insertions, 129 deletions

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 22bfba981f..dc92a70efb 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
@@ -66,6 +66,7 @@
                 <!-- General file/folders to exclude -->
                 <exclude>*/.classpath</exclude>
                 <exclude>*/.project</exclude>
+                <exclude>*/maven-eclipse.xml</exclude>
                 <exclude>**/pom-transformed.xml</exclude>
                 <exclude>*/.settings</exclude>
                 <exclude>*/.settings/**/*</exclude>
@@ -74,12 +75,15 @@
                 <exclude>*/work</exclude>
                 <exclude>*/work/**/*</exclude>
                 <exclude>**/activemq-test.log</exclude>
+                <exclude>**/activemq-data</exclude>
+                <exclude>**/activemq-data/**/*</exclude>
                 <exclude>**/derby.log</exclude>
                 <exclude>**/resources/dojo</exclude>
                 <exclude>**/resources/dojo/**/*</exclude>
                 <exclude>**/webapp/dojo</exclude>
                 <exclude>**/webapp/dojo/**/*</exclude>
                 <exclude>**/target/war/**</exclude>
+                <exclude>**/target/archive-tmp/**</exclude>
                 <exclude>*/target/mvn-eclipse-cache.properties</exclude>
                 <exclude>*/target/classes</exclude>
                 <exclude>*/target/classes/**/*</exclude>
@@ -97,70 +101,36 @@
                 <exclude>*/target/sdo-source/**/*</exclude>
                 <exclude>*/target/wsdl2java-source</exclude>
                 <exclude>*/target/wsdl2java-source/**/*</exclude>
-                <exclude>*/**/derby.log</exclude>
                 <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>
                 <exclude>calculator-webapp/target/sample-calculator-webapp/**/*</exclude>
                 <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp</exclude>
                 <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp/**/*</exclude>
-                <exclude>calculator-ws-secure-webapp</exclude>
-                <exclude>calculator-ws-secure-webapp/**/*</exclude>
-                <exclude>calculator-ws-secure-webapp/work</exclude>
-                <exclude>callback-ws-client/work</exclude>
-                <exclude>callback-ws-client/work/**/*</exclude>
-                <exclude>callback-ws-service/work</exclude>
-                <exclude>callback-ws-service/work/**/*</exclude>
+                <exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp</exclude>
+                <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>customer-dojo-webapp/src/main/webapp/dojo</exclude>
-                <exclude>customer-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>customer-dojo-webapp/target/</exclude>
-                <exclude>customer-dojo-webapp/target/**/*</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>feed-aggregator-webapp/target/war</exclude>
-                <exclude>store-webapp/target</exclude>
-                <exclude>store-webapp/target/**/*</exclude>
-                <exclude>helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
-                <exclude>helloworld-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp/**/*</exclude>
-                <exclude>helloworld-dojo-webapp/target/war</exclude>
+                <exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp</exclude>
+                <exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp/**/*</exclude>
                 <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp</exclude>
                 <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp/**/*</exclude>
-                <exclude>helloworld-ws-reference/work</exclude>
-                <exclude>helloworld-ws-reference/work/**/*</exclude>
-                <exclude>helloworld-ws-reference-jms/activemq-data</exclude>
-                <exclude>helloworld-ws-reference-jms/activemq-data/**/*</exclude>
-                <exclude>helloworld-ws-reference-secure/work</exclude>
-                <exclude>helloworld-ws-reference-secure/work/**/*</exclude>
-                <exclude>helloworld-ws-service/work</exclude>
-                <exclude>helloworld-ws-service/secure/work/**/*</exclude>
-                <exclude>helloworld-ws-service/secure/work</exclude>
-                <exclude>helloworld-ws-service/work/**/*</exclude>
-                <exclude>helloworld-ws-service-jms/activemq-data</exclude>
-                <exclude>helloworld-ws-service-jms/activemq-data/**/*</exclude>
-                <exclude>helloworld-ws-service-secure/work</exclude>
-                <exclude>helloworld-ws-service-secure/work/**/*</exclude>
+                <exclude>helloworld-ws-deep-webapp/target/sample-helloworld-ws-deep-webapp</exclude>
+                <exclude>helloworld-ws-deep-webapp/target/sample-helloworld-ws-deep-webapp/**/*</exclude>
                 <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp</exclude>
                 <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp/**/*</exclude>
-                <exclude>helloworld-ws-sdo/work</exclude>
-                <exclude>helloworld-ws-sdo/work/**/*</exclude>
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp</exclude>
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp/**/*</exclude>
-                <exclude>osgi-supplychain/.felix</exclude>
-                <exclude>osgi-supplychain/.felix/**/*</exclude>
-                <exclude>osgi-supplychain/target/sample-osgi-supplychain</exclude>
-                <exclude>osgi-supplychain/target/sample-osgi-supplychain/**/*</exclude>
-                <exclude>simple-bigbank-spring/src/main/resources/web/dojo</exclude>
-                <exclude>simple-bigbank-spring/src/main/resources/web/dojo/**/*</exclude>
-                <exclude>simple-callback-ws/work</exclude>
-                <exclude>simple-callback-ws/work/**/*</exclude>
+                <exclude>store-webapp/target/sample-store-webapp</exclude>
+                <exclude>store-webapp/target/sample-store-webapp/**/*</exclude>
                 <exclude>zipcode-jaxws/target/endorsed</exclude>
                 <exclude>zipcode-jaxws/target/endorsed/**/*</exclude>
                 <!-- Sample war files to exclude -->
@@ -175,8 +145,7 @@
                 <exclude>helloworld-ws-deep-webapp/target/sample-helloworld-ws-deep-webapp.war</exclude>
                 <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-ws-sdo-webapp.war</exclude>
-                <exclude>store-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>
@@ -214,16 +183,12 @@
                 <exclude>spi-implementation-pojo/**/*</exclude>
 		    <exclude>helloworld-jms-webapp</exclude>
                 <exclude>helloworld-jms-webapp/**/*</exclude>
-                <exclude>helloworld-jms-webapp/work</exclude>
                 <exclude>domain-webapp</exclude>
                 <exclude>domain-webapp/**/*</exclude>
                 <exclude>calculator-ws-secure-webapp</exclude>
                 <exclude>calculator-ws-secure-webapp/**/*</exclude>
-                <exclude>calculator-ws-secure-webapp/work</exclude>
                 <exclude>helloworld-ws-deep-webapp</exclude>
                 <exclude>helloworld-ws-deep-webapp/**/*</exclude>
-                <exclude>helloworld-ws-deep-webapp/work</exclude>
-                <exclude>helloworld-ws-deep-webapp/work/**/*</exclude>
                 <exclude>helloworld-ws-service-webapp</exclude>
                 <exclude>helloworld-ws-service-webapp/**/*</exclude>
                 <exclude>store-dojo</exclude>
@@ -241,17 +206,20 @@
                 <include>**/*</include>
             </includes>
             <excludes>
+                <!-- General file/folders to exclude -->
                 <exclude>*/.classpath</exclude>
                 <exclude>*/.project</exclude>
+                <exclude>*/maven-eclipse.xml</exclude>
                 <exclude>**/pom.transformed.xml</exclude>
                 <exclude>*/.settings</exclude>
                 <exclude>*/.settings/**/*</exclude>
+                <exclude>*/.externalToolBuilders/**</exclude>
+                <exclude>*/work</exclude>
+                <exclude>*/work/**/*</exclude>
                 <exclude>**/resources/dojo</exclude>
                 <exclude>**/resources/dojo/**/*</exclude>
                 <exclude>**/webapp/dojo</exclude>
                 <exclude>**/webapp/dojo/**/*</exclude>                
-                <exclude>*/work</exclude>
-                <exclude>*/work/**/*</exclude>
                 <exclude>*/target/classes</exclude>
                 <exclude>*/target/classes/**/*</exclude>
                 <exclude>*/target/test-classes</exclude>
@@ -259,48 +227,17 @@
                 <exclude>*/target/surefire-reports</exclude>
                 <exclude>*/target/surefire-reports/**/*</exclude>
                 <exclude>**/derby.log</exclude>
-                <exclude>*/**/derby.log</exclude>
                 <exclude>*/**/*.svg</exclude>
                 <exclude>*/**/*.ruleset</exclude>
-                <exclude>alert-aggregator-webapp/bin</exclude>
-                <exclude>alert-aggregator-webapp/bin/**/*</exclude>
-                <exclude>alert-aggregator-webapp/src/main/webapp/dojo</exclude>
-                <exclude>alert-aggregator-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator</exclude>
-                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator/**/*</exclude>
-                <exclude>alert-aggregator-webapp/target/sdo-source</exclude>
-                <exclude>alert-aggregator-webapp/target/sdo-source/**/*</exclude>
-                <exclude>alert-aggregator-webapp/target</exclude>
-                <exclude>alert-aggregator-webapp/target/**/*</exclude>
-                <exclude>bigbank/src/main/resources/web/dojo</exclude>
-                <exclude>bigbank/src/main/resources/web/dojo/**/*</exclude>
-                <exclude>bigbank-account/src/main/resources/web/dojo</exclude> 
-                <exclude>bigbank-account/src/main/resources/web/dojo/**/*</exclude>
-                <exclude>helloworld-ws-sdo/work</exclude>
-                <exclude>helloworld-ws-sdo/work/**/*</exclude>
-                <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck</exclude>
-                <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck/**/*</exclude>
-                <exclude>mortgage-creditcheck/target</exclude>
-                <exclude>mortgage-creditcheck/target/**/*</exclude>
-                <exclude>mortgage-loanapproval/target</exclude>
-                <exclude>mortgage-loanapproval/target/**/*</exclude>
-                <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude> 
-                <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude> 
-                <exclude>secure-bigbank/secure-bigbank-account/target</exclude>
-                <exclude>secure-bigbank/secure-bigbank-account/target/**/*</exclude>
-                <exclude>secure-bigbank/secure-bigbank-calculator/target</exclude>
-                <exclude>secure-bigbank/secure-bigbank-calculator/target/**/*</exclude>
-                <exclude>secure-bigbank/secure-bigbank-stockquote/target</exclude>
-                <exclude>secure-bigbank/secure-bigbank-stockquote/target/**/*</exclude>
-                <exclude>xml-bigbank/target</exclude>
-                <exclude>xml-bigbank/target/**/*</exclude>
-                <exclude>target</exclude>
-                <exclude>target/**/*</exclude>
-                <!-- Modules excluded from distribution as work is in progress... -->
-		    <exclude>load-balancing-webapp</exclude>
-		    <exclude>load-balancing-webapp/**/*</exclude>
-                <exclude>workpool-distributed</exclude>
-                <exclude>workpool-distributed/**/*</exclude>
+                <exclude>*/target/sdo-source/**</exclude>
+                <exclude>*/target/maven-archiver/**</exclude>
+                <exclude>*/target/cargo-jetty/**</exclude>
+                <exclude>*/target/war/**</exclude>
+                <!-- Specific work file/folders to exclude -->
+                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator-webapp</exclude>
+                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator-webapp/**/*</exclude>
+                <!-- war files to exclude -->
+                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator-webapp.war</exclude>
             </excludes>
         </fileSet>
         <!-- Add all the tutorials to the tutorials directory -->
@@ -312,45 +249,28 @@
                 <include>**/*</include>
             </includes>
             <excludes>
-                <exclude>*/.classpath</exclude>
-                <exclude>*/.project</exclude>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
                 <exclude>**/pom.transformed.xml</exclude>
-                <exclude>*/.settings</exclude>
-                <exclude>*/.settings/**/*</exclude>
-                <exclude>*/work</exclude>
-                <exclude>*/work/**/*</exclude>
-                <exclude>*/target/classes</exclude>
-                <exclude>*/target/classes/**/*</exclude>
-                <exclude>*/target/test-classes</exclude>
-                <exclude>*/target/test-classes/**/*</exclude>
-                <exclude>*/target/surefire-reports</exclude>
-                <exclude>*/target/surefire-reports/**/*</exclude>
-                <exclude>*/target/war</exclude>
-                <exclude>*/target/war/**/*</exclude>
+                <exclude>**/.settings/**</exclude>
+                <exclude>**/target/classes/**</exclude>
+                <exclude>**/target/test-classes/**</exclude>
+                <exclude>**/target/surefire-reports/**</exclude>
+                <exclude>**/target/maven-archiver/**</exclude>
+                <exclude>**/target/war/**</exclude>
+                <exclude>**/target/.felix/**</exclude>
                 <exclude>**/derby.log</exclude>
-                <exclude>*/**/derby.log</exclude>
-                <exclude>*/**/*.svg</exclude>
-                <exclude>*/**/*.ruleset</exclude>
-                <exclude>target</exclude>
-                <exclude>target/**/*</exclude>
-                <exclude>store/*/target/classes</exclude>
-                <exclude>store/*/target/classes/**/*</exclude>
-                <exclude>store/*/target/test-classes</exclude>
-                <exclude>store/*/target/test-classes/**/*</exclude>
-                <exclude>store/*/target/surefire-reports</exclude>
-                <exclude>store/*/target/surefire-reports/**/*</exclude>
-                <exclude>store/*/target/maven-archiver</exclude>
-                <exclude>store/*/target/maven-archiver/**/*</exclude>
-                <exclude>store/catalog-webapp/target</exclude>
-                <exclude>store/catalog-webapp/target/**/*</exclude>
-                <exclude>store/store-db/target/cart-db/</exclude>
-                <exclude>store/store-db/target/cart-db/**/*</exclude>
-                <exclude>store/store-eu/target/cart-eu-db/</exclude>
-                <exclude>store/store-eu/target/cart-eu-db/**/*</exclude>
-                <exclude>store/store-supplier/target/cart-db/</exclude>
-                <exclude>store/store-supplier/target/cart-db/**/*</exclude>
-                <exclude>travelsample</exclude>
-                <exclude>travelsample/**/*</exclude>
+                <exclude>**/*.svg</exclude>
+                <exclude>**/*.ruleset</exclude>
+                 <!-- Specific work file/folders to exclude -->
+                <exclude>store/catalog-webapp/target/tutorial-catalog-webapp/**</exclude>
+                <exclude>store/store-db/target/cart-db/**</exclude>
+                <exclude>store/store-eu/target/cart-eu-db/**</exclude>
+                <exclude>store/store-supplier/target/cart-db/**</exclude>
+                <exclude>travelsample/**</exclude>
+                <!-- war files to exclude -->
+                <exclude>store/catalog-webapp/target/tutorial-catalog-webapp.war</exclude>
             </excludes>
         </fileSet>
         <!-- Add the generated tuscany manifest classpath jar to the lib directory -->