Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,11 +22,11 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.6</version> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>scatours</artifactId> <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <name>Apache Tuscany SCA Tours Travel Sample</name> <repositories> @@ -94,18 +94,22 @@ </profiles> <properties> - <scatours.version>1.0-SNAPSHOT</scatours.version> - <tuscany.version>1.6</tuscany.version> + <scatours.version>2.0-SNAPSHOT</scatours.version> + <tuscany.version>2.0-SNAPSHOT</tuscany.version> </properties> <modules> <module>util</module> <module>contributions</module> +<!-- <module>domainconfig</module> +--> <module>launchers</module> <module>services</module> <module>clients</module> +<!-- <module>distribution</module> +--> </modules> </project>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-service-creditcard-payment-jaxws</artifactId> <name>Apache Tuscany SCA Tours Credit Card Payment JAX-WS Service</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-services</artifactId> <packaging>pom</packaging> <name>Apache Tuscany SCA Tours non-SCA Services</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-service-smsgateway-corba</artifactId> <name>Apache Tuscany SCA Tours SMS Gateway CORBA Service</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-service-smsgateway-ejb</artifactId> <name>Apache Tuscany SCA Tours SMS Gateway EJB Service</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-service-smsgateway-jaxws</artifactId> <name>Apache Tuscany SCA Tours SMS Gateway JAX-WS Service</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-service-smsgateway-jms</artifactId> <name>Apache Tuscany SCA Tours SMS Gateway JMS Service</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-service-smsgateway-rmi</artifactId> <name>Apache Tuscany SCA Tours SMS Gateway RMI Service</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-util-jaxws-runtime</artifactId> <name>Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-util-launcher-common</artifactId> <name>Apache Tuscany SCA Tours Common Utility for Launchers</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java Tue Mar 16 18:08:46 2010 @@ -21,9 +21,9 @@ package scatours.launcher; import java.io.File; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; /** * This utility locates SCA contributions by name so that the launcher can work with various environments where @@ -34,9 +34,9 @@ public class LauncherUtil { /** * Locate an SCA contribution by name * @param name The name of the SCA contribution archive - * @return The SCAContribution + * @return The Contribution */ - public static SCAContribution locate(String name) { + public static Contribution locate(String name) { // Try to use the target/classes directory inside Eclipse/Maven File file = new File("../../contributions/" + name + "/target/classes"); if (!file.exists()) { @@ -54,18 +54,18 @@ public class LauncherUtil { } } } - return new SCAContribution(name, file.toURI().toString()); + return new Contribution(name, file.toURI().toString()); } /** * Locate an SCA contribution by replacing the ${name} in the pattern * @param urlPattern The url pattern that contains ${name} * @param name The name of the contribution archive - * @return The SCAContribution + * @return The Contribution */ - public static SCAContribution locate(String urlPattern, String name) { + public static Contribution locate(String urlPattern, String name) { String url = urlPattern.replace("${name}", name); - return new SCAContribution(name, url); + return new Contribution(name, url); } /** @@ -74,13 +74,13 @@ public class LauncherUtil { * @param contributionNames * @return */ - public static SCANode createNode(String composite, String... contributionNames) { - SCAContribution[] contributions = new SCAContribution[contributionNames.length]; + public static Node createNode(String composite, String... contributionNames) { + Contribution[] contributions = new Contribution[contributionNames.length]; int index = 0; for (String name : contributionNames) { contributions[index++] = locate(name); } - SCANode node = SCANodeFactory.newInstance().createSCANode(composite, contributions); + Node node = NodeFactory.getInstance().createNode(composite, contributions); return node; } } Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-util-openejb-runtime</artifactId> <name>Apache Tuscany SCA Tours OpenEJB Runtime Dependencies</name> Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml?rev=923913&r1=923912&r2=923913&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml Tue Mar 16 18:08:46 2010 @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-util</artifactId> <packaging>pom</packaging> <name>Apache Tuscany SCA Tours Utilities</name>
