From 84bfcd0a6850290a994c4dcc7bf71c976569c2cb Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 21 Jul 2011 08:23:59 +0000
Subject: 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
---
 .../branches/2.0-Beta3/distribution/samples/pom.xml   |  5 ++---
 .../samples/src/main/assembly/samples.xml             | 19 ++++++++-----------
 .../distribution/samples/src/main/release/README      |  4 ----
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/release/README

diff --git a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml
index d36283d90a..9a6d85264d 100644
--- a/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml
+++ b/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml
@@ -42,7 +42,7 @@
                          <version>2.2.1</version>
                          <executions>
                              <execution>
-                                 <id>bin</id>
+                                 <id>samples</id>
                                  <phase>package</phase>
                                  <goals>
                                      <goal>single</goal>
@@ -53,8 +53,7 @@
                                      </descriptors>
                                      <tarLongFileMode>gnu</tarLongFileMode>
                                      <finalName>apache-tuscany-samples-${project.version}</finalName>
-                                     <appendAssemblyId>true</appendAssemblyId>
-                                     <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+                                     <appendAssemblyId>false</appendAssemblyId>
                                  </configuration>
                              </execution>
                          </executions>
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
-=======================
-
-
-- 
cgit v1.2.3