From 054ba1cb6fc276ebc1702254d45281889f2fb8ef Mon Sep 17 00:00:00 2001 From: nash Date: Wed, 13 Jan 2010 10:12:36 +0000 Subject: Move the travel sample launchers/common module to util/launcher-common (TUSCANY-3422) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@898694 13f79535-47bb-0310-9956-ffa450edef68 --- sandbox/travelsample/build.xml | 1 + sandbox/travelsample/distribution/pom.xml | 10 +-- .../src/main/components/bin-modules.xml | 9 +-- sandbox/travelsample/launchers/blog-feed/build.xml | 2 +- sandbox/travelsample/launchers/blog-feed/pom.xml | 12 +++- sandbox/travelsample/launchers/build.xml | 1 - sandbox/travelsample/launchers/common/build.xml | 22 ------ sandbox/travelsample/launchers/common/pom.xml | 39 ---------- .../launchers/currency-converter-corba/build.xml | 2 +- .../launchers/currency-converter-corba/pom.xml | 8 ++- .../launchers/currency-converter-jms/build.xml | 2 +- .../launchers/currency-converter-jms/pom.xml | 8 ++- .../launchers/currency-converter-rmi/build.xml | 2 +- .../launchers/currency-converter-rmi/pom.xml | 6 +- .../launchers/currency-converter-ws/build.xml | 2 +- .../launchers/currency-converter-ws/pom.xml | 6 +- .../launchers/currency-converter/build.xml | 2 +- .../launchers/currency-converter/pom.xml | 8 ++- .../travelsample/launchers/databinding/build.xml | 2 +- sandbox/travelsample/launchers/databinding/pom.xml | 6 +- .../travelsample/launchers/feed-logger/build.xml | 2 +- sandbox/travelsample/launchers/feed-logger/pom.xml | 12 +++- sandbox/travelsample/launchers/fullapp/build.xml | 2 +- sandbox/travelsample/launchers/fullapp/pom.xml | 6 +- .../travelsample/launchers/help-pages/build.xml | 2 +- sandbox/travelsample/launchers/help-pages/pom.xml | 6 +- .../travelsample/launchers/interaction/build.xml | 2 +- sandbox/travelsample/launchers/interaction/pom.xml | 6 +- .../travelsample/launchers/introducing/build.xml | 2 +- sandbox/travelsample/launchers/introducing/pom.xml | 6 +- sandbox/travelsample/launchers/jumpstart/build.xml | 2 +- sandbox/travelsample/launchers/jumpstart/pom.xml | 6 +- .../launchers/notification-corba/build.xml | 2 +- .../launchers/notification-corba/pom.xml | 6 +- .../launchers/notification-ejb/build.xml | 2 +- .../launchers/notification-ejb/pom.xml | 8 ++- .../launchers/notification-jms/build.xml | 2 +- .../launchers/notification-jms/pom.xml | 6 +- .../launchers/notification-rmi/build.xml | 2 +- .../launchers/notification-rmi/pom.xml | 6 +- .../launchers/notification-ws/build.xml | 2 +- .../travelsample/launchers/notification-ws/pom.xml | 6 +- sandbox/travelsample/launchers/policy/build.xml | 2 +- sandbox/travelsample/launchers/policy/pom.xml | 6 +- sandbox/travelsample/launchers/pom.xml | 1 - sandbox/travelsample/pom.xml | 1 + sandbox/travelsample/util/build.xml | 44 ++++++++++++ .../travelsample/util/launcher-common/build.xml | 22 ++++++ sandbox/travelsample/util/launcher-common/pom.xml | 58 +++++++++++++++ .../main/java/scatours/launcher/LauncherUtil.java | 82 ++++++++++++++++++++++ sandbox/travelsample/util/pom.xml | 45 ++++++++++++ 51 files changed, 391 insertions(+), 116 deletions(-) delete mode 100644 sandbox/travelsample/launchers/common/build.xml delete mode 100644 sandbox/travelsample/launchers/common/pom.xml create mode 100644 sandbox/travelsample/util/build.xml create mode 100644 sandbox/travelsample/util/launcher-common/build.xml create mode 100644 sandbox/travelsample/util/launcher-common/pom.xml create mode 100644 sandbox/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java create mode 100644 sandbox/travelsample/util/pom.xml (limited to 'sandbox') diff --git a/sandbox/travelsample/build.xml b/sandbox/travelsample/build.xml index b55d96d5e8..70a4dc0876 100644 --- a/sandbox/travelsample/build.xml +++ b/sandbox/travelsample/build.xml @@ -38,6 +38,7 @@ + diff --git a/sandbox/travelsample/distribution/pom.xml b/sandbox/travelsample/distribution/pom.xml index 614f49b958..cb4f8adaaf 100644 --- a/sandbox/travelsample/distribution/pom.xml +++ b/sandbox/travelsample/distribution/pom.xml @@ -301,11 +301,6 @@ scatours-contribution-tripbooking ${pom.version} - - org.apache.tuscany.sca - scatours-launcher-common - ${pom.version} - org.apache.tuscany.sca scatours-launcher-blog-feed @@ -451,6 +446,11 @@ scatours-service-smsgateway-rmi ${pom.version} + + org.apache.tuscany.sca + scatours-util-launcher-common + ${pom.version} + org.apache.geronimo.specs diff --git a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml index 33f0459982..e50b056eb4 100644 --- a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml +++ b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml @@ -45,14 +45,14 @@ - lib + util + ${artifact.artifactId}.${artifact.extension} false - org.apache.tuscany.sca:scatours-launcher-common + org.apache.tuscany.sca:scatours-util-* runtime - contributions ${artifact.artifactId}.${artifact.extension} @@ -69,9 +69,6 @@ org.apache.tuscany.sca:scatours-launcher-* - - org.apache.tuscany.sca:scatours-launcher-common - runtime diff --git a/sandbox/travelsample/launchers/blog-feed/build.xml b/sandbox/travelsample/launchers/blog-feed/build.xml index c425c33580..c708dabbe5 100644 --- a/sandbox/travelsample/launchers/blog-feed/build.xml +++ b/sandbox/travelsample/launchers/blog-feed/build.xml @@ -20,7 +20,7 @@ - + diff --git a/sandbox/travelsample/launchers/blog-feed/pom.xml b/sandbox/travelsample/launchers/blog-feed/pom.xml index 11d1c186fa..7df381d2e1 100644 --- a/sandbox/travelsample/launchers/blog-feed/pom.xml +++ b/sandbox/travelsample/launchers/blog-feed/pom.xml @@ -32,8 +32,15 @@ org.apache.tuscany.sca - scatours-launcher-common + scatours-util-launcher-common ${pom.version} + provided + + + + org.apache.tuscany.sca + tuscany-node-api + ${tuscany.version} @@ -87,6 +94,9 @@ 2.2 + + ../util/scatours-util-launcher-common.jar + true ../lib/ diff --git a/sandbox/travelsample/launchers/build.xml b/sandbox/travelsample/launchers/build.xml index b080b2c473..a391f8e0cc 100644 --- a/sandbox/travelsample/launchers/build.xml +++ b/sandbox/travelsample/launchers/build.xml @@ -38,7 +38,6 @@ - diff --git a/sandbox/travelsample/launchers/common/build.xml b/sandbox/travelsample/launchers/common/build.xml deleted file mode 100644 index c56323c786..0000000000 --- a/sandbox/travelsample/launchers/common/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/sandbox/travelsample/launchers/common/pom.xml b/sandbox/travelsample/launchers/common/pom.xml deleted file mode 100644 index 9424fd13d9..0000000000 --- a/sandbox/travelsample/launchers/common/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - scatours - 1.0-SNAPSHOT - ../../pom.xml - 1.0-SNAPSHOT - scatours-launcher-common - Apache Tuscany SCA Tours Common Utility for Launchers - - - - org.apache.tuscany.sca - tuscany-node-api - ${tuscany.version} - - - - diff --git a/sandbox/travelsample/launchers/currency-converter-corba/build.xml b/sandbox/travelsample/launchers/currency-converter-corba/build.xml index 0e51e79bca..20c4a3c11c 100644 --- a/sandbox/travelsample/launchers/currency-converter-corba/build.xml +++ b/sandbox/travelsample/launchers/currency-converter-corba/build.xml @@ -20,7 +20,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/travelsample/util/launcher-common/build.xml b/sandbox/travelsample/util/launcher-common/build.xml new file mode 100644 index 0000000000..a8fe5faff0 --- /dev/null +++ b/sandbox/travelsample/util/launcher-common/build.xml @@ -0,0 +1,22 @@ + + + + + diff --git a/sandbox/travelsample/util/launcher-common/pom.xml b/sandbox/travelsample/util/launcher-common/pom.xml new file mode 100644 index 0000000000..29ee3edf1e --- /dev/null +++ b/sandbox/travelsample/util/launcher-common/pom.xml @@ -0,0 +1,58 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + scatours + 1.0-SNAPSHOT + ../../pom.xml + 1.0-SNAPSHOT + scatours-util-launcher-common + Apache Tuscany SCA Tours Common Utility for Launchers + + + + org.apache.tuscany.sca + tuscany-node-api + ${tuscany.version} + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + true + ../lib/ + + + + + + + + diff --git a/sandbox/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java b/sandbox/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java new file mode 100644 index 0000000000..828ee58bf3 --- /dev/null +++ b/sandbox/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java @@ -0,0 +1,82 @@ +/* + * 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. + */ + +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; + +/** + * This utility locates SCA contributions by name so that the launcher can work with various environments where + * contributions are stored differently. + */ +public class LauncherUtil { + + /** + * Locate an SCA contribution by name + * @param name The name of the SCA contribution archive + * @return The SCAContribution + */ + public static SCAContribution locate(String name) { + // Try to use the target/classes directory inside Eclipse/Maven + File file = new File("../../contributions/" + name + "/target/classes"); + if (!file.exists()) { + // Try to use the target/.jar that is generated by maven build + file = new File("../../contributions/" + name + "/target/scatours-contribution-" + name + ".jar"); + if (!file.exists()) { + // Try to use the contribution jar under the contributions folder of the distribution + file = new File("../contributions/scatours-contribution-" + name + ".jar"); + if (!file.exists()) { + throw new IllegalArgumentException("Contribution " + name + " cannot be located."); + } + } + } + return new SCAContribution(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 + */ + public static SCAContribution locate(String urlPattern, String name) { + String url = urlPattern.replace("${name}", name); + return new SCAContribution(name, url); + } + + /** + * Create an SCA node from a list of contribution names + * @param composite + * @param contributionNames + * @return + */ + public static SCANode createNode(String composite, String... contributionNames) { + SCAContribution[] contributions = new SCAContribution[contributionNames.length]; + int index = 0; + for (String name : contributionNames) { + contributions[index++] = locate(name); + } + SCANode node = SCANodeFactory.newInstance().createSCANode(composite, contributions); + return node; + } +} diff --git a/sandbox/travelsample/util/pom.xml b/sandbox/travelsample/util/pom.xml new file mode 100644 index 0000000000..265803644c --- /dev/null +++ b/sandbox/travelsample/util/pom.xml @@ -0,0 +1,45 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + scatours + 1.0-SNAPSHOT + ../pom.xml + + 1.0-SNAPSHOT + scatours-util + pom + Apache Tuscany SCA Tours Utilities + + + + default + + true + + + launcher-common + + + + + -- cgit v1.2.3