On Thu, Feb 5, 2009 at 9:41 AM, <[email protected]> wrote: > Author: antelder > Date: Thu Feb 5 09:41:39 2009 > New Revision: 741059 > > URL: http://svn.apache.org/viewvc?rev=741059&view=rev > Log: > Fix the problem with the distributions overwriting each other by merging > the two assembly plugin configs in to one. That has some implications - the > itests need the dir distribution so the distributions need to be built all > the time not just with the distribution profile, so the assembly builds are > moved to the default profile. To get it to work had to change > appendAssemblyId to true so the dir distribution folder name changed again > and the samples using that updated to match > > Modified: > tuscany/java/sca/distribution/all/pom.xml > tuscany/java/sca/distribution/all/src/main/assembly/bin.xml > tuscany/java/sca/samples/binding-ws-calculator/build.xml > tuscany/java/sca/samples/calculator-rmi-reference/build.xml > tuscany/java/sca/samples/implementation-java-calculator/build.xml > > Modified: tuscany/java/sca/distribution/all/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/pom.xml?rev=741059&r1=741058&r2=741059&view=diff > > ============================================================================== > --- tuscany/java/sca/distribution/all/pom.xml (original) > +++ tuscany/java/sca/distribution/all/pom.xml Thu Feb 5 09:41:39 2009 > @@ -31,7 +31,6 @@ > <packaging>pom</packaging> > > <dependencies> > - > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-feature-all</artifactId> > @@ -73,10 +72,12 @@ > <configuration> > <descriptors> > > <descriptor>src/main/assembly/dir.xml</descriptor> > + > <descriptor>src/main/assembly/bin.xml</descriptor> > + > <descriptor>src/main/assembly/src.xml</descriptor> > </descriptors> > <tarLongFileMode>gnu</tarLongFileMode> > > <finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName> > - <appendAssemblyId>false</appendAssemblyId> > + <appendAssemblyId>true</appendAssemblyId> > > <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> > </configuration> > </execution> > @@ -85,47 +86,4 @@ > </plugins> > </build> > > - <profiles> > - > - <!-- Build profile that can be used to build the distro packages > --> > - <profile> > - <id>distribution</id> > - <activation> > - <activeByDefault>false</activeByDefault> > - </activation> > - <build> > - <plugins> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-assembly-plugin</artifactId> > - <executions> > - <execution> > - <id>distribution-package</id> > - <phase>package</phase> > - <goals> > - <goal>single</goal> > - </goals> > - <configuration> > - <descriptors> > - > <descriptor>src/main/assembly/bin.xml</descriptor> > - > <descriptor>src/main/assembly/src.xml</descriptor> > - </descriptors> > - <tarLongFileMode>gnu</tarLongFileMode> > - > <finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName> > - </configuration> > - </execution> > - </executions> > - </plugin> > - </plugins> > - </build> > - </profile> > - > - <!-- Profile that can be used to build the modules included in the > distro --> > - <profile> > - <id>modules</id> > - <modules> > - </modules> > - </profile> > - </profiles> > - > </project> > > Modified: tuscany/java/sca/distribution/all/src/main/assembly/bin.xml > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/assembly/bin.xml?rev=741059&r1=741058&r2=741059&view=diff > > ============================================================================== > --- tuscany/java/sca/distribution/all/src/main/assembly/bin.xml (original) > +++ tuscany/java/sca/distribution/all/src/main/assembly/bin.xml Thu Feb 5 > 09:41:39 2009 > @@ -19,7 +19,7 @@ > --> > <assembly> > <!-- id typically identifies the "type" (src vs bin etc) of the > assembly --> > - <id>bin</id> > + <id></id> > <includeBaseDirectory>true</includeBaseDirectory> > <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory> > <formats> > > Modified: tuscany/java/sca/samples/binding-ws-calculator/build.xml > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-ws-calculator/build.xml?rev=741059&r1=741058&r2=741059&view=diff > > ============================================================================== > --- tuscany/java/sca/samples/binding-ws-calculator/build.xml (original) > +++ tuscany/java/sca/samples/binding-ws-calculator/build.xml Thu Feb 5 > 09:41:39 2009 > @@ -59,7 +59,7 @@ > failonerror="true"> > <jvmarg > value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> > <classpath> > - <pathelement > location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/> > + <pathelement > location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/> > <pathelement location="../../bin/launcher.jar"/> > </classpath> > <arg value="unmanaged"/> > > Modified: tuscany/java/sca/samples/calculator-rmi-reference/build.xml > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/build.xml?rev=741059&r1=741058&r2=741059&view=diff > > ============================================================================== > --- tuscany/java/sca/samples/calculator-rmi-reference/build.xml (original) > +++ tuscany/java/sca/samples/calculator-rmi-reference/build.xml Thu Feb 5 > 09:41:39 2009 > @@ -56,11 +56,10 @@ > <target name="run" depends="compile"> > <java classname="org.apache.tuscany.sca.launcher.LauncherMain" > fork="true" > - inputstring="\n" > failonerror="true"> > <jvmarg > value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> > <classpath> > - <pathelement > location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/> > + <pathelement > location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/> > <pathelement location="../../bin/launcher.jar"/> > </classpath> > <arg value="unmanaged"/> > > Modified: tuscany/java/sca/samples/implementation-java-calculator/build.xml > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/samples/implementation-java-calculator/build.xml?rev=741059&r1=741058&r2=741059&view=diff > > ============================================================================== > --- tuscany/java/sca/samples/implementation-java-calculator/build.xml > (original) > +++ tuscany/java/sca/samples/implementation-java-calculator/build.xml Thu > Feb 5 09:41:39 2009 > @@ -53,7 +53,7 @@ > failonerror="true"> > <jvmarg > value="-Djava.util.logging.config.file=${sample.root}/../../logging.properties"/> > <classpath> > - <pathelement > location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/> > + <pathelement > location="../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-dir/tuscany-sca-2.0-SNAPSHOT/bin/launcher.jar"/> > <pathelement location="../../bin/launcher.jar"/> > </classpath> > <arg value="target/${jar.name}"/> > > > With this change does it mean that dir, zip and tar are generated for every top level build?
Simon
