You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 13:10:06 UTC
svn commit: r1027465 - in /tuscany/sca-java-1.x/trunk/tutorials/store:
assets/ catalog-mediation/ catalog-webapp/ store-enterprise/ store-market/
store-mashup/ store-merger/ store-supplier/ store/ warehouse-spring/
web-services/
Author: nash
Date: Tue Oct 26 11:10:05 2010
New Revision: 1027465
URL: http://svn.apache.org/viewvc?rev=1027465&view=rev
Log:
Merge r1002090 Use consistent resource exclusion patterns in all build files for the Store tutorial
Modified:
tuscany/sca-java-1.x/trunk/tutorials/store/assets/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml
tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/assets/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/assets/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/assets/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/assets/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/build.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/catalog-mediation/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml Tue Oct 26 11:10:05 2010
@@ -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"/>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/catalog-webapp/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-enterprise/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-market/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-mashup/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-merger/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-supplier/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/warehouse-spring/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml?rev=1027465&r1=1027464&r2=1027465&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/web-services/pom.xml Tue Oct 26 11:10:05 2010
@@ -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>