From bc398b011124c0aec5826fcf8a25d0f084bb7c5f Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 15 Sep 2009 14:11:14 +0000 Subject: Fix naming inconsistencies git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815338 13f79535-47bb-0310-9956-ffa450edef68 --- .../databinding-client-contribution/pom.xml | 4 +- .../src/main/java/scatours/client/TestClient.java | 2 +- .../main/resources/META-INF/sca-contribution.xml | 3 +- .../src/main/resources/client.composite | 4 +- .../contributions/payment-bpel/pom.xml | 4 +- .../launchers/databinding-launcher/build.xml | 244 +-------------------- .../launchers/databinding-launcher/pom.xml | 21 +- .../main/java/scatours/DatabindingLauncher.java | 45 ++++ .../main/java/scatours/LaunchDatabindingNode.java | 58 ----- 9 files changed, 60 insertions(+), 325 deletions(-) create mode 100644 sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java delete mode 100644 sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml b/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml index cb1fdbecc0..e5d88b7d2e 100644 --- a/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml +++ b/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml @@ -25,7 +25,7 @@ 1.6-SNAPSHOT 1.0-SNAPSHOT - scatours-databinding-client-contribution + scatours-contribution-databinding-client Apache Tuscany SCA Tours Databinding Client Contribution @@ -37,7 +37,7 @@ org.apache.tuscany.sca - scatours-payment-java-contribution + scatours-contribution-payment-java 1.0-SNAPSHOT diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java index 1595eb4a01..8f69ce9d5f 100644 --- a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java +++ b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java @@ -24,7 +24,7 @@ import java.math.BigDecimal; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; -import payment.Payment; +import com.tuscanyscatours.payment.Payment; @Service(Runnable.class) public class TestClient { diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml index e90a37cae2..3513bb437e 100644 --- a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -20,7 +20,6 @@ - - + diff --git a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite index 83320d2ac1..e19697290c 100644 --- a/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite +++ b/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite @@ -23,6 +23,6 @@ - - + + diff --git a/sandbox/travelsample/contributions/payment-bpel/pom.xml b/sandbox/travelsample/contributions/payment-bpel/pom.xml index 41cf6fc0b0..91405ec67a 100644 --- a/sandbox/travelsample/contributions/payment-bpel/pom.xml +++ b/sandbox/travelsample/contributions/payment-bpel/pom.xml @@ -73,14 +73,14 @@ org.apache.tuscany.sca - scatours-emailgateway-contribution + scatours-contribution-emailgateway 1.0-SNAPSHOT test org.apache.tuscany.sca - scatours-creditcard-payment-jaxb-contribution + scatours-contribution-creditcard-payment-jaxb 1.0-SNAPSHOT test diff --git a/sandbox/travelsample/launchers/databinding-launcher/build.xml b/sandbox/travelsample/launchers/databinding-launcher/build.xml index 38cd3ce52a..5c1e4a1eea 100644 --- a/sandbox/travelsample/launchers/databinding-launcher/build.xml +++ b/sandbox/travelsample/launchers/databinding-launcher/build.xml @@ -17,37 +17,24 @@ * under the License. --> - + - + - - + - - - - - - - - - - - - + - - - + + @@ -58,223 +45,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sandbox/travelsample/launchers/databinding-launcher/pom.xml b/sandbox/travelsample/launchers/databinding-launcher/pom.xml index f226b37f05..8d86f71730 100644 --- a/sandbox/travelsample/launchers/databinding-launcher/pom.xml +++ b/sandbox/travelsample/launchers/databinding-launcher/pom.xml @@ -25,7 +25,7 @@ 1.6-SNAPSHOT 1.0-SNAPSHOT - scatours-databinding-launcher + scatours-launcher-databinding Apache Tuscany SCA Tours Databinding Launcher @@ -143,24 +143,5 @@ ${artifactId} - diff --git a/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java b/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java new file mode 100644 index 0000000000..b88149c183 --- /dev/null +++ b/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java @@ -0,0 +1,45 @@ +/* + * 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; + +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCAContribution; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; + +public class DatabindingLauncher { + public static void main(String[] args) throws Exception { + SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, + new SCAContribution("paymentjava", "../../contributions/payment-java/target/classes"), + new SCAContribution("client", "../../contributions/databinding-client-contribution/target/classes")); + + SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, + new SCAContribution("creditcardpaymentsdo", "../../contributions/creditcard-payment-sdo/target/classes")); + + node1.start(); + node2.start(); + + Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable"); + runner.run(); + + node1.stop(); + node2.stop(); + } +} diff --git a/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java b/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java deleted file mode 100644 index b910e90a2d..0000000000 --- a/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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; - -import java.io.IOException; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; - -public class LaunchDatabindingNode { - public static void main(String[] args) throws Exception { - LaunchDatabindingNode.launchFromFileSystemDir(); - } - - // OK for development but you must launch the node from this module - public static void launchFromFileSystemDir(){ - try { - SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("paymentjava", "../../contributions/payment-java-contribution/target/classes"), - new SCAContribution("client", "../../contributions/databinding-client-contribution/target/classes")); - - SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("creditcardpaymentjaxb", "../../contributions/creditcard-payment-sdo-contribution/target/classes")); - - - node1.start(); - node2.start(); - - Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable"); - runner.run(); - - node1.stop(); - node2.stop(); - - } catch (Throwable th) { - th.printStackTrace(); - } - } -} -- cgit v1.2.3