diff options
Diffstat (limited to '')
3 files changed, 13 insertions, 13 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java index fd2cc073ec..29e2058023 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java @@ -19,10 +19,10 @@ package scatours.trip; -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.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -34,15 +34,15 @@ import com.tuscanyscatours.common.TripItem; * */ public class TripTestCase { - private static SCANode tripNode; + private static Node tripNode; @BeforeClass public static void setUpBeforeClass() throws Exception { try { tripNode = - SCANodeFactory.newInstance().createSCANode("trip.composite", - new SCAContribution("trip", "./target/classes"), - new SCAContribution("trip-test", "./target/test-classes")); + NodeFactory.getInstance().createNode("trip.composite", + new Contribution("trip", "./target/classes"), + new Contribution("trip-test", "./target/test-classes")); tripNode.start(); } catch (Exception ex) { @@ -52,7 +52,7 @@ public class TripTestCase { @Test public void testPayment() { - SCAClient client = (SCAClient)tripNode; + Node client = (Node)tripNode; Book booking = client.getService(Book.class, "Trip/Book"); TripItem tripItem = new TripItem("1234", "5678", TripItem.TRIP, "FS1DEC06", "Florence and Siena pre-packaged tour", "FLR", diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml index 8d7ff59b0c..c16e387ad7 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. --> -<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" +<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"> <!-- PolicySets --> <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java" - xmlns="http://www.osoa.org/xmlns/sca/1.0"> + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"> <tuscany:jdkLogger name="myLogger"> <logLevel>FINER</logLevel> </tuscany:jdkLogger> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite index 06c449633c..d96a5ed8e2 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.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://scatours" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" name="packagedtrip"> |