Fix TUSCANY-3169 (invalid characters in generated reference binding names) and add itest/domainmgr to verify the fix

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

8 files changed, 538 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/pom.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/pom.xml
new file mode 100644
index 0000000000..1161ff979a
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>itest-domainmgr-basic</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-domainmgr-basic-runtest</artifactId>
+    <name>Apache Tuscany SCA iTest Domain Manager Basic Run Test</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-trips</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-tours</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>itest-domainmgr-basic-client</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <!--
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        -->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                    <forkMode>once</forkMode>
+                    <argLine>-ea -Xmx256m</argLine>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
new file mode 100644
index 0000000000..1f7a3443b3
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
@@ -0,0 +1,345 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+package domainmgr;

+

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.OutputStream;

+import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCANode;

+import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.junit.Test;

+

+/**

+ * Starts the Romain Manager with a test configuration, then starts

+ * a test node that reads a deployed composite.  The domain manager

+ * should read and configure the composite and send it to the node

+ * without detecting or reporting any errors.

+ */

+public class DomainManagerBasicTestCase {

+

+    private String home = System.getProperty("java.home");

+    private String classpath = System.getProperty("java.class.path");

+    private Runtime runtime = Runtime.getRuntime();

+    private BufferedReader domainErrReader;

+    private BufferedReader domainOutReader;

+

+    @Test

+    public void test() throws Exception {

+

+        Process domainMgr = null;

+        TestNode tripsNode = null;

+        TestNode toursNode = null;

+

+        try {

+            // Start the domain manager process in its own working directory of

+            // "target/test-classes/domain/" to ensure no interference with the

+            // node processes.  The predefined domain config is copied by mvn

+            // from the "src/test/resources/domain/" directory.

+            System.out.println("Starting domain manager");

+            String[] domainCommand = {

+                "\"" + home + "/bin/java\"",

+                "-cp",

+                "\"" + classpath + "\"",

+                "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"};

+            String userdir = System.getProperty("user.dir");

+            domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/"));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the domain manager process.

+            InputStream domainErr = domainMgr.getErrorStream();

+            domainErrReader = new BufferedReader(new InputStreamReader(domainErr));

+            InputStream domainOut = domainMgr.getInputStream();

+            domainOutReader = new BufferedReader(new InputStreamReader(domainOut));

+            OutputStream domainIn = domainMgr.getOutputStream();

+

+            // Read startup log output from the domain manager process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // domain manager started successfully

+                    System.out.println("Domain manager started successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+            

+            // Start the test nodes.  Each node runs in its own "target" directory

+            // to ensure no interference with other processes.

+            tripsNode = new TestNode("TripsNode", userdir + "/../trips/target/");

+            tripsNode.start();

+            toursNode = new TestNode("ToursNode", userdir + "/../tours/target/");

+            toursNode.start();

+            

+            // Start the client node.  This runs in the current process so that

+            // we can use the SCAClient API to invoke its services.  The current

+            // working directory is "runtest" which means there is no interference

+            // other processes.

+            SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");

+            checkDomainErr();

+            checkDomainOut();

+            clientNode.start();

+

+            // Run the client test code.

+            Runnable client = ((SCAClient)clientNode).getService(Runnable.class, "TestClient/Runnable");

+            client.run();

+            tripsNode.checkNodeErr();

+            tripsNode.checkNodeOut();

+            toursNode.checkNodeErr();

+            toursNode.checkNodeOut();

+            

+            // Stop the client node.

+            clientNode.stop();

+

+            // Stop the test nodes.

+            toursNode.stopNode();

+            tripsNode.stopNode();

+

+            // Stop the domain manager by sending 'q' to stdin.

+            System.out.println("Stopping domain manager");

+            domainIn.write('q');

+            domainIn.flush();

+            while (true) {

+                checkDomainOut();

+                String line = domainErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping Domain Manager process");

+                }

+                System.out.println("DomainMgr.e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by domain manager process

+                    throw new IllegalStateException("Domain manager reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Domain Manager is now stopped.")) {

+                    // domain manager stopped successfully

+                    System.out.println("Domain manager stopped successfully");

+                    break;

+                }

+            }

+            checkDomainOut();

+

+            // Wait for domain manager process to end, and check its exit value.

+            int value = domainMgr.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Domain Manager process exit value " + value);

+            }

+

+        } catch (Exception ex) {

+

+            // Error found, so destroy the test node processes and the domain

+            // manager process so that the test case exits cleanly.

+            if (tripsNode != null) {

+                tripsNode.destroyNode();

+            }

+            if (toursNode != null) {

+                toursNode.destroyNode();

+            }

+            if (domainMgr != null) {

+                System.out.println("Destroying domain");

+                try {

+                    domainMgr.destroy();

+                } catch (Exception e) {

+                }

+            }

+

+            // Report the test error.

+            throw ex;

+        }

+    }

+

+    /*

+     * Check stderr for the domain manager process.  Called periodically

+     * to ensure that anything written to stderr is displayed in the test log

+     * and abort execution if the domain manager has logged any errors.

+     */

+    private void checkDomainErr() throws Exception {

+        while (domainErrReader.ready()) {

+            String line = domainErrReader.readLine();

+            System.out.println("DomainMgr.e: " + line);

+            if (line.contains("SEVERE:")) {

+                throw new IllegalStateException("Domain manager reported error: " + line);

+            }

+        }

+    }

+

+    /*

+     * Check stdout for the domain manager process.  Called periodically

+     * to ensure that anything written to stdout is displayed in the test log. 

+     */

+    private void checkDomainOut() throws Exception {

+        while (domainOutReader.ready()) {

+            String line = domainOutReader.readLine();

+            System.out.println("DomainMgr.o: " + line);

+        }

+    }

+

+    /*

+     * Internal class representing a test node.

+     */

+    private class TestNode {

+

+        String nodeName;

+        String nodeDir;

+        BufferedReader nodeErrReader;

+        BufferedReader nodeOutReader;

+        OutputStream nodeIn;

+        Process nodeProcess;

+

+        TestNode(String nodeName, String nodeDir) {

+            this.nodeName = nodeName;

+            this.nodeDir = nodeDir;

+        }

+

+        /*

+         * Start the test node.

+         */

+        void start() throws Exception {

+            System.out.println("Starting node " + nodeName);

+            String[] nodeCommand = {

+                "\"" + home + "/bin/java\"",

+                "-cp",

+                "\"" + classpath + "\"",

+                "org.apache.tuscany.sca.node.launcher.NodeLauncher",

+                "http://localhost:9990/node-config/" + nodeName};

+            nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir));

+

+            // Get the new process's stdin, stdout and stderr streams so that we

+            // can monitor and control execution of the test node process.

+            InputStream nodeErr = nodeProcess.getErrorStream();

+            nodeErrReader = new BufferedReader(new InputStreamReader(nodeErr));

+            InputStream nodeOut = nodeProcess.getInputStream();

+            nodeOutReader = new BufferedReader(new InputStreamReader(nodeOut));

+            nodeIn = nodeProcess.getOutputStream();

+

+            // Read startup log output from the test node process.  The log

+            // output is written to the process's stderr.

+            while (true) {

+                checkDomainErr();

+                checkDomainOut();

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before startup completed

+                    throw new IllegalStateException("Error starting node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // startup error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: Press 'q' to quit, 'r' to restart.")) {

+                    // test node started successfully

+                    System.out.println("Node " + nodeName + " started successfully");

+                    break;

+                }

+            }

+            checkDomainErr();

+            checkDomainOut();

+            checkNodeOut();

+        }

+

+        /*

+         * Check stderr for the test node process.  Called periodically to

+         * ensure that anything written to stderr is displayed in the test log

+         * and abort execution if the test node has logged any errors.

+         */

+        void checkNodeErr() throws Exception {

+            while (nodeErrReader.ready()) {

+                String line = nodeErrReader.readLine();

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+            }

+        }

+

+        /*

+         * Check stdout for the test node process.  Called periodically to

+         * ensure that anything written to stdout is displayed in the test log.

+         */

+        void checkNodeOut() throws Exception {

+            while (nodeOutReader.ready()) {

+                String line = nodeOutReader.readLine();

+                System.out.println(nodeName + ".o: " + line);

+            }

+        }

+

+        /*

+         * Stop the test node process.

+         */

+        void stopNode() throws Exception {

+            System.out.println("Stopping node " + nodeName);

+            nodeIn.write('q');

+            nodeIn.flush();

+            while (true) {

+                checkNodeOut();

+                String line = nodeErrReader.readLine();

+                if (line == null) {

+                    // reached end of stderr stream before shutdown completed

+                    throw new IllegalStateException("Error stopping node " + nodeName);

+                }

+                System.out.println(nodeName + ".e: " + line);

+                if (line.contains("SEVERE:")) {

+                    // shutdown error logged by test node process

+                    throw new IllegalStateException("Node " + nodeName + " reported error: " + line);

+                }

+                if (line.contains("INFO: SCA Node is now stopped.")) {

+                    // test node stopped successfully

+                    System.out.println("Node " + nodeName + " stopped successfully");

+                    break;

+                }

+            }

+            checkNodeOut();

+

+            // Wait for test node process to end, and check its exit value.

+            int value = nodeProcess.waitFor();

+            if (value != 0) {

+                throw new IllegalStateException("Node " + nodeName + " exit value " + value);

+            }

+        }

+

+        /*

+         * Destroy the test node process.

+         */

+        void destroyNode() {

+            if (nodeProcess != null) {

+                System.out.println("Destroying node " + nodeName);

+                try {

+                    nodeProcess.destroy();

+                } catch (Exception e) {

+                }

+            }

+        }

+    }

+

+}

diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
new file mode 100644
index 0000000000..42109ef963
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="cloud"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:TripsNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud"/>
+    <include name="ns2:ToursNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud"/>
+    <include name="ns2:ClientNode"
+           uri="http://tuscany.apache.org/cloud"
+           xmlns:ns2="http://tuscany.apache.org/cloud"/>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
new file mode 100644
index 0000000000..5f5fe2fc96
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://client.scatours/"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="ClientNode">
+    <component name="ClientNode">
+        <t:implementation.node uri="client" composite="c:Client" />
+        <service name="Node">
+            <binding.sca uri="http://localhost:8081" />
+        </service>
+    </component>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
new file mode 100644
index 0000000000..4f75d7cba2
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://tuscanyscatours.com/"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="ToursNode">
+    <component name="ToursNode">
+        <t:implementation.node uri="tuscanyscatours" composite="c:Tours" />
+        <service name="Node">
+            <binding.sca uri="http://localhost:8082" />
+        </service>
+    </component>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
new file mode 100644
index 0000000000..4254b0d6fb
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://goodvaluetrips.com/"
+           targetNamespace="http://tuscany.apache.org/cloud"
+           name="TripsNode">
+    <component name="TripsNode">
+        <t:implementation.node uri="goodvaluetrips" composite="c:Trips" />
+        <service name="Node">
+             <binding.sca uri="http://localhost:8083" />
+        </service>
+    </component>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
new file mode 100644
index 0000000000..4141457795
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite local="true" name="domain"
+           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+    <include name="ns2:Trips"
+           uri="goodvaluetrips"
+           xmlns:ns2="http://goodvaluetrips.com/"/>
+    <include name="ns2:Tours"
+           uri="tuscanyscatours"
+           xmlns:ns2="http://tuscanyscatours.com/"/>
+    <include name="ns2:Client"
+           uri="client"
+           xmlns:ns2="http://client.scatours/"/>
+</composite>
diff --git a/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
new file mode 100644
index 0000000000..075c3b8693
--- /dev/null
+++ b/branches/sca-java-1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+    <contribution location="file:./cloud"
+           uri="http://tuscany.apache.org/cloud"/>
+    <contribution location="file:../../../../trips/target/itest-domainmgr-basic-trips.jar"
+           uri="goodvaluetrips"/>
+    <contribution location="file:../../../../tours/target/itest-domainmgr-basic-tours.jar"
+           uri="tuscanyscatours"/>
+    <contribution location="file:../../../../client/target/itest-domainmgr-basic-client.jar"
+           uri="client"/>
+</workspace>