You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/05/27 14:51:16 UTC
svn commit: r948812 -
/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml
Author: antelder
Date: Thu May 27 12:51:16 2010
New Revision: 948812
URL: http://svn.apache.org/viewvc?rev=948812&view=rev
Log:
Merge r948804 from trunk to m5 to include all samples by default
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml (contents, props changed)
Modified: tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml?rev=948812&r1=948811&r2=948812&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml (original)
+++ tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml Thu May 27 12:51:16 2010
@@ -22,35 +22,6 @@
<fileSet>
<directory>../../samples</directory>
<outputDirectory>samples</outputDirectory>
- <includes>
- <include>README</include>
- <include>logging.properties</include>
- <include>contribution*/**/*</include>
- <include>launcher*/**/*</include>
- <include>binding-rmi/contribution*/**/*</include>
- <include>binding-sca/contribution*/**/*</include>
- <include>calculator-osgi/**/*</include>
- <include>helloworld/**/*</include>
- <include>helloworld-spring/**/*</include>
- <include>helloworld-bpel/**/*</include>
- <include>implementation-java-calculator/**/*</include>
- <include>dosgi-calculator/**/*</include>
- <include>dosgi-calculator-operations/**/*</include>
- <include>dosgi-dynamic-calculator/**/*</include>
- <include>dosgi-dynamic-calculator-operations/**/*</include>
- <include>webapps/helloworld/**/*</include>
- <include>webapps/helloworld-bpel/**/*</include>
- <include>webapps/helloworld-jaxrs/**/*</include>
- <include>webapps/helloworld-jms/**/*</include>
- <include>webapps/helloworld-js-client/**/*</include>
- <include>webapps/helloworld-jsf/**/*</include>
- <include>webapps/helloworld-jsp/**/*</include>
- <include>webapps/helloworld-servlet/**/*</include>
- <include>webapps/helloworld-stripes/**/*</include>
- <include>launcher-embedded-jse/**/*</include>
- <include>launcher-embedded-osgi/**/*</include>
- <include>launcher-command-line//**/*</include>
- </includes>
<excludes>
<!-- General file/folders to exclude -->
<exclude>**/.*</exclude>
@@ -58,29 +29,25 @@
<exclude>**/*.log</exclude>
<exclude>**/*.svg</exclude>
<exclude>**/maven-eclipse.xml</exclude>
-
- <!-- Sample specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- <!-- exclude>**/target</exclude -->
- <!-- exclude>**/target/**/*</exclude -->
- <exclude>*/target/mvn-eclipse-cache.properties</exclude>
- <exclude>*/target/pom-transformed.xml</exclude>
- <exclude>*/target/classes</exclude>
- <exclude>*/target/classes/**/*</exclude>
- <exclude>*/target/dependency-maven-plugin-markers</exclude>
- <exclude>*/target/dependency-maven-plugin-markers/**/*</exclude>
- <exclude>*/target/.felix</exclude>
- <exclude>*/target/.felix/**/*</exclude>
- <exclude>*/target/maven-archiver</exclude>
- <exclude>*/target/maven-archiver/**/*</exclude>
- <exclude>*/target/test-classes</exclude>
- <exclude>*/target/test-classes/**/*</exclude>
- <exclude>*/target/surefire-reports</exclude>
- <exclude>*/target/surefire-reports/**/*</exclude>
- <exclude>*/target/surefire-osgi-reports</exclude>
- <exclude>*/target/surefire-osgi-reports/**/*</exclude>
- <exclude>webapps/helloworld/target/**/*</exclude>
+ <exclude>**/target/mvn-eclipse-cache.properties</exclude>
+ <exclude>**/target/pom-transformed.xml</exclude>
+ <exclude>**/target/classes</exclude>
+ <exclude>**/target/classes/**/*</exclude>
+ <exclude>**/target/dependency-maven-plugin-markers</exclude>
+ <exclude>**/target/dependency-maven-plugin-markers/**/*</exclude>
+ <exclude>**/target/.felix</exclude>
+ <exclude>**/target/.felix/**/*</exclude>
+ <exclude>**/target/maven-archiver</exclude>
+ <exclude>**/target/maven-archiver/**/*</exclude>
+ <exclude>**/target/test-classes</exclude>
+ <exclude>**/target/test-classes/**/*</exclude>
+ <exclude>**/target/surefire-reports</exclude>
+ <exclude>**/target/surefire-reports/**/*</exclude>
+ <exclude>**/target/surefire-osgi-reports</exclude>
+ <exclude>**/target/surefire-osgi-reports/**/*</exclude>
+ <exclude>webapps/*/target</exclude>
<exclude>webapps/*/target/**/*</exclude>
+
</excludes>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
Propchange: tuscany/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/components/bin-samples.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 12:51:16 2010
@@ -1,3 +1,4 @@
/tuscany/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml:695308-714142
/tuscany/branches/sca-java-1.3/distribution/core/src/main/components/bin-samples.xml:671193,680620-680628
/tuscany/sandbox/ant/sca/branches/foo/distribution/all/src/main/components/bin-samples.xml:755273
+/tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml:948804