summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/pom.xml57
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java25
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java38
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite29
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java63
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF20
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/pom.xml109
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java25
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java38
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite29
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java65
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/pom.xml64
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java28
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java38
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite29
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java115
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/pom.xml46
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldService.java25
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java44
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java28
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/Helloworld.composite29
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java129
26 files changed, 0 insertions, 1165 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/pom.xml
deleted file mode 100644
index d82d2cb38b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/pom.xml
+++ /dev/null
@@ -1,57 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-scaclient-api-jse-osgi</artifactId>
- <name>Apache Tuscany SCA iTest SCAClient API JSE and OSGI</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
deleted file mode 100644
index 1c7edaefb6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 itest;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
deleted file mode 100644
index 7793bdd544..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,38 +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 itest;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@EagerInit
-@Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- @Init
- public void init() {
- System.out.println("Init - " + sayHello("world"));
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
deleted file mode 100644
index 2d5ae6a57c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
+++ /dev/null
@@ -1,29 +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/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="itest.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 56e127b539..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/main/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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Helloworld"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
deleted file mode 100644
index 8bf162dfd9..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
+++ /dev/null
@@ -1,63 +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 test.scaclient;
-
-import java.net.URI;
-
-import itest.HelloworldService;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- *
- * @version $Rev$ $Date$
- */
-public class SCAClientTestCase extends TestCase {
-
- private static NodeLauncher launcher;
- private static Node node;
-
- @Override
- protected void setUp() throws Exception {
- launcher = NodeLauncher.newInstance();
- node = launcher.createNode(null, new Contribution("test", "./target/classes"));
- System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
- node.start();
- }
-
- public void testInvoke() throws Exception {
- // At the moment the SCAClientFactory assumes that only one domain is active
- // in a JVM. So we pass in null for the domain name and get what we're given
- HelloworldService service =
- SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Override
- protected void tearDown() throws Exception {
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
deleted file mode 100644
index ae6704f97d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Private-Package: helloworld;version="2.0.0"
-Tool: Bnd-0.0.255
-Bundle-Name: Apache Tuscany SCA SCAClient API OSGi itest
-Created-By: 1.6.0_07 (Sun Microsystems Inc.)
-Bundle-Vendor: The Apache Software Foundation
-Eclipse-LazyStart: false
-Bundle-Version: 2.0.0
-Bnd-LastModified: 1223949424781
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA SCAClient API OSGi itest
-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",
- org.oasisopen.sca;version="2.0.0",
- org.oasisopen.sca.annotation;version="2.0.0",
- org.oasisopen.sca.client;version="2.0.0",
- org.osgi.framework;version="1.4"
-Bundle-SymbolicName: itest-scaclient-apo-osgi
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/pom.xml
deleted file mode 100644
index 5d80dca4a6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/pom.xml
+++ /dev/null
@@ -1,109 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-scaclient-api-osgi</artifactId>
- <name>Apache Tuscany SCA iTest SCAClient API OSGi</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-api</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <buildcommands>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- </buildcommands>
- <projectnatures>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- </projectnatures>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
- </classpathContainer>
- </classpathContainers>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>osgi-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration></configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
deleted file mode 100644
index 1c7edaefb6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 itest;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
deleted file mode 100644
index 3eecc59439..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,38 +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 itest;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@EagerInit
-@Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- @Init
- public void init() {
- System.out.println("Result from Init = " + sayHello("world"));
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
deleted file mode 100644
index 2d5ae6a57c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
+++ /dev/null
@@ -1,29 +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/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="itest.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 56e127b539..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/main/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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Helloworld"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
deleted file mode 100644
index 431b2995aa..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
+++ /dev/null
@@ -1,65 +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 test.scaclient;
-
-import java.net.URI;
-
-import itest.HelloworldService;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- *
- * @version $Rev$ $Date$
- */
-public class SCAClientTestCase extends TestCase {
-
- private static Node node;
-
- @Override
- protected void setUp() throws Exception {
- String location = ContributionLocationHelper.getContributionLocation(HelloworldService.class);
- node = NodeFactory.getInstance().createNode("Helloworld.composite", new Contribution("test", "./target/classes"));
- System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
- node.start();
- }
-
- public void testInvoke() throws NoSuchServiceException, NoSuchDomainException {
- HelloworldService service =
- SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
- String result = service.sayHello("petra");
- assertEquals("Hello petra", result);
- System.out.println("Result from SCAClient call = " + result);
- }
-
- @Override
- protected void tearDown() throws Exception {
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/pom.xml
deleted file mode 100644
index 68ab2adc81..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/pom.xml
+++ /dev/null
@@ -1,64 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-scaclient-api-remote</artifactId>
- <name>Apache Tuscany SCA iTest SCAClient API with Hazelcast client</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
deleted file mode 100644
index f97d2c3a83..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
+++ /dev/null
@@ -1,28 +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 itest;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
deleted file mode 100644
index a04b40279f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,38 +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 itest;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@EagerInit
-@Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- @Init
- public void init() {
- System.out.println(sayHello("world"));
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
deleted file mode 100644
index d37c93857d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
+++ /dev/null
@@ -1,29 +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/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="itest.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e178823296..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/main/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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Helloworld"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
deleted file mode 100644
index 0ae70d6c3f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
+++ /dev/null
@@ -1,115 +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 test.scaclient;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import itest.HelloworldService;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- *
- * @version $Rev: 904064 $ $Date: 2010-01-28 12:31:36 +0000 (Thu, 28 Jan 2010) $
- */
-public class SCAClientTestCase {
-
- private Node node;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- @Test
- public void testDefault() throws Exception {
-
- node = NodeFactory.newInstance().createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Test
- public void testURIconfig() throws Exception {
-
- node = NodeFactory.newInstance("uri:somedomain").createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("somedomain")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- try {
- service = SCAClientFactory.newInstance(URI.create("nosuchdomain")).getService(HelloworldService.class, "HelloworldComponent");
- service.sayHello("petra");
- fail();
- } catch (Exception e) {
- if (!(e.getCause() instanceof NoSuchDomainException)) {
- throw e;
- }
- }
- }
-
- @Test
- public void testExplicit() throws Exception {
- node = NodeFactory.newInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Test
- public void testExplicitRemote() throws Exception {
- node = NodeFactory.newInstance("uri:myFooDomain?bind=127.0.0.1:14821").createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("uri:myFooDomain?wka=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Test
- public void testExplicitRemote2() throws Exception {
- node = NodeFactory.newInstance("uri:myFooDomain?bind=127.0.0.1:14821").createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("uri:myFooDomain?wka=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/pom.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/pom.xml
deleted file mode 100644
index fa2f86048f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/pom.xml
+++ /dev/null
@@ -1,46 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-scaclient-api</artifactId>
- <name>Apache Tuscany SCA iTest SCAClient API</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-Beta1-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldService.java
deleted file mode 100644
index 1c7edaefb6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 itest;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
deleted file mode 100644
index 5af221313e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,44 +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 itest;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@EagerInit
-@Scope("COMPOSITE")
-@Service({HelloworldService.class, RemoteHelloworldService.class})
-public class HelloworldServiceImpl implements HelloworldService, RemoteHelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- public String sayHelloRemote(String name) {
- return "Hello " + name;
- }
-
- @Init
- public void init() {
- System.out.println(sayHello("world"));
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
deleted file mode 100644
index a8640bf484..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
+++ /dev/null
@@ -1,28 +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 itest;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface RemoteHelloworldService {
-
- String sayHelloRemote(String name);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/Helloworld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/Helloworld.composite
deleted file mode 100644
index 2d5ae6a57c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/Helloworld.composite
+++ /dev/null
@@ -1,29 +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/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="itest.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 56e127b539..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/main/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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Helloworld"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
deleted file mode 100644
index 6a639661cf..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ /dev/null
@@ -1,129 +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 test.scaclient;
-
-import itest.HelloworldService;
-import itest.RemoteHelloworldService;
-
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- *
- * @version $Rev$ $Date$
- */
-public class SCAClientTestCase extends TestCase {
-
- private Node node;
-
- @Test
- public void testDefault() throws Exception {
-
- node = NodeFactory.getInstance().createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("default"));
- HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService");
- assertEquals("Hello petra", service.sayHello("petra"));
-
- RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService");
- assertEquals("Hello petra", remoteService.sayHelloRemote("petra"));
-
- }
-
- @Test
- public void testExplicit() throws Exception {
- node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
- node.start();
-
- SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain"));
- HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService");
- assertEquals("Hello petra", service.sayHello("petra"));
-
- RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService");
- assertEquals("Hello petra", remoteService.sayHelloRemote("petra"));
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
-// @Test
-// public void testWithoutServiceName() throws Exception {
-// node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
-// node.start();
-//
-// SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain"));
-// HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent");
-// assertEquals("Hello petra", service.sayHello("petra"));
-// }
-
- @Test
- public void testWithBadServiceName() throws Exception {
- node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
- node.start();
-
- SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain"));
- try {
- clientFactory.getService(HelloworldService.class, "HelloworldComponent/foo");
- fail();
- } catch (NoSuchServiceException e) {
- // expected
- }
- }
-
- @Test
- public void testWithBadDomainName() throws Exception {
- node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
- node.start();
-
- SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("someBadDomainName"));
- try {
- HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/foo");
- service.sayHello("petra");
- fail();
- } catch (Exception e) {
- if (!(e.getCause() instanceof NoSuchDomainException)) {
- throw e;
- }
- }
- }
-
- // @Test @Ignore
-// public void testHTTPURI() throws Exception {
-// node = NodeFactory.getInstance().createNode(URI.create("http://defaultDomain"), new String[] {"target/classes"});
-// node.start();
-//
-// HelloworldService service = SCAClientFactory.newInstance(URI.create("http://defaultDomain")).getService(HelloworldService.class, "HelloworldComponent");
-// assertEquals("Hello petra", service.sayHello("petra"));
-// }
-
- @Override
- protected void tearDown() throws Exception {
- node.stop();
- }
-
-}