Delete node-impl2 as the changes have been merged into node-impl

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

5 files changed, 0 insertions, 196 deletions

diff --git a/java/sca/modules/node-impl2/src/test/java/hello/HelloWorld.java b/java/sca/modules/node-impl2/src/test/java/hello/HelloWorld.java
deleted file mode 100644
index 4c71fd1b46..0000000000
--- a/java/sca/modules/node-impl2/src/test/java/hello/HelloWorld.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 hello;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * HelloWorld interface

- */

-@Remotable

-public interface HelloWorld {

-    String hello(String name);

-}

diff --git a/java/sca/modules/node-impl2/src/test/java/hello/HelloWorldImpl.java b/java/sca/modules/node-impl2/src/test/java/hello/HelloWorldImpl.java
deleted file mode 100644
index b3078fd646..0000000000
--- a/java/sca/modules/node-impl2/src/test/java/hello/HelloWorldImpl.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 hello;

-

-/**

- * HelloWorldImpl

- */

-public class HelloWorldImpl implements HelloWorld {

-    public String hello(String name) {

-        System.out.println("Hello: " + name);

-        return "Hello, " + name;

-    }

-}

diff --git a/java/sca/modules/node-impl2/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/java/sca/modules/node-impl2/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
deleted file mode 100644
index 5376aeb408..0000000000
--- a/java/sca/modules/node-impl2/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ /dev/null
@@ -1,82 +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 org.apache.tuscany.sca.node.impl;

-

-import hello.HelloWorld;

-

-import java.io.File;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * Test case for NodeImpl

- */

-public class NodeImplTestCase {

-    private static String composite =

-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""

-            + " targetNamespace=\"http://sample/composite\""

-            + " xmlns:sc=\"http://sample/composite\""

-            + " name=\"HelloWorld2\">"

-            + " <component name=\"HelloWorld2\">"

-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"

-            + " </component>"

-            + " </composite>";

-

-    @Test

-    public void testNodeWithCompositeContent() {

-        NodeFactory factory = new NodeFactoryImpl();

-        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());

-        String compositeURI = "HelloWorld.composite";

-//        Node node = factory.createNode(compositeURI, composite, contribution);

-//        testNode2(node);

-    }

-    

-//    @Test

-//    public void testNodeWithRelativeCompositeURI() {

-//        NodeFactory factory = new NodeFactoryImpl();

-//        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());

-//        String compositeURI = "HelloWorld.composite";

-//        Node node = factory.createNode(compositeURI, contribution);

-//        testNode(node);

-//    }

-//

-//    @Test

-//    public void testDefaultNode() {

-//        testNode(new NodeFactoryImpl().createNode());

-//    }

-//    

-//    private void testNode(Node node) {

-//        node.start();

-//        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld");

-//        Assert.assertEquals("Hello, Node", hw.hello("Node"));

-//        node.stop();

-//    }

-        

-    private void testNode2(Node node) {

-        node.start();

-        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld2");

-        Assert.assertEquals("Hello, Node", hw.hello("Node"));

-        node.stop();

-    }

-}

diff --git a/java/sca/modules/node-impl2/src/test/resources/HelloWorld.composite b/java/sca/modules/node-impl2/src/test/resources/HelloWorld.composite
deleted file mode 100644
index 27ddcb94a8..0000000000
--- a/java/sca/modules/node-impl2/src/test/resources/HelloWorld.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://docs.oasis-open.org/ns/opencsa/sca/200903"

-    xmlns:tuscany="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-	targetNamespace="http://sample/composite"

-	xmlns:sc="http://sample/composite"

-	name="HelloWorld">

-

-    <component name="HelloWorld">

-        <implementation.java class="hello.HelloWorldImpl"/>

-    </component>

-

-</composite>

diff --git a/java/sca/modules/node-impl2/src/test/resources/META-INF/sca-contribution.xml b/java/sca/modules/node-impl2/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b3e6c949ee..0000000000
--- a/java/sca/modules/node-impl2/src/test/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://docs.oasis-open.org/ns/opencsa/sca/200903" 

-              xmlns:sc="http://sample/composite">

-    <deployable composite="sc:HelloWorld" />

-</contribution>