You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/01/13 11:12:40 UTC
svn commit: r898694 - in /tuscany/sandbox/travelsample: ./ distribution/
distribution/src/main/components/ launchers/ launchers/blog-feed/
launchers/common/ launchers/currency-converter-corba/
launchers/currency-converter-jms/ launchers/currency-conver...
Author: nash
Date: Wed Jan 13 10:12:36 2010
New Revision: 898694
URL: http://svn.apache.org/viewvc?rev=898694&view=rev
Log:
Move the travel sample launchers/common module to util/launcher-common (TUSCANY-3422)
Added:
tuscany/sandbox/travelsample/util/
tuscany/sandbox/travelsample/util/build.xml
tuscany/sandbox/travelsample/util/launcher-common/ (with props)
tuscany/sandbox/travelsample/util/launcher-common/build.xml
- copied, changed from r895154, tuscany/sandbox/travelsample/launchers/common/build.xml
tuscany/sandbox/travelsample/util/launcher-common/pom.xml
- copied, changed from r897115, tuscany/sandbox/travelsample/launchers/common/pom.xml
tuscany/sandbox/travelsample/util/launcher-common/src/
tuscany/sandbox/travelsample/util/launcher-common/src/main/
tuscany/sandbox/travelsample/util/launcher-common/src/main/java/
tuscany/sandbox/travelsample/util/launcher-common/src/main/java/scatours/
tuscany/sandbox/travelsample/util/launcher-common/src/main/java/scatours/launcher/
tuscany/sandbox/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
- copied unchanged from r895154, tuscany/sandbox/travelsample/launchers/common/src/main/java/scatours/launcher/LauncherUtil.java
tuscany/sandbox/travelsample/util/pom.xml
Removed:
tuscany/sandbox/travelsample/launchers/common/build.xml
tuscany/sandbox/travelsample/launchers/common/pom.xml
Modified:
tuscany/sandbox/travelsample/build.xml
tuscany/sandbox/travelsample/distribution/pom.xml
tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
tuscany/sandbox/travelsample/launchers/blog-feed/build.xml
tuscany/sandbox/travelsample/launchers/blog-feed/pom.xml
tuscany/sandbox/travelsample/launchers/build.xml
tuscany/sandbox/travelsample/launchers/currency-converter-corba/build.xml
tuscany/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
tuscany/sandbox/travelsample/launchers/currency-converter-jms/build.xml
tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
tuscany/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
tuscany/sandbox/travelsample/launchers/currency-converter-ws/build.xml
tuscany/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
tuscany/sandbox/travelsample/launchers/currency-converter/build.xml
tuscany/sandbox/travelsample/launchers/currency-converter/pom.xml
tuscany/sandbox/travelsample/launchers/databinding/build.xml
tuscany/sandbox/travelsample/launchers/databinding/pom.xml
tuscany/sandbox/travelsample/launchers/feed-logger/build.xml
tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml
tuscany/sandbox/travelsample/launchers/fullapp/build.xml
tuscany/sandbox/travelsample/launchers/fullapp/pom.xml
tuscany/sandbox/travelsample/launchers/help-pages/build.xml
tuscany/sandbox/travelsample/launchers/help-pages/pom.xml
tuscany/sandbox/travelsample/launchers/interaction/build.xml
tuscany/sandbox/travelsample/launchers/interaction/pom.xml
tuscany/sandbox/travelsample/launchers/introducing/build.xml
tuscany/sandbox/travelsample/launchers/introducing/pom.xml
tuscany/sandbox/travelsample/launchers/jumpstart/build.xml
tuscany/sandbox/travelsample/launchers/jumpstart/pom.xml
tuscany/sandbox/travelsample/launchers/notification-corba/build.xml
tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml
tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml
tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml
tuscany/sandbox/travelsample/launchers/notification-jms/build.xml
tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml
tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml
tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml
tuscany/sandbox/travelsample/launchers/notification-ws/build.xml
tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml
tuscany/sandbox/travelsample/launchers/policy/build.xml
tuscany/sandbox/travelsample/launchers/policy/pom.xml
tuscany/sandbox/travelsample/launchers/pom.xml
tuscany/sandbox/travelsample/pom.xml
Modified: tuscany/sandbox/travelsample/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/build.xml (original)
+++ tuscany/sandbox/travelsample/build.xml Wed Jan 13 10:12:36 2010
@@ -38,6 +38,7 @@
</target>
<target name="allsubdirs">
+ <ant dir="util" target="${target}"/> <!--needed by launchers-->
<ant dir="contributions" target="${target}"/> <!--needed by launchers-->
<ant dir="services" target="${target}"/> <!--needed by launchers-->
<ant dir="launchers" target="${target}"/> <!--needed by clients-->
Modified: tuscany/sandbox/travelsample/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/distribution/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/distribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/distribution/pom.xml Wed Jan 13 10:12:36 2010
@@ -301,11 +301,6 @@
<artifactId>scatours-contribution-tripbooking</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-launcher-blog-feed</artifactId>
@@ -451,6 +446,11 @@
<artifactId>scatours-service-smsgateway-rmi</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-util-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml (original)
+++ tuscany/sandbox/travelsample/distribution/src/main/components/bin-modules.xml Wed Jan 13 10:12:36 2010
@@ -45,14 +45,14 @@
</dependencySet>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>util</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
<includes>
- <include>org.apache.tuscany.sca:scatours-launcher-common</include>
+ <include>org.apache.tuscany.sca:scatours-util-*</include>
</includes>
<scope>runtime</scope>
</dependencySet>
-
<dependencySet>
<outputDirectory>contributions</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -69,9 +69,6 @@
<includes>
<include>org.apache.tuscany.sca:scatours-launcher-*</include>
</includes>
- <excludes>
- <exclude>org.apache.tuscany.sca:scatours-launcher-common</exclude>
- </excludes>
<scope>runtime</scope>
</dependencySet>
<dependencySet>
Modified: tuscany/sandbox/travelsample/launchers/blog-feed/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/blog-feed/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/blog-feed/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/blog-feed/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-blog-feed" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/blog-feed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/blog-feed/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/blog-feed/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/blog-feed/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,15 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>${tuscany.version}</version>
</dependency>
<dependency>
@@ -87,6 +94,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/build.xml Wed Jan 13 10:12:36 2010
@@ -38,7 +38,6 @@
</target>
<target name="allsubdirs">
- <ant dir="common" target="${target}"/> <!--needed by blog-feed-->
<ant dir="blog-feed" target="${target}"/>
<ant dir="currency-converter" target="${target}"/>
<ant dir="currency-converter-corba" target="${target}"/>
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-corba/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-corba/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-corba/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-corba/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-currency-converter-corba" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- After starting the SCA CORBA service by invoking the "run" target below,
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-corba/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-corba/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-corba/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,10 +32,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
@@ -87,6 +88,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-jms/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-jms/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-jms/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-currency-converter-jms" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- Before invoking the "run" target, the JMS broker needs to be
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,10 +32,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
@@ -98,6 +99,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-rmi/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-rmi/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-rmi/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-currency-converter-rmi" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- After starting the SCA RMI service by invoking the "run" target below,
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -94,6 +95,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-ws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-ws/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-ws/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-ws/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-currency-converter-ws" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- After starting the SCA Web service by invoking the "run" target below,
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-ws/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-ws/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-ws/pom.xml Wed Jan 13 10:12:36 2010
@@ -33,8 +33,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -88,6 +89,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/currency-converter/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-currency-converter" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/currency-converter/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,10 +32,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
@@ -73,6 +74,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/databinding/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/databinding/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/databinding/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/databinding/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-databinding" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/databinding/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/databinding/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/databinding/pom.xml Wed Jan 13 10:12:36 2010
@@ -33,8 +33,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -152,6 +153,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/feed-logger/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/feed-logger/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/feed-logger/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/feed-logger/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-feed-logger" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml Wed Jan 13 10:12:36 2010
@@ -33,8 +33,15 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>${tuscany.version}</version>
</dependency>
<dependency>
@@ -88,6 +95,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/fullapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-fullapp" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/fullapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp/pom.xml Wed Jan 13 10:12:36 2010
@@ -33,8 +33,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -191,6 +192,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/help-pages/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/help-pages/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/help-pages/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/help-pages/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-help-pages" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/help-pages/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/help-pages/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/help-pages/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/help-pages/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,6 +88,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/interaction/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/interaction/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/interaction/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/interaction/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-interaction" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/interaction/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/interaction/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/interaction/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/interaction/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,6 +88,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/introducing/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/introducing/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/introducing/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/introducing/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-introducing" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/introducing/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/introducing/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/introducing/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/introducing/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -73,6 +74,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/jumpstart/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/jumpstart/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/jumpstart/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/jumpstart/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-jumpstart" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/jumpstart/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/jumpstart/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/jumpstart/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/jumpstart/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -73,6 +74,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/notification-corba/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-corba/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-corba/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-corba/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-notification-corba" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- Before invoking the "run" target, both the CORBA nameserver and
Modified: tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,6 +88,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-notification-ejb" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- Before invoking the "run" target, the EJB server for the SMS Gateway EJB
Modified: tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,10 +32,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
@@ -93,6 +94,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/notification-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-notification-jms" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- Before invoking the "run" target, both the JMS broker and the
Modified: tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -131,6 +132,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-notification-rmi" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- Before invoking the "run" target, the RMI server for the SMS Gateway
Modified: tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,6 +88,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/notification-ws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-notification-ws" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<!-- Before invoking the "run" target, the JAX-WS server for the SMS Gateway
Modified: tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -87,6 +88,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/policy/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/policy/build.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/policy/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/policy/build.xml Wed Jan 13 10:12:36 2010
@@ -20,7 +20,7 @@
<project name="scatours-launcher-policy" default="compile">
<import file="../../antdefs.xml"/>
<path id="compile-path">
- <pathelement path="../common/target/scatours-launcher-common.jar"/>
+ <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
</path>
<target name="run">
Modified: tuscany/sandbox/travelsample/launchers/policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/policy/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/policy/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/policy/pom.xml Wed Jan 13 10:12:36 2010
@@ -32,8 +32,9 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -94,6 +95,9 @@
<version>2.2</version>
<configuration>
<archive>
+ <manifestEntries>
+ <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+ </manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Wed Jan 13 10:12:36 2010
@@ -37,7 +37,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>common</module>
<module>blog-feed</module>
<module>currency-converter</module>
<module>currency-converter-corba</module>
Modified: tuscany/sandbox/travelsample/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/pom.xml?rev=898694&r1=898693&r2=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/pom.xml (original)
+++ tuscany/sandbox/travelsample/pom.xml Wed Jan 13 10:12:36 2010
@@ -91,6 +91,7 @@
<tuscany.version>1.6-SNAPSHOT</tuscany.version>
</properties>
<modules>
+ <module>util</module>
<module>contributions</module>
<module>launchers</module>
<module>services</module>
Added: tuscany/sandbox/travelsample/util/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/util/build.xml?rev=898694&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/util/build.xml (added)
+++ tuscany/sandbox/travelsample/util/build.xml Wed Jan 13 10:12:36 2010
@@ -0,0 +1,44 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-util" default="compile">
+
+ <target name="compile">
+ <antcall target="allsubdirs">
+ <param name="target" value="compile"/>
+ </antcall>
+ </target>
+
+ <target name="test">
+ <antcall target="allsubdirs">
+ <param name="target" value="test"/>
+ </antcall>
+ </target>
+
+ <target name="clean">
+ <antcall target="allsubdirs">
+ <param name="target" value="clean"/>
+ </antcall>
+ </target>
+
+ <target name="allsubdirs">
+ <ant dir="launcher-common" target="${target}"/>
+ </target>
+
+</project>
Propchange: tuscany/sandbox/travelsample/util/launcher-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan 13 10:12:36 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/util/launcher-common/build.xml (from r895154, tuscany/sandbox/travelsample/launchers/common/build.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/util/launcher-common/build.xml?p2=tuscany/sandbox/travelsample/util/launcher-common/build.xml&p1=tuscany/sandbox/travelsample/launchers/common/build.xml&r1=895154&r2=898694&rev=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/common/build.xml (original)
+++ tuscany/sandbox/travelsample/util/launcher-common/build.xml Wed Jan 13 10:12:36 2010
@@ -17,6 +17,6 @@
* under the License.
-->
-<project name="scatours-launcher-common" default="compile">
+<project name="scatours-util-launcher-common" default="compile">
<import file="../../antdefs.xml"/>
</project>
Copied: tuscany/sandbox/travelsample/util/launcher-common/pom.xml (from r897115, tuscany/sandbox/travelsample/launchers/common/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/util/launcher-common/pom.xml?p2=tuscany/sandbox/travelsample/util/launcher-common/pom.xml&p1=tuscany/sandbox/travelsample/launchers/common/pom.xml&r1=897115&r2=898694&rev=898694&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/common/pom.xml (original)
+++ tuscany/sandbox/travelsample/util/launcher-common/pom.xml Wed Jan 13 10:12:36 2010
@@ -25,7 +25,7 @@
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-launcher-common</artifactId>
+ <artifactId>scatours-util-launcher-common</artifactId>
<name>Apache Tuscany SCA Tours Common Utility for Launchers</name>
<dependencies>
@@ -35,5 +35,24 @@
<version>${tuscany.version}</version>
</dependency>
</dependencies>
-
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>../lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: tuscany/sandbox/travelsample/util/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/util/pom.xml?rev=898694&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/util/pom.xml (added)
+++ tuscany/sandbox/travelsample/util/pom.xml Wed Jan 13 10:12:36 2010
@@ -0,0 +1,45 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <version>1.0-SNAPSHOT</version>
+ <artifactId>scatours-util</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Tours Utilities</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>launcher-common</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>