diff options
Diffstat (limited to '')
26 files changed, 80 insertions, 101 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml index 20a5d8bce4..443edb6215 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml @@ -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-contribution-buildingblocks-client</artifactId>
<name>Apache Tuscany SCA Tours Building Blocks Client Contribution</name>
@@ -58,7 +58,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
@@ -72,14 +72,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-node-runtime</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
@@ -92,13 +85,6 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-asf</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.2.0</version>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java index e5e994b73c..9eb38a0a85 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java @@ -18,7 +18,7 @@ */
package scatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Bookings {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java index 519b7779fa..af9d8a1bbb 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java @@ -20,7 +20,7 @@ package scatours; import java.math.BigDecimal;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Checkout {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java index 278673c67d..cd46a8915a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java @@ -21,8 +21,8 @@ package scatours.impl; import java.math.BigDecimal;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import scatours.Bookings;
import scatours.Checkout;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java index 16934872b9..d37860be3b 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java @@ -21,8 +21,8 @@ package scatours.impl; import java.math.BigDecimal;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import scatours.Bookings;
import scatours.Checkout;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml index e3f6effcee..183ffa816b 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml @@ -17,10 +17,10 @@ * specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tst="http://tuscanyscatours.com/">
- <import namespace="http://tuscanyscatours.com/" />
<deployable composite="tst:ToursApplClient" />
<deployable composite="tst:ToursImplClient" />
<deployable composite="tst:ToursImplIncludeClient" />
+ <import namespace="http://tuscanyscatours.com/" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite index b9f9d59f43..f0e33425e3 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tst="http://tuscanyscatours.com/"
name="ToursApplClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite index f8f0b3d4d1..6048ccda88 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tst="http://tuscanyscatours.com/"
name="ToursImplClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite index 7310d0540d..49967db666 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tst="http://tuscanyscatours.com/"
name="ToursImplIncludeClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java index 2cf08ec420..6115833182 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java @@ -21,10 +21,10 @@ package scatours; import org.apache.activemq.broker.BrokerService;
-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;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,7 +35,7 @@ import org.junit.Test; public class BuildingBlocksApplTestCase {
private BrokerService jmsBroker;
- private SCANode node1, node2;
+ private Node node1, node2;
@Before
public void startServer() throws Exception {
@@ -44,12 +44,12 @@ public class BuildingBlocksApplTestCase { jmsBroker.setUseJmx(false);
jmsBroker.addConnector("tcp://localhost:61619");
- node1 = SCANodeFactory.newInstance().createSCANode("tours-appl.composite",
- new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
- new SCAContribution("buildingblocks", "../buildingblocks/target/classes"));
+ node1 = NodeFactory.getInstance().createNode("tours-appl.composite",
+ new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+ new Contribution("buildingblocks", "../buildingblocks/target/classes"));
- node2 = SCANodeFactory.newInstance().createSCANode("tours-appl-client.composite",
- new SCAContribution("buildingblocks-client", "./target/classes"));
+ node2 = NodeFactory.getInstance().createNode("tours-appl-client.composite",
+ new Contribution("buildingblocks-client", "./target/classes"));
jmsBroker.start();
node1.start();
@@ -58,7 +58,7 @@ public class BuildingBlocksApplTestCase { @Test
public void testAppl() {
- Runnable client = ((SCAClient)node2).getService(Runnable.class, "ApplClient/Runnable");
+ Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");
client.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java index ad48db5616..ebc278f5b4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java @@ -19,10 +19,10 @@ 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;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,21 +32,21 @@ import org.junit.Test; */
public class BuildingBlocksImplIncludeTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl-include-client.composite",
- new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
- new SCAContribution("buildingblocks", "../buildingblocks/target/classes"),
- new SCAContribution("buildingblocks-client", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl-include-client.composite",
+ new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+ new Contribution("buildingblocks", "../buildingblocks/target/classes"),
+ new Contribution("buildingblocks-client", "./target/classes"));
node.start();
}
@Test
public void testImplInclude() {
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java index c4cffa3e02..9356a2b146 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java @@ -19,10 +19,10 @@ 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;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,20 +32,20 @@ import org.junit.Test; */
public class BuildingBlocksImplTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl-client.composite",
- new SCAContribution("buildingblocks", "../buildingblocks/target/classes"),
- new SCAContribution("buildingblocks-client", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl-client.composite",
+ new Contribution("buildingblocks", "../buildingblocks/target/classes"),
+ new Contribution("buildingblocks-client", "./target/classes"));
node.start();
}
@Test
public void testImpl() {
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml index 32985041a7..bf5ad5c51a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml @@ -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-contribution-buildingblocks</artifactId>
<name>Apache Tuscany SCA Tours Building Blocks Contribution</name>
@@ -44,7 +44,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
@@ -71,13 +71,6 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-node-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java index 38ddc1f099..748e88ee09 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java @@ -18,7 +18,7 @@ */
package com.budgettours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Tours {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java index 365a210368..5026d23c95 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java @@ -18,7 +18,7 @@ */
package com.goodvaluetrips;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java index 9d54d46bb6..4ddd145778 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java @@ -18,7 +18,7 @@ */
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Bookings {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java index 29c84d2bc0..4e8f1481f5 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java @@ -20,7 +20,7 @@ package com.tuscanyscatours; import java.math.BigDecimal;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Checkout {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java index e33b0399cb..beb5f529b1 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java @@ -18,7 +18,7 @@ */
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Updates {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java index f2884f87c5..1259fa7d82 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java @@ -18,7 +18,7 @@ */
package com.tuscanyscatours.impl;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
import com.goodvaluetrips.Trips;
import com.tuscanyscatours.Bookings;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml index 028c41e415..697b706163 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml @@ -17,11 +17,11 @@ * specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tst="http://tuscanyscatours.com/">
- <import namespace="http://goodvaluetrips.com/" />
- <export namespace="http://tuscanyscatours.com/" />
<deployable composite="tst:ToursAppl" />
<deployable composite="tst:ToursImpl" />
<deployable composite="tst:ToursImplInclude" />
+ <import namespace="http://goodvaluetrips.com/" />
+ <export namespace="http://tuscanyscatours.com/" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite index 8733c79c5d..6d0a1c1f0d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:bb="http://bb.tuscanyscatours.com/"
xmlns:gvt="http://goodvaluetrips.com/"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite index 4080523309..1441702a98 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:bb="http://bb.tuscanyscatours.com/"
xmlns:gvt="http://goodvaluetrips.com/"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite index 1d82858f22..c1a7643df6 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:bb="http://bb.tuscanyscatours.com/"
name="ToursImpl">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite index b66d2344cd..d2d74d08fc 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://bb.tuscanyscatours.com/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
name="Tours">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java index ccdd2a73bd..6c9079e5ab 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java @@ -24,10 +24,10 @@ import java.math.BigDecimal; import com.tuscanyscatours.Bookings;
import com.tuscanyscatours.Checkout;
-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;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,23 +37,23 @@ import org.junit.Test; */
public class BuildingBlocksImplIncludeTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl-include.composite",
- new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
- new SCAContribution("buildingblocks", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl-include.composite",
+ new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+ new Contribution("buildingblocks", "./target/classes"));
node.start();
}
@Test
public void testImplInclude() {
- Bookings bookings = ((SCAClient)node).getService(Bookings.class, "MyTours/BookTrip");
+ Bookings bookings = ((Node)node).getService(Bookings.class, "MyTours/BookTrip");
String bookingCode = bookings.newBooking("FS1APR4", 1);
System.out.println("Booking code is " + bookingCode);
- Checkout checkout = ((SCAClient)node).getService(Checkout.class, "MyTours/Checkout");
+ Checkout checkout = ((Node)node).getService(Checkout.class, "MyTours/Checkout");
checkout.makePayment(new BigDecimal("1995.00"), "1234567801234567 11/10");
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java index 35271bc5aa..f74304409d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java @@ -24,10 +24,10 @@ import java.math.BigDecimal; import com.tuscanyscatours.Bookings;
import com.tuscanyscatours.Checkout;
-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;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,22 +37,22 @@ import org.junit.Test; */
public class BuildingBlocksImplTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl.composite",
- new SCAContribution("buildingblocks", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl.composite",
+ new Contribution("buildingblocks", "./target/classes"));
node.start();
}
@Test
public void testImpl() {
- Bookings bookings = ((SCAClient)node).getService(Bookings.class, "MyTours/BookTrip");
+ Bookings bookings = ((Node)node).getService(Bookings.class, "MyTours/BookTrip");
String bookingCode = bookings.newBooking("FS1APR4", 1);
System.out.println("Booking code is " + bookingCode);
- Checkout checkout = ((SCAClient)node).getService(Checkout.class, "MyTours/Checkout");
+ Checkout checkout = ((Node)node).getService(Checkout.class, "MyTours/Checkout");
checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");
}
|