Merge r1002090 Use consistent resource exclusion patterns in all build files for the Store tutorial

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

14 files changed, 15 insertions, 26 deletions

diff --git a/sca-java-1.x/trunk/tutorials/store/assets/pom.xml b/sca-java-1.x/trunk/tutorials/store/assets/pom.xml
index 8fcb0dc654..c1404c1d0e 100644
--- a/sca-java-1.x/trunk/tutorials/store/assets/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/assets/pom.xml
@@ -65,7 +65,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml b/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml
index 2049ca169a..f273790115 100644
--- a/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml
@@ -35,7 +35,7 @@
             </classpath>

         </javac>

         <copy todir="target/classes">

-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, build-dependency.xml, target/**"/>

+            <fileset dir="." excludes="**/*.java, **/.*/**, pom.xml, build*.xml, target/**"/>

         </copy>

         <jar destfile="target/tutorial-catalog-mediation.jar" basedir="target/classes">

             <manifest>

diff --git a/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml b/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml
index 18642bd249..ac2bb628bf 100644
--- a/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml
@@ -66,8 +66,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>build-dependency.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml b/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
index ec0fe27f85..91d27118bd 100644
--- a/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
@@ -25,7 +25,7 @@
     <target name="compile">

         <mkdir dir="target/classes"/>

         <copy todir="target/classes">

-            <fileset dir="." excludes="pom.xml, build.xml, build-dependency.xml, webapp/**, target/**"/>

+            <fileset dir="." excludes="**/*.java, pom.xml, **/.*/**, build*.xml, target/**, webapp/**"/>

         </copy>

         <war destfile="target/tutorial-catalog-webapp.war" webxml="webapp/WEB-INF/web.xml">

             <fileset dir="webapp"/>

diff --git a/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml b/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml
index 1f1323b0eb..bd13fe32a2 100644
--- a/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml
@@ -76,10 +76,9 @@
                   <exclude>**/*.java</exclude>

                   <exclude>**/.*/**</exclude>

                   <exclude>pom.xml</exclude>

-                  <exclude>build.xml</exclude>

-                  <exclude>build-dependency.xml</exclude>

-                  <exclude>webapp/**</exclude>

+                  <exclude>build*.xml</exclude>

                   <exclude>target/**</exclude>

+                  <exclude>webapp/**</exclude>

               </excludes>

           </resource>

        </resources>

diff --git a/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml
index 2a2f520d5a..3e286398da 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml
@@ -53,7 +53,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml
index d5c77ab6d8..1d53606415 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml
@@ -53,7 +53,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml
index 7310502d0a..5ee8bb85a3 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml
@@ -53,7 +53,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml
index 2540f767f6..26ed794dac 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml
@@ -53,7 +53,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
index a040414646..828923de17 100644
--- a/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
@@ -35,14 +35,6 @@
        </repository>
     </repositories>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.7-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
     <build>
        <finalName>${artifactId}</finalName>
        <sourceDirectory>${basedir}</sourceDirectory>
@@ -53,7 +45,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/store/pom.xml b/sca-java-1.x/trunk/tutorials/store/store/pom.xml
index 27fde761fe..7cc5f75ae8 100644
--- a/sca-java-1.x/trunk/tutorials/store/store/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/store/pom.xml
@@ -53,7 +53,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
index e70d849752..2fa88f52d4 100644
--- a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
+++ b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
@@ -33,7 +33,7 @@
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, build-dependency.xml, target/**"/>
+            <fileset dir="." excludes="**/*.java, **/.*/**, pom.xml, build*.xml, target/**"/>
         </copy>
         <jar destfile="target/tutorial-warehouse-spring.jar" basedir="target/classes">
             <manifest>
diff --git a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
index ba31051af6..54050d1dea 100644
--- a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
@@ -71,8 +71,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>build-dependency.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
diff --git a/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml b/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml
index d5af5b13c1..b810ab5dda 100644
--- a/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml
@@ -53,7 +53,7 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>