tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r911338 [1/2] - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample: ./ clients/currency-converter-corba/ clients/currency-converter-jms/ clients/currency-converter-rmi/ clients/currency-converter-ws-jaxws/ distribution/bundle/ distributi...
Date Thu, 18 Feb 2010 11:33:29 GMT
Author: nash
Date: Thu Feb 18 11:33:27 2010
New Revision: 911338

URL: http://svn.apache.org/viewvc?rev=911338&view=rev
Log:
Exclude Tuscany runtime dependencies from the travel sample distribution default build (TUSCANY-3462)

Added:
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml
Modified:
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml Thu Feb 18 11:33:27 2010
@@ -48,7 +48,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.CurrencyConverterCORBAClient</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml Thu Feb 18 11:33:27 2010
@@ -93,7 +93,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.CurrencyConverterJMSClient</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml Thu Feb 18 11:33:27 2010
@@ -47,7 +47,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.CurrencyConverterRMIClient</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml Thu Feb 18 11:33:27 2010
@@ -60,7 +60,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.CurrencyConverterWSClient</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml?rev=911338&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml Thu Feb 18 11:33:27 2010
@@ -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>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml?rev=911338&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml Thu Feb 18 11:33:27 2010
@@ -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>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml?rev=911338&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml Thu Feb 18 11:33:27 2010
@@ -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>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml?rev=911338&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml Thu Feb 18 11:33:27 2010
@@ -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>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml?rev=911338&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml Thu Feb 18 11:33:27 2010
@@ -102,7 +102,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.FullAppDomainLauncher</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml Thu Feb 18 11:33:27 2010
@@ -200,7 +200,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.FullAppNodesLauncher</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml Thu Feb 18 11:33:27 2010
@@ -81,7 +81,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.IntroducingClientLauncher</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml Thu Feb 18 11:33:27 2010
@@ -67,7 +67,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.IntroducingDomainLauncher</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml Thu Feb 18 11:33:27 2010
@@ -46,7 +46,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.IntroducingToursLauncher</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml Thu Feb 18 11:33:27 2010
@@ -46,7 +46,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.IntroducingTripsLauncher</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml Thu Feb 18 11:33:27 2010
@@ -47,7 +47,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
+                            <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
                             <mainClass>scatours.creditcard.CreditCardServiceBootstrap</mainClass>
                         </manifest>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml?rev=911338&r1=911337&r2=911338&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml Thu Feb 18 11:33:27 2010
@@ -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>



Mime
View raw message