summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-04-16 07:21:35 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-04-16 07:21:35 +0000
commitdf85b4ebd77c4c6449739e99e44e989ffaf19e0a (patch)
treeebe2a6bcfcabe8173a14fc8eb99c4b4173c4b98c /sca-java-2.x
parenta7a58f737995ba16c6dc3e2c7f232d5fd3d3daf2 (diff)
Remove import-export tests, doesn't look like Tuscany will likely supprt this properly across nodes without huge changes
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@934701 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
-rw-r--r--sca-java-2.x/trunk/itest/import-export/client/pom.xml45
-rw-r--r--sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java62
-rw-r--r--sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java26
-rw-r--r--sca-java-2.x/trunk/itest/import-export/client/src/main/resources/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite29
-rw-r--r--sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml39
-rw-r--r--sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java40
-rw-r--r--sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java41
-rw-r--r--sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java31
-rw-r--r--sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/trunk/itest/import-export/pom.xml39
-rw-r--r--sca-java-2.x/trunk/itest/import-export/service/pom.xml45
-rw-r--r--sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java42
-rw-r--r--sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml24
-rw-r--r--sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite28
-rw-r--r--sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml77
-rw-r--r--sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java83
-rw-r--r--sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java78
-rw-r--r--sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java55
-rw-r--r--sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java78
20 files changed, 0 insertions, 909 deletions
diff --git a/sca-java-2.x/trunk/itest/import-export/client/pom.xml b/sca-java-2.x/trunk/itest/import-export/client/pom.xml
deleted file mode 100644
index 350ce2a755..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/client/pom.xml
+++ /dev/null
@@ -1,45 +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-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-import-export-client</artifactId>
- <name>Apache Tuscany SCA iTest Import Export Client</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-import-export-iface-export</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
deleted file mode 100644
index ee5e346bcf..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
+++ /dev/null
@@ -1,62 +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.test;
-
-import itest.iface.NonSimpleType;
-import itest.iface.SomeException;
-import itest.iface.TestService;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(TestIt.class)
-public class TestClientImpl implements TestIt, TestService {
-
- @Reference
- protected TestService service;
-
- public TestClientImpl() {
- }
-
- public String sayHello(String name) {
- return service.sayHello(name);
- }
-
- public NonSimpleType testCT(NonSimpleType name) throws SomeException {
- System.out.println(name.getClass().getClassLoader());
- return service.testCT(name);
- }
-
- public boolean testIt() {
- try {
- System.out.println(sayHello("petra"));
- System.out.println(testCT(new NonSimpleType("beate")).getName());
- try {
- System.out.println(testCT(new NonSimpleType("bang")).getName());
- } catch (SomeException e) {
- // expected
- }
- return true;
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
deleted file mode 100644
index 5623be9d9a..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
+++ /dev/null
@@ -1,26 +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.test;
-
-public interface TestIt {
-
- boolean testIt();
-
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 903995e557..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/client/src/main/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/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:TestService"/>
- <import.java package="itest.iface"/>
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite b/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite
deleted file mode 100644
index b4f23b0818..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.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"
- targetNamespace="http://itest"
- name="TestService">
-
- <component name="TestClient">
- <implementation.java class="itest.test.TestClientImpl"/>
- <reference name="service" target="TestService" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml b/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml
deleted file mode 100644
index 2b764cdb0f..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml
+++ /dev/null
@@ -1,39 +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-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-import-export-iface-export</artifactId>
- <name>Apache Tuscany SCA iTest Import Export Test Iface Export</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java
deleted file mode 100644
index 6d75a43b2b..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java
+++ /dev/null
@@ -1,40 +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.iface;
-
-public class NonSimpleType {
-
- protected String name;
-
- public NonSimpleType() {
- }
-
- public NonSimpleType(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java
deleted file mode 100644
index 1cbeee7020..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java
+++ /dev/null
@@ -1,41 +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.iface;
-
-public class SomeException extends Exception {
-
- public SomeException() {
- super();
- }
-
- public SomeException(String msg) {
- super(msg);
- }
-
-
- public SomeException(Exception cause) {
- super(cause);
- }
-
- public SomeException(String msg, Exception cause) {
- super(msg, cause);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java
deleted file mode 100644
index 4aeab0ffda..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java
+++ /dev/null
@@ -1,31 +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.iface;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface TestService {
-
- String sayHello(String name);
-
- NonSimpleType testCT(NonSimpleType name) throws SomeException;
-
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 5f1cc96bef..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/iface-export/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">
- <export.java package="itest.iface"/>
-</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/import-export/pom.xml b/sca-java-2.x/trunk/itest/import-export/pom.xml
deleted file mode 100644
index b9f2b79970..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/pom.xml
+++ /dev/null
@@ -1,39 +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-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <artifactId>itest-import-export</artifactId>
- <name>Apache Tuscany SCA iTest Import Export</name>
-
- <modules>
- <module>iface-export</module>
- <module>service</module>
- <module>client</module>
- <module>test-export-local</module>
- </modules>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/service/pom.xml b/sca-java-2.x/trunk/itest/import-export/service/pom.xml
deleted file mode 100644
index 190699fe97..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/service/pom.xml
+++ /dev/null
@@ -1,45 +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-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-import-export-service</artifactId>
- <name>Apache Tuscany SCA iTest import Export Service</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-import-export-iface-export</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java b/sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java
deleted file mode 100644
index 3cc185d085..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java
+++ /dev/null
@@ -1,42 +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.test;
-
-import itest.iface.NonSimpleType;
-import itest.iface.SomeException;
-import itest.iface.TestService;
-
-public class TestServiceImpl implements TestService {
-
- public TestServiceImpl() {
- }
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- public NonSimpleType testCT(NonSimpleType name) throws SomeException {
- if ("bang".equals(name.getName())) {
- throw new SomeException("bang");
- }
-
- return new NonSimpleType("Hello " + name.getName());
- }
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 903995e557..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/service/src/main/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/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:TestService"/>
- <import.java package="itest.iface"/>
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite b/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite
deleted file mode 100644
index 5bf1f666e3..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite
+++ /dev/null
@@ -1,28 +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"
- targetNamespace="http://itest"
- name="TestService">
-
- <component name="TestService">
- <implementation.java class="itest.test.TestServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml b/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml
deleted file mode 100644
index 47d3c1fea4..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml
+++ /dev/null
@@ -1,77 +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-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-import-export-test-export-local</artifactId>
- <name>Apache Tuscany SCA iTest Import Export Test Export Local</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-import-export-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <forkMode>once</forkMode>
- <argLine>-ea -Xmx256m</argLine>
- <parallel>off</parallel>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java
deleted file mode 100644
index 77f0319237..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java
+++ /dev/null
@@ -1,83 +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 static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertNotNull;
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MultipleLocalNodes2TestCase{
-
- private static final URI DOMAIN_URI = URI.create("OneNodeTestCase");
- private static Node ifaceNode, serviceNode, clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- ifaceNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes");
- ifaceNode.start();
- serviceNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-service/target/classes");
- serviceNode.start();
- clientNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-client/target/classes");
- clientNode.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
-// Helloworld service = node.getService(Helloworld.class, "HelloworldService");
-// assertNotNull(service);
-// assertEquals("Hello Petra", service.sayHello("Petra"));
-//
-// Helloworld client = node.getService(Helloworld.class, "HelloworldClient");
-// assertNotNull(client);
-// assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-//
-// Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");
-// assertNotNull(scaClientService);
-// assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-//
-// Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");
-// assertNotNull(scaClientClient);
-// assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- if (clientNode != null) {
- clientNode.stop();
- }
- if (ifaceNode != null) {
- ifaceNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java
deleted file mode 100644
index 5ca30bdc47..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java
+++ /dev/null
@@ -1,78 +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 static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertNotNull;
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MultipleLocalNodesTestCase{
-
- private static final URI DOMAIN_URI = URI.create("OneNodeTestCase");
- private static Node ifaceNode, serviceNode, clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes", "../test-service/target/classes");
- serviceNode.start();
- clientNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes", "../test-client/target/classes");
- clientNode.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
-// Helloworld service = node.getService(Helloworld.class, "HelloworldService");
-// assertNotNull(service);
-// assertEquals("Hello Petra", service.sayHello("Petra"));
-//
-// Helloworld client = node.getService(Helloworld.class, "HelloworldClient");
-// assertNotNull(client);
-// assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-//
-// Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");
-// assertNotNull(scaClientService);
-// assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-//
-// Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");
-// assertNotNull(scaClientClient);
-// assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java
deleted file mode 100644
index b3de5110ea..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java
+++ /dev/null
@@ -1,55 +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 static org.junit.Assert.assertTrue;
-import itest.test.TestIt;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class OneNodeTestCase{
-
- private static Node node;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- node = NodeFactory.newInstance().createNode(URI.create("OneNodeTestCase"), "../iface-export/target/classes", "../service/target/classes", "../client/target/classes");
- node.start();
- }
-
- @Test
- public void testNode() throws Exception {
- TestIt service = node.getService(TestIt.class, "TestClient");
- assertTrue(service.testIt());
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java
deleted file mode 100644
index ef7df127f9..0000000000
--- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java
+++ /dev/null
@@ -1,78 +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 static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertNotNull;
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class TwoNodesTestCase{
-
- private static final URI DOMAIN_URI = URI.create("OneNodeTestCase");
- private static Node node1, node2;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- @Test
- public void testNode() throws Exception {
- node1 = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes");
- node1.start();
- node2 = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-service/target/classes");
- node2.start();
-
-// Helloworld service = node2.getService(Helloworld.class, "HelloworldService");
-// assertNotNull(service);
-// assertEquals("Hello Petra", service.sayHello("Petra"));
-//
-// Helloworld client = node.getService(Helloworld.class, "HelloworldClient");
-// assertNotNull(client);
-// assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-//
-// Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");
-// assertNotNull(scaClientService);
-// assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-//
-// Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");
-// assertNotNull(scaClientClient);
-// assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (node2 != null) {
- node2.stop();
- }
- if (node1 != null) {
- node1.stop();
- }
- }
-}