diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-13 01:25:44 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-13 01:25:44 +0000 |
| commit | b5c0d648cf147d3709eb78d98011f38e07aee723 (patch) | |
| tree | e82891caaa5b04b3551ef59d1c790fddd99d5131 /branches/sca-java-1.5.2/itest/domainmgr | |
| parent | 539451c7e13d98504e6f3368d892406494ca711d (diff) | |
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835694 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.5.2/itest/domainmgr')
89 files changed, 0 insertions, 5047 deletions
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/client/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/client/pom.xml deleted file mode 100644 index ebe5e6e71b..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/client/pom.xml +++ /dev/null @@ -1,48 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic</artifactId> - <version>1.5.2-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.2-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic-tours</artifactId> - <version>1.5.2-SNAPSHOT</version> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java deleted file mode 100644 index 64a1487f72..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java +++ /dev/null @@ -1,47 +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.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.2/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 0e2af2345d..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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: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.2/itest/domainmgr/basic/client/src/main/resources/client.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/resources/client.composite deleted file mode 100644 index 05c2755114..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/client/src/main/resources/client.composite +++ /dev/null @@ -1,29 +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://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.2/itest/domainmgr/basic/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/pom.xml deleted file mode 100644 index 9884b62626..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/pom.xml +++ /dev/null @@ -1,42 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr</artifactId> - <version>1.5.2-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.2/itest/domainmgr/basic/runtest/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/pom.xml deleted file mode 100644 index ae9312e933..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/pom.xml +++ /dev/null @@ -1,104 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic</artifactId> - <version>1.5.2-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.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic-tours</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic-client</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-manager</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-axis2</artifactId> - <version>1.5.2-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.2/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java deleted file mode 100644 index 46e5ab03af..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java +++ /dev/null @@ -1,345 +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 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.getRuntime().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.getRuntime().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.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite deleted file mode 100644 index 42109ef963..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite +++ /dev/null @@ -1,15 +0,0 @@ -<?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.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite deleted file mode 100644 index 5f5fe2fc96..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite deleted file mode 100644 index 4f75d7cba2..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite deleted file mode 100644 index 4254b0d6fb..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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.2/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite deleted file mode 100644 index 4141457795..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite +++ /dev/null @@ -1,15 +0,0 @@ -<?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.2/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml deleted file mode 100644 index 075c3b8693..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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.2/itest/domainmgr/basic/tours/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/pom.xml deleted file mode 100644 index 45eec90493..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/pom.xml +++ /dev/null @@ -1,42 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic</artifactId> - <version>1.5.2-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.2-SNAPSHOT</version> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java deleted file mode 100644 index 365a210368..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.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 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.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java deleted file mode 100644 index 9d54d46bb6..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/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 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.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java deleted file mode 100644 index 29c84d2bc0..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/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 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.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java deleted file mode 100644 index db551501e1..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java +++ /dev/null @@ -1,40 +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 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.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java deleted file mode 100644 index e64d60545e..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java +++ /dev/null @@ -1,35 +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 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.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java deleted file mode 100644 index e33b0399cb..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.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 com.tuscanyscatours;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Updates {
- void addTrip(String resCode);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b6ef1acafa..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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: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.2/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/tours.composite deleted file mode 100644 index f166a1635d..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/tours/src/main/resources/tours.composite +++ /dev/null @@ -1,46 +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://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.2/itest/domainmgr/basic/trips/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/pom.xml deleted file mode 100644 index bb80b7f8e4..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/pom.xml +++ /dev/null @@ -1,42 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-basic</artifactId> - <version>1.5.2-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.2-SNAPSHOT</version> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java deleted file mode 100644 index d30046aaef..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.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 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.2/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java b/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java deleted file mode 100644 index 365a210368..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.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 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.2/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index c42834be8a..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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:gvt="http://goodvaluetrips.com/">
- <!--export namespace="http://goodvaluetrips.com/" /-->
- <deployable composite="gvt:Trips" />
-</contribution>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/resources/trips.composite b/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/resources/trips.composite deleted file mode 100644 index ab173e5ef7..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/basic/trips/src/main/resources/trips.composite +++ /dev/null @@ -1,30 +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://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.2/itest/domainmgr/callback/client/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/pom.xml deleted file mode 100644 index 83d619a393..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/pom.xml +++ /dev/null @@ -1,51 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-callback</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-callback-client</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Callback Client</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.5.2-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java deleted file mode 100644 index 9937ea0b1e..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java +++ /dev/null @@ -1,52 +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 callbackclient;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(TestService.class)
-public class MyClientImpl implements TestService {
-
- private MyService myService;
- private static String result;
-
- @Reference
- protected void setMyService(MyService myService) {
- this.myService = myService;
- }
-
- public void runTest() {
- System.out.println("MyClientImpl.runTest");
- myService.someMethod("-> someMethod");
- }
-
- public String getResult() {
- System.out.println("MyClientImpl.getResult");
- return MyClientImpl.result;
- }
-
- public void receiveResult(String result) {
- System.out.println("MyClientImpl.receiveResult: result=" + result);
- MyClientImpl.result = result;
- }
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java deleted file mode 100644 index f22534e531..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java +++ /dev/null @@ -1,34 +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 callbackclient;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Remotable
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java deleted file mode 100644 index 412b3c7584..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java +++ /dev/null @@ -1,30 +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 callbackclient;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The callback interface for {@link MyService}.
- */
-@Remotable
-public interface MyServiceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java deleted file mode 100644 index 0ec6acf2d1..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java +++ /dev/null @@ -1,29 +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 callbackclient;
-
-/**
- * Test driver interface
- */
-public interface TestService {
-
- void runTest();
-
- String getResult();
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 1c37dd00b0..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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:cb="http://simplecallback">
- <deployable composite="cb:client" />
-</contribution>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/resources/client.composite b/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/resources/client.composite deleted file mode 100644 index 33842c3853..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/client/src/main/resources/client.composite +++ /dev/null @@ -1,29 +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://simplecallback"
- name="client">
-
- <component name="MyClientComponent">
- <implementation.java class="callbackclient.MyClientImpl" />
- <reference name="myService" target="MyServiceComponent/MyService" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/pom.xml deleted file mode 100644 index 690cd97c8b..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/pom.xml +++ /dev/null @@ -1,41 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-callback</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Callback</name> - - <packaging>pom</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build> - <modules> - <module>service</module> - <module>client</module> - <module>runtest</module> - </modules> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/pom.xml deleted file mode 100644 index b275220da1..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/pom.xml +++ /dev/null @@ -1,97 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-callback</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-callback-runtest</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Callback Run Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-callback-service</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-callback-client</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-manager</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-axis2</artifactId> - <version>1.5.2-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.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java deleted file mode 100644 index 6cd580676c..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java +++ /dev/null @@ -1,29 +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 callbacktest;
-
-/**
- * Test driver interface
- */
-public interface TestService {
-
- void runTest();
-
- String getResult();
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java deleted file mode 100644 index 71d165449d..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java +++ /dev/null @@ -1,358 +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 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;
-import callbacktest.TestService;
-
-import static org.junit.Assert.*;
-
-/**
- * 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 DomainManagerCallbackTestCase {
-
- 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 otherNode = 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.
- otherNode = new TestNode("ServiceNode", userdir + "/../service/target/");
- otherNode.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 thisNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");
- checkDomainErr();
- checkDomainOut();
- thisNode.start();
-
- // Run the client test code.
- TestService tester = ((SCAClient)thisNode).getService(TestService.class, "MyClientComponent/TestService");
- tester.runTest();
- otherNode.checkNodeErr();
- otherNode.checkNodeOut();
- System.out.println("Sleeping ...");
- Thread.sleep(4000);
- otherNode.checkNodeErr();
- otherNode.checkNodeOut();
- assertEquals("-> someMethod -> receiveResult", tester.getResult());
-
- // Stop the client node.
- thisNode.stop();
-
- // Stop the test nodes.
- otherNode.stopNode();
- otherNode = null;
-
- // 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);
- }
- domainMgr = null;
-
- } finally {
- // If the test nodes did not shut down cleanly, destroy the test
- // node processes.
- if (otherNode != null) {
- otherNode.destroyNode();
- }
-
- // If the domain manager did not shut down cleanly, destroy the
- // domain manager process.
- if (domainMgr != null) {
- System.out.println("Destroying domain");
- checkDomainErr(true);
- checkDomainOut();
- try {
- domainMgr.destroy();
- } catch (Exception e) {
- }
- }
- }
- }
-
- /*
- * 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(boolean nothrow) throws Exception {
- while (domainErrReader.ready()) {
- String line = domainErrReader.readLine();
- System.out.println("DomainMgr.e: " + line);
- if (line.contains("SEVERE:") && !nothrow) {
- throw new IllegalStateException("Domain manager reported error: " + line);
- }
- }
- }
-
- private void checkDomainErr() throws Exception {
- checkDomainErr(false);
- }
-
- /*
- * 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) {
- Thread.sleep(100);
- 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(boolean nothrow) throws Exception {
- while (nodeErrReader.ready()) {
- String line = nodeErrReader.readLine();
- System.out.println(nodeName + ".e: " + line);
- if (line.contains("SEVERE:") && !nothrow) {
- throw new IllegalStateException("Node " + nodeName + " reported error: " + line);
- }
- }
- }
-
- void checkNodeErr() throws Exception {
- checkNodeErr(false);
- }
-
- /*
- * 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() throws Exception {
- if (nodeProcess != null) {
- System.out.println("Destroying node " + nodeName);
- checkNodeErr(true);
- checkNodeOut();
- try {
- nodeProcess.destroy();
- } catch (Exception e) {
- }
- }
- }
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite deleted file mode 100644 index 4b2c664ed2..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite +++ /dev/null @@ -1,12 +0,0 @@ -<?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:ServiceNode" - 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.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite deleted file mode 100644 index 509bfafac1..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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://simplecallback" - targetNamespace="http://tuscany.apache.org/cloud" - name="ClientNode"> - <component name="ClientNode"> - <t:implementation.node uri="callback-client" composite="c:client" /> - <service name="Node"> - <binding.sca uri="http://localhost:8081" /> - </service> - </component> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite deleted file mode 100644 index 1f1f0c47c2..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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://simplecallback" - targetNamespace="http://tuscany.apache.org/cloud" - name="ServiceNode"> - <component name="ServiceNode"> - <t:implementation.node uri="callback-service" composite="c:service" /> - <service name="Node"> - <binding.sca uri="http://localhost:8082" /> - </service> - </component> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite deleted file mode 100644 index ba4d6bbf25..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite +++ /dev/null @@ -1,12 +0,0 @@ -<?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:service" - uri="callback-service" - xmlns:ns2="http://simplecallback" /> - <include name="ns2:client" - uri="callback-client" - xmlns:ns2="http://simplecallback" /> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml deleted file mode 100644 index 6a6288e39c..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?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:../../../../service/target/itest-domainmgr-callback-service.jar" - uri="callback-service" /> - <contribution location="file:../../../../client/target/itest-domainmgr-callback-client.jar" - uri="callback-client" /> -</workspace> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/service/pom.xml deleted file mode 100644 index 92612e1b31..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/pom.xml +++ /dev/null @@ -1,51 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-callback</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-callback-service</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Callback Service</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.5.2-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java deleted file mode 100644 index e5fbeb48ba..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java +++ /dev/null @@ -1,34 +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 callbackservice;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Remotable
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java deleted file mode 100644 index 896f6ca873..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java +++ /dev/null @@ -1,30 +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 callbackservice;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The callback interface for {@link MyService}.
- */
-@Remotable
-public interface MyServiceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java deleted file mode 100644 index 1afbbfe934..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java +++ /dev/null @@ -1,50 +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 callbackservice;
-
-import org.osoa.sca.annotations.Callback;
-
-/**
- * This class implements MyService and uses a callback.
- */
-public class MyServiceImpl implements MyService {
-
- private MyServiceCallback myServiceCallback;
-
- /**
- * The setter used by the runtime to set the callback reference
- * @param myServiceCallback
- */
- @Callback
- protected void setMyServiceCallback(MyServiceCallback myServiceCallback) {
- this.myServiceCallback = myServiceCallback;
- }
-
- public void someMethod(String arg) {
- System.out.println("MyServiceImpl.someMethod");
- // invoke the callback
- try {
- myServiceCallback.receiveResult(arg + " -> receiveResult");
- System.out.println("MyServiceImpl.someMethod returned from receiveResult() call");
- } catch (RuntimeException e) {
- System.out.println("MyServiceImpl.someMethod exception invoking receiveResult: " + e.toString());
- }
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 517d022013..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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:cb="http://simplecallback">
- <deployable composite="cb:service" />
-</contribution>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/resources/service.composite b/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/resources/service.composite deleted file mode 100644 index b84830795b..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/callback/service/src/main/resources/service.composite +++ /dev/null @@ -1,28 +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://simplecallback"
- name="service">
-
- <component name="MyServiceComponent">
- <implementation.java class="callbackservice.MyServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/pom.xml deleted file mode 100644 index 3a0d5e3676..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/pom.xml +++ /dev/null @@ -1,142 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-error</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-error-payment</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Error Handling Payment</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.5.2-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-transaction</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <executions> - <execution> - <id>payment</id> - <phase>generate-sources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>payment</packageName> - <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> - <wsdlFiles> - <wsdlFile>Payment.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile> - <verbose>false</verbose> - <xnocompile>true</xnocompile> - </configuration> - </execution> - <execution> - <id>payment.creditcard</id> - <phase>process-sources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>payment.creditcard</packageName> - <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> - <wsdlFiles> - <wsdlFile>CreditCardPayment.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile> - <verbose>false</verbose> - <xnocompile>true</xnocompile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java deleted file mode 100644 index 071bcf22c2..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java +++ /dev/null @@ -1,88 +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 payment;
-
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-
-import org.osoa.sca.annotations.Authentication;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import payment.creditcard.AuthorizeFault_Exception;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-import scatours.customer.Customer;
-import scatours.customer.CustomerNotFoundException;
-import scatours.customer.CustomerRegistry;
-import scatours.emailgateway.EmailGateway;
-
-/**
- * The payment implementation
- */
-@Service(Payment.class)
-@RolesAllowed({"Admin", "Billing"})
-@RunAs("Billing")
-public class PaymentImpl implements Payment {
-
- @Reference
- protected CustomerRegistry customerRegistry;
-
- @Reference
- @Authentication
- protected CreditCardPayment creditCardPayment;
-
- @Reference
- protected EmailGateway emailGateway;
-
- @Property
- protected float transactionFeeRate = 0.01f;
-
- public String makePaymentMember(String customerId, float amount) {
- Customer customer = null;
-
- try {
- customer = customerRegistry.getCustomer(customerId);
- } catch (CustomerNotFoundException ex) {
- return "Payment failed due to " + ex.getMessage();
- } catch (Throwable t) {
- return "Payment failed due to system error " + t.getMessage();
- }
-
- CreditCardDetailsType ccDetails = customer.getCreditCard();
-
- String status;
- try {
- status = creditCardPayment.authorize(ccDetails, amount);
- } catch (AuthorizeFault_Exception e) {
- status = e.getFaultInfo().getErrorCode();
- }
-
- StringBuffer body = new StringBuffer();
- body.append(customer);
- body.append("\n").append("Status: ").append(status).append("\n");
- emailGateway.sendEmail("order@tuscanyscatours.com", customer.getEmail(), "Status for your payment", body
- .toString());
-
- return status;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java deleted file mode 100644 index daf56353a3..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java +++ /dev/null @@ -1,70 +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.customer;
-
-import payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer data
- */
-public class Customer {
- private String id;
- private String email;
- private String name;
-
- private CreditCardDetailsType creditCard;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public CreditCardDetailsType getCreditCard() {
- return creditCard;
- }
-
- public void setCreditCard(CreditCardDetailsType creditCard) {
- this.creditCard = creditCard;
- }
-
- public String toString() {
- return "id: " + id + " name: " + name + " e-mail: " + email;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java deleted file mode 100644 index 89f56ce6ec..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java +++ /dev/null @@ -1,58 +0,0 @@ -/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package scatours.customer;
-
-
-public class CustomerNotFoundException extends Exception {
- private static final long serialVersionUID = -129752837478357452L;
-
- /**
- *
- */
- public CustomerNotFoundException() {
-
- }
-
- /**
- * @param message
- */
- public CustomerNotFoundException(String message) {
- super(message);
-
- }
-
- /**
- * @param cause
- */
- public CustomerNotFoundException(Throwable cause) {
- super(cause);
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public CustomerNotFoundException(String message, Throwable cause) {
- super(message, cause);
-
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java deleted file mode 100644 index cfd79a7f95..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java +++ /dev/null @@ -1,39 +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.customer;
-
-import java.util.Collection;
-
-import payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer registry interface
- */
-public interface CustomerRegistry {
- Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);
-
- boolean updateCustomer(Customer customer);
-
- Customer getCustomer(String id) throws CustomerNotFoundException;
-
- Collection<Customer> getAllCustomers();
-
- boolean deleteCustomer(String id);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java deleted file mode 100644 index e6328f062c..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java +++ /dev/null @@ -1,112 +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.customer;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardTypeType;
-import payment.creditcard.ObjectFactory;
-import payment.creditcard.PayerType;
-
-/**
- * An in-memory customer registry implementation
- */
-@Service(CustomerRegistry.class)
-@Scope("COMPOSITE")
-@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
-public class CustomerRegistryImpl implements CustomerRegistry {
- private volatile static int idGenerator = 0;
- private Map<String, Customer> customers = new HashMap<String, Customer>();
-
- @Init
- public void init() {
- // Load the customers
- ObjectFactory factory = new ObjectFactory();
- CreditCardDetailsType cc = factory.createCreditCardDetailsType();
- PayerType john = factory.createPayerType();
- john.setName("John Smith");
- cc.setCardOwner(john);
- cc.setCreditCardNumber("1111-2222-3333-4444");
- cc.setCreditCardType(CreditCardTypeType.VISA);
- cc.setCVV2("1234");
- cc.setExpMonth(1);
- cc.setExpYear(2012);
- createCustomer("John Smith", "john@xyz.com", cc);
- }
-
- @Destroy
- public void destroy() {
- // Save the customers
- }
-
- public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {
- Customer customer = new Customer();
- customer.setId("c-" + idGenerator++);
- customer.setName(name);
- customer.setEmail(email);
- customer.setCreditCard(creditCard);
- customers.put(customer.getId(), customer);
- return customer;
- }
-
- public boolean deleteCustomer(String id) {
- return customers.remove(id) != null;
- }
-
- public Collection<Customer> getAllCustomers() {
- return customers.values();
- }
-
- public Customer getCustomer(String id) throws CustomerNotFoundException {
- Customer customer = customers.get(id);
-
- if (customer == null){
- throw new CustomerNotFoundException("Customer " + id + " not found");
- }
-
- return customer;
- }
-
- public boolean updateCustomer(Customer customer) {
- Customer current = null;
- try {
- current = getCustomer(customer.getId());
- } catch (Exception ex) {
- return false;
- }
-
- current.setEmail(customer.getEmail());
- current.setName(customer.getName());
- current.setCreditCard(customer.getCreditCard());
- return true;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java deleted file mode 100644 index d360381327..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java +++ /dev/null @@ -1,30 +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.emailgateway;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * A gateway to send e-mail
- */
-@Remotable
-public interface EmailGateway {
- public boolean sendEmail(String sender, String recipient, String subject, String body);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java deleted file mode 100644 index 060c3dabda..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java +++ /dev/null @@ -1,35 +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.emailgateway;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(EmailGateway.class)
-public class EmailGatewayImpl implements EmailGateway {
-
- public boolean sendEmail(String sender, String recipient, String subject, String body) {
- System.out.println("From: " + sender);
- System.out.println("To: " + recipient);
- System.out.println("Subject: " + subject);
- System.out.println(body);
- return true;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl deleted file mode 100644 index d17497d1f6..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl +++ /dev/null @@ -1,132 +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.
--->
-<wsdl:definitions name="CreditCardPayment"
- targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
- <wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-
- <xsd:element name="authorize">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
- <xsd:element name="Amount" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="authorizeResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="Status" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="CreditCardDetailsType">
- <xsd:sequence>
- <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
- <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
- <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
- <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
- <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
- <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="CreditCardTypeType">
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="Visa" />
- <xsd:enumeration value="MasterCard" />
- <xsd:enumeration value="Discover" />
- <xsd:enumeration value="Amex" />
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="PayerType">
- <xsd:sequence>
- <xsd:element name="Name" type="xsd:string" />
- <xsd:element name="Address" type="tns:AddressType" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AddressType">
- <xsd:sequence>
- <xsd:element name="Street" type="xsd:string" />
- <xsd:element name="City" type="xsd:string" />
- <xsd:element name="State" type="xsd:string" />
- <xsd:element name="ZipCode" type="xsd:string" />
- <xsd:element name="HomePhone" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="authorizeFault">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="errorCode" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="AuthorizeRequest">
- <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="AuthorizeResponse">
- <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="AuthorizeFault">
- <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="CreditCardPayment">
- <wsdl:operation name="authorize">
- <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
- <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
- <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault> - </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="authorize">
- <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="authorizationFailure">
- <soap:fault name="authorizationFailure" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="CreditCardPaymentService">
- <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
- <soap:address location="http://localhost:8080/CreditCardPayment" />
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="CreditCardPaymentLinkType">
- <plnk:role name="forward" portType="tns:CreditCardPayment"/>
- </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 12b9852bf0..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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">
- <export.java package="payment"/>
- <deployable composite="scatours:payment" />
-</contribution>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl deleted file mode 100644 index 3885764899..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl +++ /dev/null @@ -1,83 +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.
--->
-<wsdl:definitions name="Payment"
- targetNamespace="http://www.tuscanyscatours.com/Payment/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.tuscanyscatours.com/Payment/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
- <wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.tuscanyscatours.com/Payment/"
- xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
- <xsd:complexType name="MakePaymentMemberType">
- <xsd:sequence>
- <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
- <xsd:element name="Amount" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-
- <xsd:complexType name="MakePaymentMemberResponseType">
- <xsd:sequence>
- <xsd:element name="Status" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="MakePaymentMemberRequest">
- <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="MakePaymentMemberResponse">
- <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="Payment">
- <wsdl:operation name="makePaymentMember">
- <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
- <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="PaymentBinding" type="tns:Payment">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="makePaymentMember">
- <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="PaymentService">
- <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
- <soap:address location="http://localhost:8083/Payment" />
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="PaymentLinkType">
- <plnk:role name="forward" portType="tns:Payment"/>
- </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/payment.composite b/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/payment.composite deleted file mode 100644 index 53fcefc241..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/payment/src/main/resources/payment.composite +++ /dev/null @@ -1,47 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:c="http://scatours"
- name="payment">
-
- <component name="PaymentComponent">
- <implementation.java class="payment.PaymentImpl" />
- <service name="Payment">
- <binding.ws uri="http://localhost:8081/Payment"/>
- </service>
- <reference name="customerRegistry" target="CustomerRegistryComponent"/>
- <reference name="creditCardPayment">
- <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
- </reference>
- <reference name="emailGateway" target="EmailGatewayComponent"/>
- <property name="transactionFeeRate">0.02</property>
- </component>
-
- <component name="CustomerRegistryComponent">
- <implementation.java class="scatours.customer.CustomerRegistryImpl" />
- </component>
-
- <component name="EmailGatewayComponent">
- <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
- </component>
-
-</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/error/pom.xml deleted file mode 100644 index 18eba5ceb1..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/pom.xml +++ /dev/null @@ -1,40 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-error</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Error Handling</name> - - <packaging>pom</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build> - <modules> - <module>payment</module> - <module>runtest</module> - </modules> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/pom.xml deleted file mode 100644 index 1dbb81cd5e..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/pom.xml +++ /dev/null @@ -1,104 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-error</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-error-runtest</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Error Handling Run Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-error-payment</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-transaction</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-manager</artifactId> - <version>1.5.2-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.2/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java b/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java deleted file mode 100644 index 23ffc440ab..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java +++ /dev/null @@ -1,342 +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 domainmgr;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-
-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 DomainManagerErrorTestCase {
-
- private String home = System.getProperty("java.home");
- private String classpath = System.getProperty("java.class.path");
- private Runtime runtime = Runtime.getRuntime();
- private Process domainMgr = null;
- private BufferedReader domainErrReader;
- private BufferedReader domainOutReader;
- private OutputStream domainIn;
-
- @Test
- public void test() throws Exception {
-
- TestNode paymentNode = 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));
- 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.
- paymentNode = new TestNode("PaymentNode", userdir + "/../payment/target/");
- paymentNode.start();
-
- // Stop the test nodes.
- paymentNode.stopNode();
-
- // Stop the domain manager
- stopDomain();
-
- } catch (Exception ex) {
-
- // Error found, so destroy the test node processes and the domain
- // manager process so that the test case exits cleanly.
- if (paymentNode != null) {
- paymentNode.destroyNode();
- }
- if (domainMgr != null) {
- System.out.println("Destroying domain");
- try {
- domainMgr.destroy();
- } catch (Exception e) {
- }
- }
-
- // Report the test error.
- throw ex;
- }
- }
-
- /*
- * Stop the test node process.
- */
- void stopDomain() throws Exception {
-
- // 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);
- }
- domainMgr = null;
- }
-
- /*
- * 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);
-
- // This test deliberately causes a domain manager error, so
- // don't report a test failure if the expected error shows
- // up in the domain manager log.
- if (line.contains("SEVERE: Policy Related Exception occured due to : org.apache.tuscany.sca.assembly.builder.impl.PolicyConfigurationException")) {
- continue;
- }
-
- 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.
- boolean firsterror = false;
- boolean seconderror = false;
- try {
- while (true) {
-
- // The domain manager may throw an exception and hang, so give it
- // enough time to do this before we block on the readLine() call.
- // A more robust implementation would be to read the domain manager
- // output on another thread, which could interrupt the blocked
- // readLine() call if the domain manager gets into trouble.
- Thread.sleep(100);
- 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: HTTP Server Error : org.apache.tuscany.sca.assembly.builder.impl.PolicyConfigurationException")) {
- // test node received first expected error from the domain
- System.out.println("Node " + nodeName + " received first expected error from domain");
- firsterror = true;
- continue;
- }
- if (line.contains("SEVERE: ContributionReadException occured due to : java.io.IOException: Server returned HTTP response code: 500")) {
- if (firsterror) {
- // test node received second expected error from the domain
- System.out.println("Node " + nodeName + " received second expected error from domain");
- seconderror = true;
- return;
- }
- }
- 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
- throw new IllegalStateException("Node " + nodeName + " did not receive expected error from domain");
- }
- }
- } finally {
- 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 {
- // The node did not start, so there is no need to send it a
- // "quit" command to shut it down. We just need to make sure
- // that the node process has ended cleanly.
-
- // Wait for test node process to end, and check its exit value.
- int value = nodeProcess.waitFor();
- if (value != 1) {
- 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.2/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite deleted file mode 100644 index ca43648169..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite +++ /dev/null @@ -1,9 +0,0 @@ -<?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:PaymentNode" - uri="http://tuscany.apache.org/cloud" - xmlns:ns2="http://tuscany.apache.org/cloud" /> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite deleted file mode 100644 index e61fd4c1a3..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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://scatours" - targetNamespace="http://tuscany.apache.org/cloud" - name="PaymentNode"> - <component name="PaymentNode"> - <t:implementation.node uri="scatours-payment" composite="c:payment" /> - <service name="Node"> - <binding.ws uri="http://localhost:8081" /> - </service> - </component> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite deleted file mode 100644 index f03181ecc5..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite +++ /dev/null @@ -1,9 +0,0 @@ -<?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:payment" - uri="scatours-payment" - xmlns:ns2="http://scatours" /> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml deleted file mode 100644 index 9ee266671d..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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:../../../../payment/target/itest-domainmgr-error-payment.jar" - uri="scatours-payment" /> -</workspace> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/pom.xml deleted file mode 100644 index 6ab9a9df2a..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/pom.xml +++ /dev/null @@ -1,44 +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. ---> -<project> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.5.2-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.2-SNAPSHOT</version> - - <packaging>pom</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build> - <modules> - <module>basic</module> - <module>transaction</module> - <module>error</module> - <module>callback</module> - </modules> -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/pom.xml deleted file mode 100644 index c9623111c8..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/pom.xml +++ /dev/null @@ -1,142 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-transaction</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-transaction-payment</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Transaction Payment</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.5.2-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-transaction</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <executions> - <execution> - <id>payment</id> - <phase>generate-sources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>payment</packageName> - <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> - <wsdlFiles> - <wsdlFile>Payment.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile> - <verbose>false</verbose> - <xnocompile>true</xnocompile> - </configuration> - </execution> - <execution> - <id>payment.creditcard</id> - <phase>process-sources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>payment.creditcard</packageName> - <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> - <wsdlFiles> - <wsdlFile>CreditCardPayment.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile> - <verbose>false</verbose> - <xnocompile>true</xnocompile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java deleted file mode 100644 index 071bcf22c2..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java +++ /dev/null @@ -1,88 +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 payment;
-
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-
-import org.osoa.sca.annotations.Authentication;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import payment.creditcard.AuthorizeFault_Exception;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-import scatours.customer.Customer;
-import scatours.customer.CustomerNotFoundException;
-import scatours.customer.CustomerRegistry;
-import scatours.emailgateway.EmailGateway;
-
-/**
- * The payment implementation
- */
-@Service(Payment.class)
-@RolesAllowed({"Admin", "Billing"})
-@RunAs("Billing")
-public class PaymentImpl implements Payment {
-
- @Reference
- protected CustomerRegistry customerRegistry;
-
- @Reference
- @Authentication
- protected CreditCardPayment creditCardPayment;
-
- @Reference
- protected EmailGateway emailGateway;
-
- @Property
- protected float transactionFeeRate = 0.01f;
-
- public String makePaymentMember(String customerId, float amount) {
- Customer customer = null;
-
- try {
- customer = customerRegistry.getCustomer(customerId);
- } catch (CustomerNotFoundException ex) {
- return "Payment failed due to " + ex.getMessage();
- } catch (Throwable t) {
- return "Payment failed due to system error " + t.getMessage();
- }
-
- CreditCardDetailsType ccDetails = customer.getCreditCard();
-
- String status;
- try {
- status = creditCardPayment.authorize(ccDetails, amount);
- } catch (AuthorizeFault_Exception e) {
- status = e.getFaultInfo().getErrorCode();
- }
-
- StringBuffer body = new StringBuffer();
- body.append(customer);
- body.append("\n").append("Status: ").append(status).append("\n");
- emailGateway.sendEmail("order@tuscanyscatours.com", customer.getEmail(), "Status for your payment", body
- .toString());
-
- return status;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java deleted file mode 100644 index daf56353a3..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java +++ /dev/null @@ -1,70 +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.customer;
-
-import payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer data
- */
-public class Customer {
- private String id;
- private String email;
- private String name;
-
- private CreditCardDetailsType creditCard;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public CreditCardDetailsType getCreditCard() {
- return creditCard;
- }
-
- public void setCreditCard(CreditCardDetailsType creditCard) {
- this.creditCard = creditCard;
- }
-
- public String toString() {
- return "id: " + id + " name: " + name + " e-mail: " + email;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java deleted file mode 100644 index 89f56ce6ec..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java +++ /dev/null @@ -1,58 +0,0 @@ -/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package scatours.customer;
-
-
-public class CustomerNotFoundException extends Exception {
- private static final long serialVersionUID = -129752837478357452L;
-
- /**
- *
- */
- public CustomerNotFoundException() {
-
- }
-
- /**
- * @param message
- */
- public CustomerNotFoundException(String message) {
- super(message);
-
- }
-
- /**
- * @param cause
- */
- public CustomerNotFoundException(Throwable cause) {
- super(cause);
-
- }
-
- /**
- * @param message
- * @param cause
- */
- public CustomerNotFoundException(String message, Throwable cause) {
- super(message, cause);
-
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java deleted file mode 100644 index cfd79a7f95..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java +++ /dev/null @@ -1,39 +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.customer;
-
-import java.util.Collection;
-
-import payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer registry interface
- */
-public interface CustomerRegistry {
- Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);
-
- boolean updateCustomer(Customer customer);
-
- Customer getCustomer(String id) throws CustomerNotFoundException;
-
- Collection<Customer> getAllCustomers();
-
- boolean deleteCustomer(String id);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java deleted file mode 100644 index e6328f062c..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java +++ /dev/null @@ -1,112 +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.customer;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardTypeType;
-import payment.creditcard.ObjectFactory;
-import payment.creditcard.PayerType;
-
-/**
- * An in-memory customer registry implementation
- */
-@Service(CustomerRegistry.class)
-@Scope("COMPOSITE")
-@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
-public class CustomerRegistryImpl implements CustomerRegistry {
- private volatile static int idGenerator = 0;
- private Map<String, Customer> customers = new HashMap<String, Customer>();
-
- @Init
- public void init() {
- // Load the customers
- ObjectFactory factory = new ObjectFactory();
- CreditCardDetailsType cc = factory.createCreditCardDetailsType();
- PayerType john = factory.createPayerType();
- john.setName("John Smith");
- cc.setCardOwner(john);
- cc.setCreditCardNumber("1111-2222-3333-4444");
- cc.setCreditCardType(CreditCardTypeType.VISA);
- cc.setCVV2("1234");
- cc.setExpMonth(1);
- cc.setExpYear(2012);
- createCustomer("John Smith", "john@xyz.com", cc);
- }
-
- @Destroy
- public void destroy() {
- // Save the customers
- }
-
- public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {
- Customer customer = new Customer();
- customer.setId("c-" + idGenerator++);
- customer.setName(name);
- customer.setEmail(email);
- customer.setCreditCard(creditCard);
- customers.put(customer.getId(), customer);
- return customer;
- }
-
- public boolean deleteCustomer(String id) {
- return customers.remove(id) != null;
- }
-
- public Collection<Customer> getAllCustomers() {
- return customers.values();
- }
-
- public Customer getCustomer(String id) throws CustomerNotFoundException {
- Customer customer = customers.get(id);
-
- if (customer == null){
- throw new CustomerNotFoundException("Customer " + id + " not found");
- }
-
- return customer;
- }
-
- public boolean updateCustomer(Customer customer) {
- Customer current = null;
- try {
- current = getCustomer(customer.getId());
- } catch (Exception ex) {
- return false;
- }
-
- current.setEmail(customer.getEmail());
- current.setName(customer.getName());
- current.setCreditCard(customer.getCreditCard());
- return true;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java deleted file mode 100644 index d360381327..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java +++ /dev/null @@ -1,30 +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.emailgateway;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * A gateway to send e-mail
- */
-@Remotable
-public interface EmailGateway {
- public boolean sendEmail(String sender, String recipient, String subject, String body);
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java deleted file mode 100644 index 060c3dabda..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java +++ /dev/null @@ -1,35 +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.emailgateway;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(EmailGateway.class)
-public class EmailGatewayImpl implements EmailGateway {
-
- public boolean sendEmail(String sender, String recipient, String subject, String body) {
- System.out.println("From: " + sender);
- System.out.println("To: " + recipient);
- System.out.println("Subject: " + subject);
- System.out.println(body);
- return true;
- }
-
-}
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl deleted file mode 100644 index d17497d1f6..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl +++ /dev/null @@ -1,132 +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.
--->
-<wsdl:definitions name="CreditCardPayment"
- targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
- <wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
- xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-
- <xsd:element name="authorize">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
- <xsd:element name="Amount" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="authorizeResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="Status" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="CreditCardDetailsType">
- <xsd:sequence>
- <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
- <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
- <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
- <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
- <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
- <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="CreditCardTypeType">
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="Visa" />
- <xsd:enumeration value="MasterCard" />
- <xsd:enumeration value="Discover" />
- <xsd:enumeration value="Amex" />
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="PayerType">
- <xsd:sequence>
- <xsd:element name="Name" type="xsd:string" />
- <xsd:element name="Address" type="tns:AddressType" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AddressType">
- <xsd:sequence>
- <xsd:element name="Street" type="xsd:string" />
- <xsd:element name="City" type="xsd:string" />
- <xsd:element name="State" type="xsd:string" />
- <xsd:element name="ZipCode" type="xsd:string" />
- <xsd:element name="HomePhone" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="authorizeFault">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="errorCode" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="AuthorizeRequest">
- <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="AuthorizeResponse">
- <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="AuthorizeFault">
- <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="CreditCardPayment">
- <wsdl:operation name="authorize">
- <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
- <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
- <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault> - </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="authorize">
- <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- <wsdl:fault name="authorizationFailure">
- <soap:fault name="authorizationFailure" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="CreditCardPaymentService">
- <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
- <soap:address location="http://localhost:8080/CreditCardPayment" />
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="CreditCardPaymentLinkType">
- <plnk:role name="forward" portType="tns:CreditCardPayment"/>
- </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 12b9852bf0..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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">
- <export.java package="payment"/>
- <deployable composite="scatours:payment" />
-</contribution>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl deleted file mode 100644 index 3885764899..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl +++ /dev/null @@ -1,83 +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.
--->
-<wsdl:definitions name="Payment"
- targetNamespace="http://www.tuscanyscatours.com/Payment/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.tuscanyscatours.com/Payment/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
- <wsdl:types>
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.tuscanyscatours.com/Payment/"
- xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
- <xsd:complexType name="MakePaymentMemberType">
- <xsd:sequence>
- <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
- <xsd:element name="Amount" type="xsd:float"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-
- <xsd:complexType name="MakePaymentMemberResponseType">
- <xsd:sequence>
- <xsd:element name="Status" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="MakePaymentMemberRequest">
- <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="MakePaymentMemberResponse">
- <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="Payment">
- <wsdl:operation name="makePaymentMember">
- <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
- <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="PaymentBinding" type="tns:Payment">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="makePaymentMember">
- <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="PaymentService">
- <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
- <soap:address location="http://localhost:8083/Payment" />
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="PaymentLinkType">
- <plnk:role name="forward" portType="tns:Payment"/>
- </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml deleted file mode 100644 index 9060e75ed2..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
- <!-- Policy Intents Defined by the SCA Runtime -->
- <intent name="authorization" constrains="sca:implementation"/>
- <intent name="managedTransaction" constrains="sca:implementation"/>
- <intent name="managedTransaction.global"/>
-
- <!-- Policy intents -->
- <policySet name="ps1" provides="sca:authorization" appliesTo="sca:implementation.java"/>
-
- <policySet name="ps2" provides="sca:managedTransaction.global" appliesTo="sca:implementation.java"/>
-
-</definitions>
diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/payment.composite b/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/payment.composite deleted file mode 100644 index 53fcefc241..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/payment/src/main/resources/payment.composite +++ /dev/null @@ -1,47 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:c="http://scatours"
- name="payment">
-
- <component name="PaymentComponent">
- <implementation.java class="payment.PaymentImpl" />
- <service name="Payment">
- <binding.ws uri="http://localhost:8081/Payment"/>
- </service>
- <reference name="customerRegistry" target="CustomerRegistryComponent"/>
- <reference name="creditCardPayment">
- <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
- </reference>
- <reference name="emailGateway" target="EmailGatewayComponent"/>
- <property name="transactionFeeRate">0.02</property>
- </component>
-
- <component name="CustomerRegistryComponent">
- <implementation.java class="scatours.customer.CustomerRegistryImpl" />
- </component>
-
- <component name="EmailGatewayComponent">
- <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
- </component>
-
-</composite>
\ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/transaction/pom.xml deleted file mode 100644 index a61311e652..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/pom.xml +++ /dev/null @@ -1,40 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-transaction</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Transaction</name> - - <packaging>pom</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build> - <modules> - <module>payment</module> - <module>runtest</module> - </modules> - -</project> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/pom.xml b/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/pom.xml deleted file mode 100644 index bd59f24b6f..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/pom.xml +++ /dev/null @@ -1,104 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-transaction</artifactId> - <version>1.5.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domainmgr-transaction-runtest</artifactId> - <name>Apache Tuscany SCA iTest Domain Manager Transaction Run Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-domainmgr-transaction-payment</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-transaction</artifactId> - <version>1.5.2-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-manager</artifactId> - <version>1.5.2-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.2/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java deleted file mode 100644 index ef99628686..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java +++ /dev/null @@ -1,328 +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 domainmgr;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-
-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 DomainManagerTransactionTestCase {
-
- private String home = System.getProperty("java.home");
- private String classpath = System.getProperty("java.class.path");
- private Runtime runtime = Runtime.getRuntime();
- private Process domainMgr = null;
- private BufferedReader domainErrReader;
- private BufferedReader domainOutReader;
- private OutputStream domainIn;
-
- @Test
- public void test() throws Exception {
-
- TestNode paymentNode = 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));
- 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.
- paymentNode = new TestNode("PaymentNode", userdir + "/../payment/target/");
- paymentNode.start();
-
- // Stop the test nodes.
- paymentNode.stopNode();
-
- // Stop the domain manager
- stopDomain();
-
- } catch (Exception ex) {
-
- // Error found, so destroy the test node processes and the domain
- // manager process so that the test case exits cleanly.
- if (paymentNode != null) {
- paymentNode.destroyNode();
- }
- if (domainMgr != null) {
- System.out.println("Destroying domain");
- try {
- domainMgr.destroy();
- } catch (Exception e) {
- }
- }
-
- // Report the test error.
- throw ex;
- }
- }
-
- /*
- * Stop the test node process.
- */
- void stopDomain() throws Exception {
-
- // 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);
- }
- domainMgr = null;
- }
-
- /*
- * 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.
- try {
- while (true) {
- 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");
- return;
- }
- }
- } finally {
- 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.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite deleted file mode 100644 index ca43648169..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite +++ /dev/null @@ -1,9 +0,0 @@ -<?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:PaymentNode" - uri="http://tuscany.apache.org/cloud" - xmlns:ns2="http://tuscany.apache.org/cloud" /> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite deleted file mode 100644 index e61fd4c1a3..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite +++ /dev/null @@ -1,13 +0,0 @@ -<?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://scatours" - targetNamespace="http://tuscany.apache.org/cloud" - name="PaymentNode"> - <component name="PaymentNode"> - <t:implementation.node uri="scatours-payment" composite="c:payment" /> - <service name="Node"> - <binding.ws uri="http://localhost:8081" /> - </service> - </component> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite deleted file mode 100644 index f03181ecc5..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite +++ /dev/null @@ -1,9 +0,0 @@ -<?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:payment" - uri="scatours-payment" - xmlns:ns2="http://scatours" /> -</composite> diff --git a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml deleted file mode 100644 index 1379b37dce..0000000000 --- a/branches/sca-java-1.5.2/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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:../../../../payment/target/itest-domainmgr-transaction-payment.jar" - uri="scatours-payment" /> -</workspace> |