Rename old RC tag

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

9 files changed, 0 insertions, 391 deletions

diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/pom.xml b/tags/java/sca/1.5/itest/callback-composite-scope/pom.xml
deleted file mode 100644
index a275b1c11b..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/pom.xml
+++ /dev/null
@@ -1,53 +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.    
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.5</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-composite-scope</artifactId>
-    <name>Apache Tuscany SCA iTest Callback COMPOSITE Scope</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
-    </properties>    
-</project>
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
deleted file mode 100644
index a5320a6492..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
+++ /dev/null
@@ -1,34 +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.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-@Callback(HelloworldCallback.class)
-public interface Helloworld {
-    
-    String sayHello(String name);
-
-}
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
deleted file mode 100644
index c37c2f57a2..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
+++ /dev/null
@@ -1,32 +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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface HelloworldCallback {
-    
-    String whoIs(String name);
-
-}
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
deleted file mode 100644
index 0d56e440cd..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
+++ /dev/null
@@ -1,32 +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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface HelloworldDelegate {
-    
-    String sayHello(String name);
-
-}
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
deleted file mode 100644
index aa7217eb2a..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
+++ /dev/null
@@ -1,60 +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.test;
-
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * A HelloworldDelegate implementation. The service method invocation is delegated to a Helloworld service
- * reference injected into this component.
- *   
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces = {HelloworldDelegate.class, HelloworldCallback.class})
-public class HelloworldDelegateImpl implements HelloworldDelegate, HelloworldCallback {
-
-    @ComponentName
-    protected String componentName;
-
-    @Reference
-    public Helloworld helloworld;
-    
-    @Property
-    public String salutation;
-    
-    public String sayHello(String name) {
-        System.out.println(componentName+": HelloworldDelegateImpl("+this+").sayHello: " + name);
-        return helloworld.sayHello(name);
-    }
-    
-    public String whoIs(String name) {
-        System.out.println(componentName+": HelloworldDelegateImpl("+this+").whoIs: " + name);
-        if(!"world".equalsIgnoreCase(name)) {
-            return salutation;
-        } else {
-            return "";
-        }
-    }
-}
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
deleted file mode 100644
index 8107bcf42b..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
+++ /dev/null
@@ -1,46 +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.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Helloworld.class)
-@Scope("COMPOSITE")
-public class HelloworldImpl implements Helloworld {
-    
-    @ComponentName
-    protected String componentName;
-    
-    @Callback
-    public HelloworldCallback helloworldCallback;
-    
-    public String sayHello(String name) {
-        System.out.println(componentName+": HelloworldImpl("+this+").sayHello: " + name);
-        String msg = "Hello " + helloworldCallback.whoIs(name) + " " + name;
-        System.out.println("Msg: "+msg);
-        return msg;
-    }
-}
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
deleted file mode 100644
index 1593c1dc23..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
+++ /dev/null
@@ -1,42 +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.    
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://callback"
-           name="HelloworldDelegate">
-
-    <component name="HelloworldXComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.HelloworldImpl"/>
-    </component>
-    
-    <component name="HelloworldDelegateComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.HelloworldDelegateImpl"/>
-        <reference name="helloworld" target="HelloworldXComponent"/>
-        <property name="salutation">Monsieur</property>
-    </component>
-    
-    <component name="HelloworldDelegateComponent2">
-        <implementation.java class="org.apache.tuscany.sca.test.HelloworldDelegateImpl"/>
-        <reference name="helloworld" target="HelloworldXComponent"/>
-        <property name="salutation">Mr.</property>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 65b9ca501f..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-
-<!-- $Rev$ $Date$ -->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback"
-    xmlns:t="http://callback">
-    <deployable composite="t:HelloworldDelegate" />
-</contribution>
diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
deleted file mode 100644
index bd967099dc..0000000000
--- a/tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
+++ /dev/null
@@ -1,66 +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.test;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CallbackTestCase {
-
-    private static SCADomain domain;
-    private HelloworldDelegate client;
-    private HelloworldDelegate client2;
-    private HelloworldCallback callback;
-    private HelloworldCallback callback2;
-
-    @Test
-    @Ignore("TUSCANY-2823")
-    public void testCallbacks() {
-        String name = "John";
-        Assert.assertEquals("Hello "+callback.whoIs(name) + " " + name, client.sayHello(name));
-        Assert.assertEquals("Hello "+callback2.whoIs(name) + " " + name, client2.sayHello(name));
-    }
-
-    @Before    
-    public void setUp() throws Exception {
-    	if( domain == null ) {
-    		domain = SCADomain.newInstance("HelloworldDelegate.composite");
-    	}
-    	
-    	client = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent/HelloworldDelegate");
-        callback = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent/HelloworldCallback");
-        client2 = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent2/HelloworldDelegate");
-        callback2 = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent2/HelloworldCallback");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        domain.close();
-    }
-
-
-}