summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-21 08:23:59 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-21 08:23:59 +0000
commit84bfcd0a6850290a994c4dcc7bf71c976569c2cb (patch)
treee6c77a7f39884c6d1213125af6e696120bfc95b9 /sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main
parentb8a850fad4f73c5fdd4c1307cda511d29c002a7d (diff)
Merge trunk change r1148729 to Update the samples distro to beta3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1149066 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main')
-rw-r--r--sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml19
-rw-r--r--sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/release/README4
2 files changed, 8 insertions, 15 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
index 0f0d58d181..7e7afc66a4 100644
--- a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
+++ b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
@@ -38,18 +38,15 @@
</fileSet>
<fileSet>
- <directory>../../unreleased/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>helloworld-contribution</include>
- <include>helloworld-contribution/**</include>
- <include>helloworld-contribution/target/*.jar</include>
- </includes>
+ <directory>../../samples</directory>
+ <outputDirectory>.</outputDirectory>
<excludes>
- <exclude>*/.classpath</exclude>
- <exclude>*/.project</exclude>
- <exclude>*/target/**</exclude>
- <exclude>*/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**</exclude>
</excludes>
</fileSet>
diff --git a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/release/README b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/release/README
deleted file mode 100644
index 2ad90f81af..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/release/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Apache Tuscany Samples
-=======================
-
-