diff options
Diffstat (limited to '')
30 files changed, 1215 insertions, 2 deletions
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/client/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/pom.xml new file mode 100644 index 0000000000..22de154c72 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/pom.xml @@ -0,0 +1,48 @@ +<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-domainmgr-basic</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-domainmgr-basic-client</artifactId>
+ <name>Apache Tuscany SCA iTest Domain Manager Basic Client Contribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-domainmgr-basic-tours</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java new file mode 100644 index 0000000000..64a1487f72 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java @@ -0,0 +1,47 @@ +/*
+ * 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.client;
+
+import java.math.BigDecimal;
+
+import com.tuscanyscatours.Bookings;
+import com.tuscanyscatours.Checkout;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(Runnable.class)
+public class TestClient {
+ @Reference
+ protected Bookings bookings;
+
+ @Reference
+ protected Checkout checkout;
+
+ public TestClient() {
+ }
+
+ public void run() {
+ String bookingCode = bookings.newBooking("FS1APR4", 1);
+ System.out.println("Booking code is " + bookingCode);
+
+ checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");
+ }
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..0e2af2345d --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ +<?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:client="http://client.scatours/">
+ <!--export namespace="http://client.scatours/" /-->
+ <import.java package="com.tuscanyscatours" />
+ <deployable composite="client:Client" />
+</contribution>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite new file mode 100644 index 0000000000..05c2755114 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite @@ -0,0 +1,29 @@ +<?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://client.scatours/"
+ name="Client">
+
+ <component name="TestClient">
+ <implementation.java class="scatours.client.TestClient" />
+ <reference name="bookings" target="TripBooking/Bookings" />
+ <reference name="checkout" target="ShoppingCart/Checkout" />
+ </component>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/pom.xml new file mode 100644 index 0000000000..05f0cadf52 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/pom.xml @@ -0,0 +1,42 @@ +<?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. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-basic</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Basic</name> + + <packaging>pom</packaging> + <build> + <defaultGoal>install</defaultGoal> + </build> + <modules> + <module>trips</module> + <module>tours</module> + <module>client</module> + <module>runtest</module> + </modules> + +</project> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/pom.xml new file mode 100644 index 0000000000..1161ff979a --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/pom.xml @@ -0,0 +1,112 @@ +<?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. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-basic</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-domainmgr-basic-runtest</artifactId> + <name>Apache Tuscany SCA iTest Domain Manager Basic Run Test</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-basic-trips</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-basic-tours</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-domainmgr-basic-client</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-domain-manager</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-sca-axis2</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <!-- + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <version>1.5.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <includes> + <include>**/*TestCase.java</include> + </includes> + <reportFormat>brief</reportFormat> + <useFile>false</useFile> + <forkMode>once</forkMode> + <argLine>-ea -Xmx256m</argLine> + <useSystemClassLoader>true</useSystemClassLoader> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java new file mode 100644 index 0000000000..1f7a3443b3 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java @@ -0,0 +1,345 @@ +/*
+ * 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 domainmgr;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.Test;
+
+/**
+ * Starts the Romain Manager with a test configuration, then starts
+ * a test node that reads a deployed composite. The domain manager
+ * should read and configure the composite and send it to the node
+ * without detecting or reporting any errors.
+ */
+public class DomainManagerBasicTestCase {
+
+ private String home = System.getProperty("java.home");
+ private String classpath = System.getProperty("java.class.path");
+ private Runtime runtime = Runtime.getRuntime();
+ private BufferedReader domainErrReader;
+ private BufferedReader domainOutReader;
+
+ @Test
+ public void test() throws Exception {
+
+ Process domainMgr = null;
+ TestNode tripsNode = null;
+ TestNode toursNode = null;
+
+ try {
+ // Start the domain manager process in its own working directory of
+ // "target/test-classes/domain/" to ensure no interference with the
+ // node processes. The predefined domain config is copied by mvn
+ // from the "src/test/resources/domain/" directory.
+ System.out.println("Starting domain manager");
+ String[] domainCommand = {
+ "\"" + home + "/bin/java\"",
+ "-cp",
+ "\"" + classpath + "\"",
+ "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"};
+ String userdir = System.getProperty("user.dir");
+ domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/"));
+
+ // Get the new process's stdin, stdout and stderr streams so that we
+ // can monitor and control execution of the domain manager process.
+ InputStream domainErr = domainMgr.getErrorStream();
+ domainErrReader = new BufferedReader(new InputStreamReader(domainErr));
+ InputStream domainOut = domainMgr.getInputStream();
+ domainOutReader = new BufferedReader(new InputStreamReader(domainOut));
+ OutputStream domainIn = domainMgr.getOutputStream();
+
+ // Read startup log output from the domain manager process. The log
+ // output is written to the process's stderr.
+ while (true) {
+ checkDomainOut();
+ String line = domainErrReader.readLine();
+ if (line == null) {
+ // reached end of stderr stream before startup completed
+ throw new IllegalStateException("Error starting Domain Manager process");
+ }
+ System.out.println("DomainMgr.e: " + line);
+ if (line.contains("SEVERE:")) {
+ // startup error logged by domain manager process
+ throw new IllegalStateException("Domain manager reported error: " + line);
+ }
+ if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {
+ // domain manager started successfully
+ System.out.println("Domain manager started successfully");
+ break;
+ }
+ }
+ checkDomainOut();
+
+ // Start the test nodes. Each node runs in its own "target" directory
+ // to ensure no interference with other processes.
+ tripsNode = new TestNode("TripsNode", userdir + "/../trips/target/");
+ tripsNode.start();
+ toursNode = new TestNode("ToursNode", userdir + "/../tours/target/");
+ toursNode.start();
+
+ // Start the client node. This runs in the current process so that
+ // we can use the SCAClient API to invoke its services. The current
+ // working directory is "runtest" which means there is no interference
+ // other processes.
+ SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");
+ checkDomainErr();
+ checkDomainOut();
+ clientNode.start();
+
+ // Run the client test code.
+ Runnable client = ((SCAClient)clientNode).getService(Runnable.class, "TestClient/Runnable");
+ client.run();
+ tripsNode.checkNodeErr();
+ tripsNode.checkNodeOut();
+ toursNode.checkNodeErr();
+ toursNode.checkNodeOut();
+
+ // Stop the client node.
+ clientNode.stop();
+
+ // Stop the test nodes.
+ toursNode.stopNode();
+ tripsNode.stopNode();
+
+ // Stop the domain manager by sending 'q' to stdin.
+ System.out.println("Stopping domain manager");
+ domainIn.write('q');
+ domainIn.flush();
+ while (true) {
+ checkDomainOut();
+ String line = domainErrReader.readLine();
+ if (line == null) {
+ // reached end of stderr stream before shutdown completed
+ throw new IllegalStateException("Error stopping Domain Manager process");
+ }
+ System.out.println("DomainMgr.e: " + line);
+ if (line.contains("SEVERE:")) {
+ // shutdown error logged by domain manager process
+ throw new IllegalStateException("Domain manager reported error: " + line);
+ }
+ if (line.contains("INFO: SCA Domain Manager is now stopped.")) {
+ // domain manager stopped successfully
+ System.out.println("Domain manager stopped successfully");
+ break;
+ }
+ }
+ checkDomainOut();
+
+ // Wait for domain manager process to end, and check its exit value.
+ int value = domainMgr.waitFor();
+ if (value != 0) {
+ throw new IllegalStateException("Domain Manager process exit value " + value);
+ }
+
+ } catch (Exception ex) {
+
+ // Error found, so destroy the test node processes and the domain
+ // manager process so that the test case exits cleanly.
+ if (tripsNode != null) {
+ tripsNode.destroyNode();
+ }
+ if (toursNode != null) {
+ toursNode.destroyNode();
+ }
+ if (domainMgr != null) {
+ System.out.println("Destroying domain");
+ try {
+ domainMgr.destroy();
+ } catch (Exception e) {
+ }
+ }
+
+ // Report the test error.
+ throw ex;
+ }
+ }
+
+ /*
+ * Check stderr for the domain manager process. Called periodically
+ * to ensure that anything written to stderr is displayed in the test log
+ * and abort execution if the domain manager has logged any errors.
+ */
+ private void checkDomainErr() throws Exception {
+ while (domainErrReader.ready()) {
+ String line = domainErrReader.readLine();
+ System.out.println("DomainMgr.e: " + line);
+ if (line.contains("SEVERE:")) {
+ throw new IllegalStateException("Domain manager reported error: " + line);
+ }
+ }
+ }
+
+ /*
+ * Check stdout for the domain manager process. Called periodically
+ * to ensure that anything written to stdout is displayed in the test log.
+ */
+ private void checkDomainOut() throws Exception {
+ while (domainOutReader.ready()) {
+ String line = domainOutReader.readLine();
+ System.out.println("DomainMgr.o: " + line);
+ }
+ }
+
+ /*
+ * Internal class representing a test node.
+ */
+ private class TestNode {
+
+ String nodeName;
+ String nodeDir;
+ BufferedReader nodeErrReader;
+ BufferedReader nodeOutReader;
+ OutputStream nodeIn;
+ Process nodeProcess;
+
+ TestNode(String nodeName, String nodeDir) {
+ this.nodeName = nodeName;
+ this.nodeDir = nodeDir;
+ }
+
+ /*
+ * Start the test node.
+ */
+ void start() throws Exception {
+ System.out.println("Starting node " + nodeName);
+ String[] nodeCommand = {
+ "\"" + home + "/bin/java\"",
+ "-cp",
+ "\"" + classpath + "\"",
+ "org.apache.tuscany.sca.node.launcher.NodeLauncher",
+ "http://localhost:9990/node-config/" + nodeName};
+ nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir));
+
+ // Get the new process's stdin, stdout and stderr streams so that we
+ // can monitor and control execution of the test node process.
+ InputStream nodeErr = nodeProcess.getErrorStream();
+ nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr));
+ InputStream nodeOut = nodeProcess.getInputStream();
+ nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut));
+ nodeIn = nodeProcess.getOutputStream();
+
+ // Read startup log output from the test node process. The log
+ // output is written to the process's stderr.
+ while (true) {
+ checkDomainErr();
+ checkDomainOut();
+ checkNodeOut();
+ String line = nodeErrReader.readLine();
+ if (line == null) {
+ // reached end of stderr stream before startup completed
+ throw new IllegalStateException("Error starting node " + nodeName);
+ }
+ System.out.println(nodeName + ".e: " + line);
+ if (line.contains("SEVERE:")) {
+ // startup error logged by test node process
+ throw new IllegalStateException("Node " + nodeName + " reported error: " + line);
+ }
+ if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {
+ // test node started successfully
+ System.out.println("Node " + nodeName + " started successfully");
+ break;
+ }
+ }
+ checkDomainErr();
+ checkDomainOut();
+ checkNodeOut();
+ }
+
+ /*
+ * Check stderr for the test node process. Called periodically to
+ * ensure that anything written to stderr is displayed in the test log
+ * and abort execution if the test node has logged any errors.
+ */
+ void checkNodeErr() throws Exception {
+ while (nodeErrReader.ready()) {
+ String line = nodeErrReader.readLine();
+ System.out.println(nodeName + ".e: " + line);
+ if (line.contains("SEVERE:")) {
+ throw new IllegalStateException("Node " + nodeName + " reported error: " + line);
+ }
+ }
+ }
+
+ /*
+ * Check stdout for the test node process. Called periodically to
+ * ensure that anything written to stdout is displayed in the test log.
+ */
+ void checkNodeOut() throws Exception {
+ while (nodeOutReader.ready()) {
+ String line = nodeOutReader.readLine();
+ System.out.println(nodeName + ".o: " + line);
+ }
+ }
+
+ /*
+ * Stop the test node process.
+ */
+ void stopNode() throws Exception {
+ System.out.println("Stopping node " + nodeName);
+ nodeIn.write('q');
+ nodeIn.flush();
+ while (true) {
+ checkNodeOut();
+ String line = nodeErrReader.readLine();
+ if (line == null) {
+ // reached end of stderr stream before shutdown completed
+ throw new IllegalStateException("Error stopping node " + nodeName);
+ }
+ System.out.println(nodeName + ".e: " + line);
+ if (line.contains("SEVERE:")) {
+ // shutdown error logged by test node process
+ throw new IllegalStateException("Node " + nodeName + " reported error: " + line);
+ }
+ if (line.contains("INFO: SCA Node is now stopped.")) {
+ // test node stopped successfully
+ System.out.println("Node " + nodeName + " stopped successfully");
+ break;
+ }
+ }
+ checkNodeOut();
+
+ // Wait for test node process to end, and check its exit value.
+ int value = nodeProcess.waitFor();
+ if (value != 0) {
+ throw new IllegalStateException("Node " + nodeName + " exit value " + value);
+ }
+ }
+
+ /*
+ * Destroy the test node process.
+ */
+ void destroyNode() {
+ if (nodeProcess != null) {
+ System.out.println("Destroying node " + nodeName);
+ try {
+ nodeProcess.destroy();
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite new file mode 100644 index 0000000000..42109ef963 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite local="true" name="cloud" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> + <include name="ns2:TripsNode" + uri="http://tuscany.apache.org/cloud" + xmlns:ns2="http://tuscany.apache.org/cloud"/> + <include name="ns2:ToursNode" + uri="http://tuscany.apache.org/cloud" + xmlns:ns2="http://tuscany.apache.org/cloud"/> + <include name="ns2:ClientNode" + uri="http://tuscany.apache.org/cloud" + xmlns:ns2="http://tuscany.apache.org/cloud"/> +</composite> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite new file mode 100644 index 0000000000..5f5fe2fc96 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://client.scatours/" + targetNamespace="http://tuscany.apache.org/cloud" + name="ClientNode"> + <component name="ClientNode"> + <t:implementation.node uri="client" composite="c:Client" /> + <service name="Node"> + <binding.sca uri="http://localhost:8081" /> + </service> + </component> +</composite> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite new file mode 100644 index 0000000000..4f75d7cba2 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://tuscanyscatours.com/" + targetNamespace="http://tuscany.apache.org/cloud" + name="ToursNode"> + <component name="ToursNode"> + <t:implementation.node uri="tuscanyscatours" composite="c:Tours" /> + <service name="Node"> + <binding.sca uri="http://localhost:8082" /> + </service> + </component> +</composite> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite new file mode 100644 index 0000000000..4254b0d6fb --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://goodvaluetrips.com/" + targetNamespace="http://tuscany.apache.org/cloud" + name="TripsNode"> + <component name="TripsNode"> + <t:implementation.node uri="goodvaluetrips" composite="c:Trips" /> + <service name="Node"> + <binding.sca uri="http://localhost:8083" /> + </service> + </component> +</composite> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite new file mode 100644 index 0000000000..4141457795 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<composite local="true" name="domain" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> + <include name="ns2:Trips" + uri="goodvaluetrips" + xmlns:ns2="http://goodvaluetrips.com/"/> + <include name="ns2:Tours" + uri="tuscanyscatours" + xmlns:ns2="http://tuscanyscatours.com/"/> + <include name="ns2:Client" + uri="client" + xmlns:ns2="http://client.scatours/"/> +</composite> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml new file mode 100644 index 0000000000..075c3b8693 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0"> + <contribution location="file:./cloud" + uri="http://tuscany.apache.org/cloud"/> + <contribution location="file:../../../../trips/target/itest-domainmgr-basic-trips.jar" + uri="goodvaluetrips"/> + <contribution location="file:../../../../tours/target/itest-domainmgr-basic-tours.jar" + uri="tuscanyscatours"/> + <contribution location="file:../../../../client/target/itest-domainmgr-basic-client.jar" + uri="client"/> +</workspace> diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/pom.xml new file mode 100644 index 0000000000..9e335b270c --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/pom.xml @@ -0,0 +1,42 @@ +<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-domainmgr-basic</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-domainmgr-basic-tours</artifactId>
+ <name>Apache Tuscany SCA iTest Domain Manager Basic Tours Contribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java new file mode 100644 index 0000000000..365a210368 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java @@ -0,0 +1,26 @@ +/*
+ * 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 com.goodvaluetrips;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Trips {
+ String checkAvailability(String trip, int people);
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java new file mode 100644 index 0000000000..9d54d46bb6 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java @@ -0,0 +1,26 @@ +/*
+ * 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 com.tuscanyscatours;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Bookings {
+ String newBooking(String trip, int people);
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java new file mode 100644 index 0000000000..29c84d2bc0 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java @@ -0,0 +1,28 @@ +/*
+ * 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 com.tuscanyscatours;
+
+import java.math.BigDecimal;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Checkout {
+ void makePayment(BigDecimal amount, String cardInfo);
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java new file mode 100644 index 0000000000..db551501e1 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java @@ -0,0 +1,40 @@ +/*
+ * 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 com.tuscanyscatours;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShoppingCart implements Checkout, Updates {
+ private static List<String> bookedTrips = new ArrayList<String>();
+
+ public void makePayment(BigDecimal amount, String cardInfo) {
+ System.out.print("Charged $" + amount + " to card " + cardInfo + " for " +
+ (bookedTrips.size() > 1 ? "trips" : "trip"));
+ for (String trip : bookedTrips){
+ System.out.print(" " + trip);
+ }
+ System.out.println();
+ bookedTrips.clear();
+ }
+ public void addTrip(String resCode) {
+ bookedTrips.add(resCode);
+ }
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java new file mode 100644 index 0000000000..e64d60545e --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java @@ -0,0 +1,35 @@ +/*
+ * 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 com.tuscanyscatours;
+
+import org.osoa.sca.annotations.Reference;
+
+public class TripBooking implements Bookings {
+ @Reference
+ protected com.goodvaluetrips.Trips mytrips;
+
+ @Reference
+ protected Updates cart;
+
+ public String newBooking(String trip, int people) {
+ String resCode = mytrips.checkAvailability(trip, people);
+ cart.addTrip(resCode);
+ return "GV" + resCode;
+ }
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java new file mode 100644 index 0000000000..e33b0399cb --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java @@ -0,0 +1,26 @@ +/*
+ * 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 com.tuscanyscatours;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Updates {
+ void addTrip(String resCode);
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..b6ef1acafa --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ +<?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:tst="http://tuscanyscatours.com/">
+ <!--export namespace="http://tuscanyscatours.com/" /-->
+ <export.java package="com.tuscanyscatours" />
+ <deployable composite="tst:Tours" />
+</contribution>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite new file mode 100644 index 0000000000..f166a1635d --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite @@ -0,0 +1,46 @@ +<?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://tuscanyscatours.com/"
+ name="Tours">
+
+ <component name="TripBooking">
+ <implementation.java class="com.tuscanyscatours.TripBooking" />
+ <service name="Bookings">
+ <interface.java interface="com.tuscanyscatours.Bookings" />
+ </service>
+ <reference name="mytrips" target="TripProvider/Trips">
+ <interface.java interface="com.goodvaluetrips.Trips" />
+ </reference>
+ <reference name="cart" target="ShoppingCart/Updates">
+ <interface.java interface="com.tuscanyscatours.Updates" />
+ </reference>
+ </component>
+
+ <component name="ShoppingCart">
+ <implementation.java class="com.tuscanyscatours.ShoppingCart"/>
+ <service name="Checkout">
+ <interface.java interface="com.tuscanyscatours.Checkout" />
+ </service>
+ <service name="Updates">
+ <interface.java interface="com.tuscanyscatours.Updates" />
+ </service>
+ </component>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/pom.xml new file mode 100644 index 0000000000..9da6cdfaa5 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/pom.xml @@ -0,0 +1,42 @@ +<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-domainmgr-basic</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-domainmgr-basic-trips</artifactId>
+ <name>Apache Tuscany SCA iTest Domain Manager Basic Trips Contribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java new file mode 100644 index 0000000000..d30046aaef --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java @@ -0,0 +1,26 @@ +/*
+ * 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 com.goodvaluetrips;
+
+public class TripProvider implements Trips {
+ public String checkAvailability(String trip, int people) {
+ // call non-SCA code to reserve trip and return booking code
+ return "6R98Y";
+ }
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java new file mode 100644 index 0000000000..365a210368 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java @@ -0,0 +1,26 @@ +/*
+ * 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 com.goodvaluetrips;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Trips {
+ String checkAvailability(String trip, int people);
+}
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..c42834be8a --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ +<?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:gvt="http://goodvaluetrips.com/">
+ <!--export namespace="http://goodvaluetrips.com/" /-->
+ <deployable composite="gvt:Trips" />
+</contribution>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite new file mode 100644 index 0000000000..ab173e5ef7 --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite @@ -0,0 +1,30 @@ +<?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://goodvaluetrips.com/"
+ name="Trips">
+
+ <component name="TripProvider">
+ <implementation.java class="com.goodvaluetrips.TripProvider" />
+ <service name="Trips">
+ <interface.java interface="com.goodvaluetrips.Trips" />
+ </service>
+ </component>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/pom.xml new file mode 100644 index 0000000000..b197b506fb --- /dev/null +++ b/branches/sca-java-1.5.1/itest/domainmgr/pom.xml @@ -0,0 +1,41 @@ +<?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.
+-->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-domainmgr</artifactId>
+ <name>Apache Tuscany Domain Manager Integration Tests</name>
+ <version>1.5.1-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
+ <modules>
+ <module>basic</module>
+ </modules>
+</project>
diff --git a/branches/sca-java-1.5.1/itest/pom.xml b/branches/sca-java-1.5.1/itest/pom.xml index c8ac1aabb5..2d0e512fc6 100644 --- a/branches/sca-java-1.5.1/itest/pom.xml +++ b/branches/sca-java-1.5.1/itest/pom.xml @@ -88,6 +88,7 @@ <module>conversations-ws</module> <module>databindings</module> <!--module>domain</module--> + <module>domainmgr</module> <module>exceptions</module> <module>exceptions-cross-binding</module> <module>exceptions-cross-binding-ws</module> diff --git a/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java index 4016d02a36..7f2bd39ddb 100644 --- a/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java +++ b/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java @@ -72,9 +72,9 @@ abstract class BindingConfigurationUtil { //Customise the binding name to make it unique // regardless of how many bindings or targets there are if ( targetComponent != null){ - cloned.setName(binding.getName() + "#" + targetComponent.getName() + "/" + serviceBinding.getName()); + cloned.setName(binding.getName() + "--" + targetComponent.getName() + ".." + serviceBinding.getName()); } else { - cloned.setName(binding.getName() + "#" + serviceBinding.getName()); + cloned.setName(binding.getName() + "--" + serviceBinding.getName()); } // Set the binding URI to the URI of the target service |