summaryrefslogtreecommitdiffstats
path: root/sandbox/travelsample/launchers/introducing-launcher/src
diff options
context:
space:
mode:
Diffstat (limited to 'sandbox/travelsample/launchers/introducing-launcher/src')
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java26
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java28
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java8
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml26
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite31
-rw-r--r--sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java5
6 files changed, 8 insertions, 116 deletions
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java
deleted file mode 100644
index a8e3ea5ccf..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java
+++ /dev/null
@@ -1,26 +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 org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Bookings {
- String newBooking(String trip, int people);
-}
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java
deleted file mode 100644
index 3b8f8b3130..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java
+++ /dev/null
@@ -1,28 +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.math.BigDecimal;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Checkout {
- void makePayment(BigDecimal amount, String cardInfo);
-}
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java
index c3f48b463e..580851d327 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java
+++ b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java
@@ -38,10 +38,14 @@ public class LaunchIntroducingNode {
try {
SCANode node = SCANodeFactory.newInstance().createSCANode(null,
new SCAContribution("goodvaluetrips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),
- new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"));
+ new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),
+ new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"));
node.start();
+ Runnable runner = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+ runner.run();
+ /*
Bookings bookings = ((SCAClient)node).getService(Bookings.class,
"TripBooking/Bookings");
@@ -52,7 +56,7 @@ public class LaunchIntroducingNode {
"ShoppingCart/Checkout");
checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");
-
+ */
node.stop();
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 4a6250ad25..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:scatours="http://scatours">
- <import namespace="http://tuscanyscatours.com/" />
- <import namespace="http://goodvaluetrips.com/" />
- <import namespace="http://client.scatours/" />
- <deployable composite="scatours:scatours" />
-</contribution>
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite b/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite
deleted file mode 100644
index eaa19f6174..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scatours"
- xmlns:client="http://client.scatours/"
- xmlns:tours="http://tuscanyscatours.com/"
- xmlns:trips="http://goodvaluetrips.com/"
- name="scatours">
-
- <include name="client:Client" />
- <include name="tours:Tours" />
- <include name="trips:Trips" />
-
-</composite>
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java
index f70dc8d3f8..2e423e016a 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java
+++ b/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java
@@ -36,11 +36,10 @@ public class NodeTestCase {
@Before
public void startServer() throws Exception {
try {
- node = SCANodeFactory.newInstance().createSCANode("scatours.composite",
+ node = SCANodeFactory.newInstance().createSCANode(null,
new SCAContribution("goodvaluetrips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),
new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),
- new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"),
- new SCAContribution("node", "./target/classes"));
+ new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"));
node.start();
} catch (Exception ex) {
System.out.println(ex.toString());