Correct tag name

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

6 files changed, 0 insertions, 351 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorld.java
deleted file mode 100644
index 2f519cb81d..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/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.osoa.sca.annotations.Remotable;
-
-/**
- * HelloWorld interface
- */
-@Remotable
-public interface HelloWorld {
-    String hello(String name);
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/hello/HelloWorldImpl.java
deleted file mode 100644
index c9a7560b12..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/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/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
deleted file mode 100644
index 52d96dd72d..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
+++ /dev/null
@@ -1,119 +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 junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.Test;
-
-/**
- * Test case for Node2Impl
- */
-public class Node2ImplTestCase {
-    private static String composite =
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\""
-            + " targetNamespace=\"http://sample/composite\""
-            + " xmlns:sc=\"http://sample/composite\""
-            + " name=\"HelloWorld\">"
-            + " <component name=\"HelloWorld\">"
-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"
-            + " </component>"
-            + " </composite>";
-
-    @Test
-    public void testNodeWithCompositeContent() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode2 node = factory.createSCANode("HelloWorld.composite", composite, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeContentAndNoContribution() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANode("HelloWorld.composite", composite);
-        testNode(node);
-    }    
-
-    @Test
-    public void testNodeWithoutCompositeURI() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode2 node = factory.createSCANode(null, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeURI() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = new File("target/test-classes/HelloWorld.composite").toURI().toString();
-        SCANode2 node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURI() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = "HelloWorld.composite";
-        SCANode2 node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURIAndNoContribution() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        String compositeURI = "HelloWorld.composite";
-        SCANode2 node = factory.createSCANode(compositeURI, new SCAContribution[0]);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoader() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        String compositeURI = "HelloWorld.composite";
-        SCANode2 node = factory.createSCANodeFromClassLoader(compositeURI, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoaderAndNullComposite() {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader(null, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-    
-    private void testNode(SCANode2 node) {
-        node.start();
-        HelloWorld hw = ((SCAClient)node).getService(HelloWorld.class, "HelloWorld");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-        
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
deleted file mode 100644
index d620f6b62a..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ /dev/null
@@ -1,119 +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 junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.Test;
-
-/**
- * Test case for NodeImpl
- */
-public class NodeImplTestCase {
-    private static String composite =
-        "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\""
-            + " targetNamespace=\"http://sample/composite\""
-            + " xmlns:sc=\"http://sample/composite\""
-            + " name=\"HelloWorld\">"
-            + " <component name=\"HelloWorld\">"
-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"
-            + " </component>"
-            + " </composite>";
-
-    @Test
-    public void testNodeWithCompositeContent() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode node = factory.createSCANode("HelloWorld.composite", composite, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeContentAndNoContribution() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCANode node = factory.createSCANode("HelloWorld.composite", composite);
-        testNode(node);
-    }    
-
-    @Test
-    public void testNodeWithoutCompositeURI() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        SCANode node = factory.createSCANode(null, contribution);
-        testNode(node);
-    }
-    
-    @Test
-    public void testNodeWithCompositeURI() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = new File("target/test-classes/HelloWorld.composite").toURI().toString();
-        SCANode node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURI() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCAContribution contribution = new SCAContribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = "HelloWorld.composite";
-        SCANode node = factory.createSCANode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURIAndNoContribution() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        String compositeURI = "HelloWorld.composite";
-        SCANode node = factory.createSCANode(compositeURI, new SCAContribution[0]);
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoader() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        String compositeURI = "HelloWorld.composite";
-        SCANode node = factory.createSCANodeFromClassLoader(compositeURI, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-
-    @Test
-    public void testNodeWithClassLoaderAndNullComposite() {
-        SCANodeFactory factory = new NodeFactoryImpl();
-        SCANode node = factory.createSCANodeFromClassLoader(null, HelloWorld.class.getClassLoader());
-        testNode(node);
-    }
-    
-    private void testNode(SCANode node) {
-        node.start();
-        HelloWorld hw = ((SCAClient)node).getService(HelloWorld.class, "HelloWorld");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-        
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/HelloWorld.composite b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/HelloWorld.composite
deleted file mode 100644
index 9e3299d691..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/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://www.osoa.org/xmlns/sca/1.0"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

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

-	name="HelloWorld">

-

-    <component name="HelloWorld">

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

-    </component>

-

-</composite>

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 1d37bcebe0..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-* 
-*   http://www.apache.org/licenses/LICENSE-2.0
-* 
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.    
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:sc="http://sample/composite">
-    <deployable composite="sc:HelloWorld" />
-</contribution>