diff options
Diffstat (limited to '')
| -rw-r--r-- | java/sca/distribution/all/pom.xml | 48 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/assembly/bin.xml | 2 | ||||
| -rw-r--r-- | java/sca/samples/binding-ws-calculator/build.xml | 2 | ||||
| -rw-r--r-- | java/sca/samples/calculator-rmi-reference/build.xml | 3 | ||||
| -rw-r--r-- | java/sca/samples/implementation-java-calculator/build.xml | 2 |
5 files changed, 7 insertions, 50 deletions
diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml index ed3b5cd02e..9e0ecf6429 100644 --- a/java/sca/distribution/all/pom.xml +++ b/java/sca/distribution/all/pom.xml @@ -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>
diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml index 4c204a0412..350948cb6f 100644 --- a/java/sca/distribution/all/src/main/assembly/bin.xml +++ b/java/sca/distribution/all/src/main/assembly/bin.xml @@ -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>
diff --git a/java/sca/samples/binding-ws-calculator/build.xml b/java/sca/samples/binding-ws-calculator/build.xml index 0742bb396c..55544a5af7 100644 --- a/java/sca/samples/binding-ws-calculator/build.xml +++ b/java/sca/samples/binding-ws-calculator/build.xml @@ -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"/> diff --git a/java/sca/samples/calculator-rmi-reference/build.xml b/java/sca/samples/calculator-rmi-reference/build.xml index b570700be3..7db1f55aac 100644 --- a/java/sca/samples/calculator-rmi-reference/build.xml +++ b/java/sca/samples/calculator-rmi-reference/build.xml @@ -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"/>
diff --git a/java/sca/samples/implementation-java-calculator/build.xml b/java/sca/samples/implementation-java-calculator/build.xml index 1a4b1741a2..9d5557a470 100644 --- a/java/sca/samples/implementation-java-calculator/build.xml +++ b/java/sca/samples/implementation-java-calculator/build.xml @@ -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}"/> |