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 2011/07/20 14:38:45 UTC

svn commit: r1148729 - in /tuscany/sca-java-2.x/trunk/distribution/samples: pom.xml src/main/assembly/samples.xml src/main/release/README

Author: antelder
Date: Wed Jul 20 12:38:44 2011
New Revision: 1148729

URL: http://svn.apache.org/viewvc?rev=1148729&view=rev
Log:
Update the samples distro for the current trunk samples layout

Removed:
    tuscany/sca-java-2.x/trunk/distribution/samples/src/main/release/README
Modified:
    tuscany/sca-java-2.x/trunk/distribution/samples/pom.xml
    tuscany/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml

Modified: tuscany/sca-java-2.x/trunk/distribution/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/samples/pom.xml?rev=1148729&r1=1148728&r2=1148729&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/samples/pom.xml Wed Jul 20 12:38:44 2011
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml?rev=1148729&r1=1148728&r2=1148729&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/samples/src/main/assembly/samples.xml Wed Jul 20 12:38:44 2011
@@ -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>