From 539451c7e13d98504e6f3368d892406494ca711d Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 13 Nov 2009 01:23:07 +0000 Subject: Removing obsolete release candidate tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835693 13f79535-47bb-0310-9956-ffa450edef68 --- .../1.5.1-RC4/itest/domainmgr/basic/client/pom.xml | 48 --- .../src/main/java/scatours/client/TestClient.java | 47 --- .../main/resources/META-INF/sca-contribution.xml | 25 -- .../client/src/main/resources/client.composite | 29 -- .../tags/1.5.1-RC4/itest/domainmgr/basic/pom.xml | 42 --- .../itest/domainmgr/basic/runtest/pom.xml | 104 ------- .../java/domainmgr/DomainManagerBasicTestCase.java | 345 --------------------- .../src/test/resources/domain/cloud.composite | 15 - .../resources/domain/cloud/ClientNode.composite | 13 - .../resources/domain/cloud/ToursNode.composite | 13 - .../resources/domain/cloud/TripsNode.composite | 13 - .../src/test/resources/domain/domain.composite | 15 - .../src/test/resources/domain/workspace.xml | 12 - .../1.5.1-RC4/itest/domainmgr/basic/tours/pom.xml | 42 --- .../src/main/java/com/goodvaluetrips/Trips.java | 26 -- .../main/java/com/tuscanyscatours/Bookings.java | 26 -- .../main/java/com/tuscanyscatours/Checkout.java | 28 -- .../java/com/tuscanyscatours/ShoppingCart.java | 40 --- .../main/java/com/tuscanyscatours/TripBooking.java | 35 --- .../src/main/java/com/tuscanyscatours/Updates.java | 26 -- .../main/resources/META-INF/sca-contribution.xml | 25 -- .../basic/tours/src/main/resources/tours.composite | 46 --- .../1.5.1-RC4/itest/domainmgr/basic/trips/pom.xml | 42 --- .../main/java/com/goodvaluetrips/TripProvider.java | 26 -- .../src/main/java/com/goodvaluetrips/Trips.java | 26 -- .../main/resources/META-INF/sca-contribution.xml | 24 -- .../basic/trips/src/main/resources/trips.composite | 30 -- 27 files changed, 1163 deletions(-) delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/pom.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/client.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/pom.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/pom.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/pom.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/tours.composite delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/pom.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/trips.composite (limited to 'sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic') diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/pom.xml deleted file mode 100644 index 8c00b6ec06..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-domainmgr-basic - 1.5.1 - ../pom.xml - - itest-domainmgr-basic-client - Apache Tuscany SCA iTest Domain Manager Basic Client Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - - - - org.apache.tuscany.sca - itest-domainmgr-basic-tours - 1.5.1 - - - - - ${artifactId} - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java deleted file mode 100644 index 64a1487f72..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 0e2af2345d..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/client.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/client.composite deleted file mode 100644 index 05c2755114..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/client/src/main/resources/client.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/pom.xml deleted file mode 100644 index c11131edbe..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-domainmgr - 1.5.1 - ../pom.xml - - itest-domainmgr-basic - Apache Tuscany SCA iTest Domain Manager Basic - - pom - - install - - - trips - tours - client - runtest - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/pom.xml deleted file mode 100644 index 593c13fef4..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-domainmgr-basic - 1.5.1 - ../pom.xml - - itest-domainmgr-basic-runtest - Apache Tuscany SCA iTest Domain Manager Basic Run Test - - - - org.apache.tuscany.sca - itest-domainmgr-basic-trips - 1.5.1 - provided - - - - org.apache.tuscany.sca - itest-domainmgr-basic-tours - 1.5.1 - provided - - - - org.apache.tuscany.sca - itest-domainmgr-basic-client - 1.5.1 - provided - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-domain-manager - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.5.1 - test - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-surefire-plugin - 2.3.1 - - - **/*TestCase.java - - brief - false - once - -ea -Xmx256m - true - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java deleted file mode 100644 index 46e5ab03af..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite deleted file mode 100644 index 42109ef963..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite deleted file mode 100644 index 5f5fe2fc96..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite deleted file mode 100644 index 4f75d7cba2..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite deleted file mode 100644 index 4254b0d6fb..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite deleted file mode 100644 index 4141457795..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml deleted file mode 100644 index 075c3b8693..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/pom.xml deleted file mode 100644 index 2f4fb8391e..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-domainmgr-basic - 1.5.1 - ../pom.xml - - itest-domainmgr-basic-tours - Apache Tuscany SCA iTest Domain Manager Basic Tours Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - - - - - ${artifactId} - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java deleted file mode 100644 index 365a210368..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java deleted file mode 100644 index 9d54d46bb6..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java deleted file mode 100644 index 29c84d2bc0..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java deleted file mode 100644 index db551501e1..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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 bookedTrips = new ArrayList(); - - 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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java deleted file mode 100644 index e64d60545e..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java deleted file mode 100644 index e33b0399cb..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b6ef1acafa..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/tours.composite deleted file mode 100644 index f166a1635d..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/tours/src/main/resources/tours.composite +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/pom.xml deleted file mode 100644 index e5ec95b678..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-domainmgr-basic - 1.5.1 - ../pom.xml - - itest-domainmgr-basic-trips - Apache Tuscany SCA iTest Domain Manager Basic Trips Contribution - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - - - - - ${artifactId} - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java deleted file mode 100644 index d30046aaef..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java deleted file mode 100644 index 365a210368..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/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/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index c42834be8a..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/trips.composite b/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/trips.composite deleted file mode 100644 index ab173e5ef7..0000000000 --- a/sca-java-1.x/tags/1.5.1-RC4/itest/domainmgr/basic/trips/src/main/resources/trips.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - -- cgit v1.2.3