diff options
Diffstat (limited to 'sca-java-1.x/trunk/tutorials/travelsample')
56 files changed, 376 insertions, 181 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml index 8af007d490..4e665bb6a4 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml @@ -48,7 +48,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterCORBAClient</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml index 88a1f27407..d936040939 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml @@ -93,7 +93,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterJMSClient</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml index 9b41782f82..46f01ebcd9 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml @@ -47,7 +47,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterRMIClient</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml index 99a6c15c36..59fb60ac6a 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml @@ -60,7 +60,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterWSClient</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml index 7dd424ecca..621f27a6ce 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml @@ -29,6 +29,7 @@ <artifactId>scatours-distribution-bundle</artifactId>
<name>Apache Tuscany SCA Tours Distribution Bundle</name>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
@@ -541,47 +542,8 @@ </dependencies>
<build>
- <finalName>tuscany-sca-manifest</finalName>
- <outputDirectory>../target</outputDirectory>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <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>
- <archiveBaseDirectory>..</archiveBaseDirectory>
- <outputDirectory>../target</outputDirectory>
- <finalName>apache-tuscany-scatours-${version}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -600,4 +562,83 @@ </plugin>
</plugins>
</build>
+
+
+ <profiles>
+ <profile>
+ <!-- The default profile produces a subset distribution which excludes
+ libraries that are present in the Tuscany SCA binary distro. -->
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</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>
+ <outputDirectory>../target</outputDirectory>
+ <descriptors>
+ <descriptor>../src/main/assembly/bin.xml</descriptor>
+ <descriptor>../src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <archiveBaseDirectory>..</archiveBaseDirectory>
+ <outputDirectory>../target</outputDirectory>
+ <finalName>apache-tuscany-scatours-${version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <!-- Use mvn -Pselfcontained to produce a self-contained distribution
+ with all library dependencies included. -->
+ <id>selfcontained</id>
+ <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>
+ <outputDirectory>../target</outputDirectory>
+ <descriptors>
+ <descriptor>../src/main/assembly/bin-selfcontained.xml</descriptor>
+ <descriptor>../src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <archiveBaseDirectory>..</archiveBaseDirectory>
+ <outputDirectory>../target</outputDirectory>
+ <finalName>apache-tuscany-scatours-${version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml index afa3184347..e42098a5b0 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml @@ -40,7 +40,6 @@ </dependencies>
<build>
- <outputDirectory>../target</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -53,6 +52,7 @@ <goal>single</goal>
</goals>
<configuration>
+ <outputDirectory>../target</outputDirectory>
<descriptors>
<descriptor>../src/main/assembly/bin-openejb.xml</descriptor>
</descriptors>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml new file mode 100644 index 0000000000..cf2638fcfb --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id></id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+ <formats>
+ <format>dir</format>
+<!--
+ <format>tar.gz</format>
+ <format>zip</format>
+-->
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor>
+ <componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor>
+ <componentDescriptor>../src/main/components/bin-selfcontained.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml index 2e71c1260a..4ce68281d5 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml @@ -33,5 +33,6 @@ <componentDescriptors> <componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor> <componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor> + <componentDescriptor>../src/main/components/bin-default.xml</componentDescriptor> </componentDescriptors> </assembly> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml new file mode 100644 index 0000000000..ed61a17af3 --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml @@ -0,0 +1,28 @@ +<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<component>
+
+ <files>
+ <file>
+ <source>../src/main/resources/build-defs.xml</source>
+ <outputDirectory>util</outputDirectory>
+ </file>
+ </files>
+
+</component>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml index 0784bd0bc0..0a35eef5ff 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml @@ -17,17 +17,6 @@ * under the License. --> <component> - <fileSets> - - <fileSet> - <directory>bundle/target</directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>tuscany-sca-manifest.jar</include> - </includes> - </fileSet> - - </fileSets> <files> <file> @@ -48,20 +37,6 @@ </files> <dependencySets> - <!-- Add all the Tuscany modules to the modules directory --> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> - <unpack>false</unpack> - <includes> - <include>*:*</include> - </includes> - <excludes> - <exclude>org.apache.tuscany.sca:scatours*</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>util</outputDirectory> @@ -72,6 +47,7 @@ </includes> <scope>runtime</scope> </dependencySet> + <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>contributions</outputDirectory> @@ -82,6 +58,7 @@ </includes> <scope>runtime</scope> </dependencySet> + <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>launchers</outputDirectory> @@ -92,6 +69,7 @@ </includes> <scope>runtime</scope> </dependencySet> + <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>services</outputDirectory> @@ -102,16 +80,18 @@ </includes> <scope>runtime</scope> </dependencySet> + <dependencySet> <useProjectArtifact>false</useProjectArtifact> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <outputDirectory>clients</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:scatours-client-*</include> </includes> <scope>runtime</scope> </dependencySet> + <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>domainconfig</outputDirectory> @@ -121,7 +101,6 @@ </includes> <scope>runtime</scope> </dependencySet> - </dependencySets> </component> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml new file mode 100644 index 0000000000..90db09cfbe --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml @@ -0,0 +1,42 @@ +<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<component>
+
+ <files>
+ <file>
+ <source>../src/main/resources/build-defs-selfcontained.xml</source>
+ <outputDirectory>util</outputDirectory>
+ <destName>build-defs.xml</destName>
+ </file>
+ </files>
+
+ <dependencySets>
+ <!-- Add all the Tuscany dependencies to the lib directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.tuscany.sca:scatours*</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+</component>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml index 9fac54c1dd..95b97ca0c6 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml @@ -18,7 +18,7 @@ -->
<project name="scatours-distribution-clients">
- <property environment="env"/>
+ <import file="../util/build-defs.xml"/>
<target name="run-currency-converter-corba">
<java classname="scatours.CurrencyConverterCORBAClient" fork="true" failonerror="true">
@@ -31,7 +31,7 @@ <classpath>
<pathelement location="scatours-client-currency-converter-jms.jar"/>
<!-- The following is used to bring in the ActiveMQ runtime. -->
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml new file mode 100644 index 0000000000..f741f28a7b --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml @@ -0,0 +1,30 @@ +<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<!-- The self-contained build does not need any libraries from the Tuscany SCA
+ binary distro. -->
+<project name="build-defs">
+
+ <path id="scatours.tuscany-manifest"/>
+
+ <path id="scatours.tuscany-node-launcher"/>
+
+ <path id="scatours.tuscany-openejb"/>
+
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml new file mode 100644 index 0000000000..f914208f52 --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml @@ -0,0 +1,46 @@ +<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<!-- The default build depends on libraries from the Tuscany SCA binary distro. -->
+<project name="build-defs">
+ <property environment="env"/>
+
+ <path id="scatours.tuscany-manifest">
+ <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ </path>
+
+ <path id="scatours.tuscany-node-launcher">
+ <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>
+ </path>
+
+ <path id="scatours.tuscany-openejb">
+ <fileset dir="${env.TUSCANY_HOME}/lib">
+ <!-- exclude some jars to prevent them being loaded by OpenEJB -->
+ <exclude name="tuscany-sca-manifest.jar"/>
+ <exclude name="ode-*.jar"/>
+ <exclude name="jaxb-xjc-*.jar"/>
+ <exclude name="jython-*.jar"/>
+ <exclude name="activemq-all-*.jar"/>
+ <exclude name="js-*.jar"/>
+ <exclude name="org.apache.felix.main-*.jar"/>
+ <exclude name="saxon-*.jar"/>
+ </fileset>
+ </path>
+
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml index 20c4b99048..dbddcb349b 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml @@ -18,13 +18,13 @@ -->
<project name="scatours-distribution-launchers">
- <property environment="env"/>
+ <import file="../util/build-defs.xml"/>
<target name="run-blog-feed">
<java classname="scatours.BlogFeedLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-blog-feed.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -33,7 +33,7 @@ <java classname="scatours.BuildingBlocksLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-buildingblocks.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -42,7 +42,7 @@ <java classname="scatours.CurrencyConverterLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-currency-converter.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -51,7 +51,7 @@ <java classname="scatours.CurrencyConverterCORBALauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-currency-converter-corba.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -60,7 +60,7 @@ <java classname="scatours.CurrencyConverterJMSLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-currency-converter-jms.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -69,7 +69,7 @@ <java classname="scatours.CurrencyConverterRMILauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-currency-converter-rmi.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -78,7 +78,7 @@ <java classname="scatours.CurrencyConverterWSLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-currency-converter-ws.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -87,7 +87,7 @@ <java classname="scatours.DatabindingLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-databinding.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -96,7 +96,7 @@ <java classname="scatours.FeedLoggerLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-feed-logger.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -105,7 +105,7 @@ <java classname="scatours.FullAppLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-fullapp.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -114,7 +114,7 @@ <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher" fork="true" failonerror="true">
<arg value="../domainconfig/fullapp"/>
<classpath>
- <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>
+ <path refid="scatours.tuscany-node-launcher"/>
</classpath>
</java>
</target>
@@ -123,7 +123,7 @@ <java classname="scatours.FullAppNodesLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-fullapp-nodes.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -132,7 +132,7 @@ <java classname="scatours.HelpPagesLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-help-pages.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -141,7 +141,7 @@ <java classname="scatours.InteractionLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-interaction.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -150,7 +150,7 @@ <java classname="scatours.IntroducingLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-introducing.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -159,7 +159,7 @@ <java classname="scatours.IntroducingClientLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-introducing-client.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -168,7 +168,7 @@ <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher" fork="true" failonerror="true">
<arg value="../domainconfig/introducing"/>
<classpath>
- <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>
+ <path refid="scatours.tuscany-node-launcher"/>
</classpath>
</java>
</target>
@@ -177,7 +177,7 @@ <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" fork="true" failonerror="true">
<arg value="http://localhost:9990/node-config/ToursNode"/>
<classpath>
- <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>
+ <path refid="scatours.tuscany-node-launcher"/>
</classpath>
</java>
</target>
@@ -186,7 +186,7 @@ <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" fork="true" failonerror="true">
<arg value="http://localhost:9990/node-config/TripsNode"/>
<classpath>
- <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>
+ <path refid="scatours.tuscany-node-launcher"/>
</classpath>
</java>
</target>
@@ -195,7 +195,7 @@ <java classname="scatours.JumpstartLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-jumpstart.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -204,7 +204,7 @@ <java classname="scatours.NotificationCORBALauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-notification-corba.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -213,7 +213,7 @@ <java classname="scatours.NotificationEJBLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-notification-ejb.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -222,7 +222,7 @@ <java classname="scatours.NotificationJMSLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-notification-jms.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -231,7 +231,7 @@ <java classname="scatours.NotificationRMILauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-notification-rmi.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -240,7 +240,7 @@ <java classname="scatours.NotificationWSLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-notification-ws.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -249,7 +249,7 @@ <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-payment-bpel.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -258,7 +258,7 @@ <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-payment-groovy.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -267,7 +267,7 @@ <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-payment-java.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -276,7 +276,7 @@ <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-java-policy.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -285,7 +285,7 @@ <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-payment-spring.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -294,7 +294,7 @@ <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-spring-scatag.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
@@ -303,7 +303,7 @@ <java classname="scatours.PolicyLauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-policy.jar"/>
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml index 3ec8d6f8a2..006410c3aa 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml @@ -18,7 +18,7 @@ -->
<project name="scatours-distribution-services">
- <property environment="env"/>
+ <import file="../util/build-defs.xml"/>
<target name="run-smsgateway-corba">
<java classname="scatours.smsgateway.SMSGatewayCORBAServiceBootstrap" fork="true" failonerror="true">
@@ -31,17 +31,7 @@ <classpath>
<pathelement location="scatours-service-smsgateway-ejb.jar"/>
<!-- The following is used to bring in additional dependencies of the OpenEJB runtime. -->
- <fileset dir="${env.TUSCANY_HOME}/lib">
- <!-- exclude some jars to prevent them being loaded by OpenEJB -->
- <exclude name="tuscany-sca-manifest.jar"/>
- <exclude name="ode-*.jar"/>
- <exclude name="jaxb-xjc-*.jar"/>
- <exclude name="jython-*.jar"/>
- <exclude name="activemq-all-*.jar"/>
- <exclude name="js-*.jar"/>
- <exclude name="org.apache.felix.main-*.jar"/>
- <exclude name="saxon-*.jar"/>
- </fileset>
+ <path refid="scatours.tuscany-openejb"/>
</classpath>
</java>
</target>
@@ -57,7 +47,7 @@ <classpath>
<pathelement location="scatours-service-smsgateway-jms.jar"/>
<!-- The following is used to bring in the ActiveMQ runtime. -->
- <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
+ <path refid="scatours.tuscany-manifest"/>
</classpath>
</java>
</target>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml index 7df381d2e1..6324f538bd 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml @@ -98,7 +98,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.BlogFeedLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml index 81c13098f4..ea5ba3f930 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml @@ -118,7 +118,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.BuildingBlocksLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml index bf82181763..30650908b9 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterCORBALauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml index d69d8a5cb1..d30733bf01 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml @@ -103,7 +103,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterJMSLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml index 2782f72a76..b12cfa44ad 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml @@ -99,7 +99,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterRMILauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml index cc57ab3c9e..5ff8984dbf 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml @@ -93,7 +93,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterWSLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml index e2dd7cf85b..af29324117 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml @@ -78,7 +78,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.CurrencyConverterLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml index 8ebfef67af..7fef1796f7 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml @@ -157,7 +157,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.DatabindingLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml index 5b8a188592..b8067e75f2 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml @@ -99,7 +99,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.FeedLoggerLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml index ae69ddd348..95d2077d0e 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml @@ -102,7 +102,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.FullAppDomainLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml index fc5f595bdd..34d2007daa 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml @@ -200,7 +200,7 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.FullAppNodesLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml index 7ece4347be..24b4624912 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml @@ -196,7 +196,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.FullAppLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml index a501b7849c..dcad902807 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.HelpPagesLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml index 7cff4aaea7..7e15913e53 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.InteractionLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml index f348ea9456..878f27844c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml @@ -81,7 +81,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.IntroducingClientLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml index 2a9f3e53fb..c428b4b87f 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml @@ -67,7 +67,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.IntroducingDomainLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml index 0391994557..1886b977a4 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml @@ -46,7 +46,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.IntroducingToursLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml index 1ef9d06774..9cb30beb3f 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml @@ -46,7 +46,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.IntroducingTripsLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml index 5ded853c2a..98c8627d6c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml @@ -78,7 +78,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.IntroducingLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml index 1f3722d993..133ed2a0b7 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml @@ -78,7 +78,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.JumpstartLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml index 636a4fe82d..ec5957081f 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.NotificationCORBALauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml index 24540c32c1..e5c3d549a9 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar ../util/scatours-util-openejb-runtime.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.NotificationEJBLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml index 0441ba9cff..dd0a198622 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml @@ -136,7 +136,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.NotificationJMSLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml index ecac2d2d18..f6fea913fe 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.NotificationRMILauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml index 19669752cb..4625a6e85c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
</manifestEntries>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.NotificationWSLauncher</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml index 272e19f56c..c6d4019da8 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml @@ -116,7 +116,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.payment.PaymentLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml index dfc8134b1d..d3ed71160b 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml @@ -99,7 +99,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.payment.PaymentLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml index 72291917f7..85da7c1f71 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.payment.PaymentLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml index fda70eaf4f..773420e9ca 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml @@ -92,7 +92,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.payment.PaymentLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml index 943e0affca..5b540aef02 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml @@ -106,7 +106,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.payment.PaymentLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml index a855ae3d51..c85bf0b14f 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml @@ -106,7 +106,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.payment.PaymentLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml index bb2c34a4fb..bd11cebf24 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml @@ -99,7 +99,7 @@ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path> </manifestEntries> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> <mainClass>scatours.PolicyLauncher</mainClass> </manifest> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/pom.xml index 3fec371120..fa793bb8a3 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/pom.xml @@ -82,23 +82,23 @@ <profiles> <profile> - <!-- The default profile produces a self-contained distribution with all - library dependencies included. --> + <!-- The default profile produces a subset distribution which excludes + libraries that are present in the Tuscany SCA binary distro. --> <id>default</id> <activation> <activeByDefault>true</activeByDefault> </activation> <properties> - <scatours.selfContained>true</scatours.selfContained> + <scatours.selfContained>false</scatours.selfContained> </properties> </profile> <profile> - <!-- Use mvn -Psubsetdist to produce a subset distribution that excludes - OpenEJB libraries that are present in the Tuscany SCA binary distro. --> - <id>subsetdist</id> + <!-- Use mvn -Pselfcontained to produce a self-contained distribution + with all library dependencies included. --> + <id>selfcontained</id> <properties> - <scatours.selfContained>false</scatours.selfContained> + <scatours.selfContained>true</scatours.selfContained> </properties> </profile> </profiles> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml index b24a2228ec..11e52ba151 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml @@ -47,7 +47,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.creditcard.CreditCardServiceBootstrap</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml index 0933e8e895..340f043ca5 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml @@ -47,7 +47,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.smsgateway.SMSGatewayCORBAServiceBootstrap</mainClass>
</manifest>
@@ -82,4 +82,4 @@ </plugin>
</plugins>
</build>
-</project>
\ No newline at end of file +</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml index 67e46a8957..6865bd9200 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml @@ -47,7 +47,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml index 8202d4d141..9f1de49e6d 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml @@ -92,7 +92,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>scatours.smsgateway.SMSGatewayJMSServiceBootstrap</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml index b6e1ca0f3f..3f91e23315 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml @@ -47,7 +47,7 @@ <configuration>
<archive>
<manifest>
- <addClasspath>true</addClasspath>
+ <addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
<mainClass>com.tuscanyscatours.smsgateway.SMSGatewayRMIServiceBootstrap</mainClass>
</manifest>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml index 29ee3edf1e..a499139eff 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml @@ -46,7 +46,7 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>${scatours.selfContained}</addClasspath> <classpathPrefix>../lib/</classpathPrefix> </manifest> </archive> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml index 074d0984dd..b78fd646d6 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml @@ -31,8 +31,8 @@ <profiles>
<profile>
- <!-- The default profile produces a self-contained distribution with all
- library dependencies included. -->
+ <!-- The default profile produces a subset distribution which excludes
+ libraries that are present in the Tuscany SCA binary distro. -->
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -43,20 +43,6 @@ <artifactId>openejb-ejbd</artifactId>
<version>3.1.2</version>
<scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- Use mvn -Psubsetdist to produce a subset distribution that excludes
- OpenEJB libraries that are present in the Tuscany SCA binary distro. -->
- <id>subsetdist</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-ejbd</artifactId>
- <version>3.1.2</version>
- <scope>runtime</scope>
<!-- exclude the following because they are part of the Tuscany SCA binary distro -->
<exclusions>
<exclusion>
@@ -155,6 +141,20 @@ </dependency>
</dependencies>
</profile>
+
+ <profile>
+ <!-- Use mvn -Pselfcontained to produce a self-contained distribution
+ with all library dependencies included. -->
+ <id>selfcontained</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>3.1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
|