summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/distribution/samples/src/main
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-20 12:38:44 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-20 12:38:44 +0000
commit00c0632eba263e96442c3c316268897920fe3049 (patch)
tree3758012466c43c05c9421f03fd6f1366faf1666f /sca-java-2.x/trunk/distribution/samples/src/main
parentb77b257f08f4ffd1a15693b5b2d994c0935a6c7e (diff)
Update the samples distro for the current trunk samples layout
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1148729 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/distribution/samples/src/main')
-rw-r--r--sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml19
-rw-r--r--sca-java-2.x/trunk/distribution/samples/src/main/release/README4
2 files changed, 8 insertions, 15 deletions
diff --git a/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml b/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml
index 0f0d58d181..7e7afc66a4 100644
--- a/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml
+++ b/sca-java-2.x/trunk/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/trunk/distribution/samples/src/main/release/README b/sca-java-2.x/trunk/distribution/samples/src/main/release/README
deleted file mode 100644
index 2ad90f81af..0000000000
--- a/sca-java-2.x/trunk/distribution/samples/src/main/release/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Apache Tuscany Samples
-=======================
-
-