diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-18 11:33:27 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-18 11:33:27 +0000 |
| commit | 65f90a3a577cee5b20a0a76508b4419e9eca518d (patch) | |
| tree | 1bfd5dc9c1787b7c176a2abf098fdb6f8a2df07b /sca-java-1.x/trunk/tutorials/travelsample/distribution | |
| parent | 1038ce1a06920824211b4167db8f36b1e23d234c (diff) | |
Exclude Tuscany runtime dependencies from the travel sample distribution default build (TUSCANY-3462)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@911338 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tutorials/travelsample/distribution')
12 files changed, 310 insertions, 115 deletions
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>
|