Moving 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 0 insertions, 367 deletions

diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java
deleted file mode 100644
index ef99628686..0000000000
--- a/branches/sca-java-1.x/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.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite
deleted file mode 100644
index ca43648169..0000000000
--- a/branches/sca-java-1.x/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.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite
deleted file mode 100644
index e61fd4c1a3..0000000000
--- a/branches/sca-java-1.x/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.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite
deleted file mode 100644
index f03181ecc5..0000000000
--- a/branches/sca-java-1.x/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.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml
deleted file mode 100644
index 1379b37dce..0000000000
--- a/branches/sca-java-1.x/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>