Merge r1002090 Use consistent resource exclusion patterns in all build files for the Store tutorial
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027465 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tutorials/store/assets/pom.xml b/tutorials/store/assets/pom.xml
index 8fcb0dc..c1404c1 100644
--- a/tutorials/store/assets/pom.xml
+++ b/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/tutorials/store/catalog-mediation/build.xml b/tutorials/store/catalog-mediation/build.xml
index 2049ca1..f273790 100644
--- a/tutorials/store/catalog-mediation/build.xml
+++ b/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/tutorials/store/catalog-mediation/pom.xml b/tutorials/store/catalog-mediation/pom.xml
index 18642bd..ac2bb62 100644
--- a/tutorials/store/catalog-mediation/pom.xml
+++ b/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/tutorials/store/catalog-webapp/build.xml b/tutorials/store/catalog-webapp/build.xml
index ec0fe27..91d2711 100644
--- a/tutorials/store/catalog-webapp/build.xml
+++ b/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/tutorials/store/catalog-webapp/pom.xml b/tutorials/store/catalog-webapp/pom.xml
index 1f1323b..bd13fe3 100644
--- a/tutorials/store/catalog-webapp/pom.xml
+++ b/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/tutorials/store/store-enterprise/pom.xml b/tutorials/store/store-enterprise/pom.xml
index 2a2f520..3e28639 100644
--- a/tutorials/store/store-enterprise/pom.xml
+++ b/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/tutorials/store/store-market/pom.xml b/tutorials/store/store-market/pom.xml
index d5c77ab..1d53606 100644
--- a/tutorials/store/store-market/pom.xml
+++ b/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/tutorials/store/store-mashup/pom.xml b/tutorials/store/store-mashup/pom.xml
index 7310502..5ee8bb8 100644
--- a/tutorials/store/store-mashup/pom.xml
+++ b/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/tutorials/store/store-merger/pom.xml b/tutorials/store/store-merger/pom.xml
index 2540f76..26ed794 100644
--- a/tutorials/store/store-merger/pom.xml
+++ b/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/tutorials/store/store-supplier/pom.xml b/tutorials/store/store-supplier/pom.xml
index a040414..828923d 100644
--- a/tutorials/store/store-supplier/pom.xml
+++ b/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/tutorials/store/store/pom.xml b/tutorials/store/store/pom.xml
index 27fde76..7cc5f75 100644
--- a/tutorials/store/store/pom.xml
+++ b/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/tutorials/store/warehouse-spring/build.xml b/tutorials/store/warehouse-spring/build.xml
index e70d849..2fa88f5 100644
--- a/tutorials/store/warehouse-spring/build.xml
+++ b/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/tutorials/store/warehouse-spring/pom.xml b/tutorials/store/warehouse-spring/pom.xml
index ba31051..54050d1 100644
--- a/tutorials/store/warehouse-spring/pom.xml
+++ b/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/tutorials/store/web-services/pom.xml b/tutorials/store/web-services/pom.xml
index d5af5b1..b810ab5 100644
--- a/tutorials/store/web-services/pom.xml
+++ b/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>
