tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r1149066 - in /tuscany/sca-java-2.x/branches/2.0-Beta3/distribution: ./ all/src/main/release/bin/ samples/pom.xml samples/src/main/assembly/samples.xml samples/src/main/release/README
Date Thu, 21 Jul 2011 08:24:00 GMT
Author: antelder
Date: Thu Jul 21 08:23:59 2011
New Revision: 1149066

URL: http://svn.apache.org/viewvc?rev=1149066&view=rev
Log:
Merge trunk change r1148729 to Update the samples distro to beta3

Removed:
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/release/README
Modified:
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/   (props changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/   (props
changed)
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml
    tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 21 08:23:59 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/distribution:671193
+/tuscany/sca-java-2.x/trunk/distribution:1148729

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/all/src/main/release/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 08:23:59 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/distribution/all/src/main/release/bin:671193
-/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin:1147891,1148369
+/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin:1147891,1148369,1148729

Modified: tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml?rev=1149066&r1=1149065&r2=1149066&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/pom.xml Thu Jul 21 08:23:59
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/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml?rev=1149066&r1=1149065&r2=1149066&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
(original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta3/distribution/samples/src/main/assembly/samples.xml
Thu Jul 21 08:23:59 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>
 



Mime
View raw message