From 75f008b6ba662fabaa87997a59c4ad017e7df8bb Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 29 Jul 2008 07:03:23 +0000 Subject: Rename 1.3 tag to rc2 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@680634 13f79535-47bb-0310-9956-ffa450edef68 --- .../export-composite/pom.xml | 67 ---------- .../src/main/java/hello/Hello.java | 30 ----- .../src/main/java/hello/HelloImpl.java | 33 ----- .../main/resources/META-INF/sca-contribution.xml | 25 ---- .../src/main/resources/hello.composite | 31 ----- .../sca/test/contribution/HelloTestCase.java | 91 -------------- .../contribution-import-export/export-java/pom.xml | 67 ---------- .../main/java/helloworld/HelloWorldService.java | 30 ----- .../main/resources/META-INF/sca-contribution.xml | 24 ---- .../helloworld/HelloWorldImpl.componentType | 30 ----- .../export-resource/pom.xml | 31 ----- .../main/resources/META-INF/sca-contribution.xml | 24 ---- .../src/main/resources/ufservices/store.html | 27 ---- .../contribution-import-export/export-wsdl/pom.xml | 31 ----- .../main/resources/META-INF/sca-contribution.xml | 24 ---- .../export-wsdl/src/main/resources/helloworld.wsdl | 76 ------------ .../export-wsdl/src/main/resources/helloworld.xsd | 35 ------ .../import-composite/pom.xml | 73 ----------- .../src/main/java/helloworld/HelloWorldImpl.java | 38 ------ .../src/main/java/helloworld/HelloWorldServer.java | 46 ------- .../main/java/helloworld/HelloWorldService.java | 30 ----- .../main/resources/META-INF/sca-contribution.xml | 27 ---- .../src/main/resources/helloworld.wsdl | 76 ------------ .../src/main/resources/helloworld.xsd | 35 ------ .../src/main/resources/helloworldws.composite | 39 ------ .../contribution/HelloWorldServerTestCase.java | 126 ------------------- .../contribution-import-export/import-java/pom.xml | 73 ----------- .../src/main/java/helloworld/HelloWorldImpl.java | 33 ----- .../main/resources/META-INF/sca-contribution.xml | 25 ---- .../src/main/resources/helloworldws.composite | 29 ----- .../contribution/HelloWorldServerTestCase.java | 127 ------------------- .../import-resource/pom.xml | 95 -------------- .../main/resources/META-INF/sca-contribution.xml | 25 ---- .../src/main/resources/store.composite | 33 ----- .../sca/test/contribution/StoreTestCase.java | 129 ------------------- .../contribution-import-export/import-wsdl/pom.xml | 73 ----------- .../src/main/java/helloworld/HelloWorldImpl.java | 33 ----- .../src/main/java/helloworld/HelloWorldServer.java | 46 ------- .../main/java/helloworld/HelloWorldService.java | 30 ----- .../main/resources/META-INF/sca-contribution.xml | 25 ---- .../src/main/resources/helloworldws.composite | 33 ----- .../contribution/HelloWorldServerTestCase.java | 137 --------------------- .../1.3/itest/contribution-import-export/pom.xml | 56 --------- 43 files changed, 2168 deletions(-) delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-composite/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-java/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-resource/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-java/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-resource/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/store.composite delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/pom.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java delete mode 100644 tags/java/sca/1.3/itest/contribution-import-export/pom.xml (limited to 'tags/java/sca/1.3/itest/contribution-import-export') diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/pom.xml deleted file mode 100644 index 755338c833..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-export-composite - Apache Tuscany SCA Contribution Export Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.3 - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java deleted file mode 100644 index e65422136f..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package hello; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the Hello service. - */ -@Remotable -public interface Hello { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java deleted file mode 100644 index 5369c18497..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package hello; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(Hello.class) -public class HelloImpl implements Hello { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3c14560a56..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite deleted file mode 100644 index 636b7111d9..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java deleted file mode 100644 index 72b77564d2..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.contribution; - -import hello.Hello; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - - @Override - protected void setUp() throws Exception { - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - // Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - URL helloURL = getContributionURL(Hello.class); - - // File helloContrib = new File("./target/classes/"); - // URL helloURL = helloContrib.toURL(); - Contribution consumerContribution = - contributionService.contribute("http://import-export/hello", helloURL, false); - Composite consumerComposite = consumerContribution.getDeployables().get(0); - domain.getDomainComposite().getIncludes().add(consumerComposite); - domain.buildComposite(consumerComposite); - - // Start Components from my composite - domain.getCompositeActivator().activate(consumerComposite); - domain.getCompositeActivator().start(consumerComposite); - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testHello() throws IOException { - Hello hello = domain.getService(Hello.class, "HelloServiceComponent"); - assertNotNull(hello); - assertEquals(hello.getGreetings("lresende"), "Hello lresende"); - } - - @Override - public void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-java/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-java/pom.xml deleted file mode 100644 index 250a913bff..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-java/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-export-java - Apache Tuscany SCA Contribution Java Export Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.3 - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index dc33dfa560..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType deleted file mode 100644 index 5a14b41650..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-resource/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-resource/pom.xml deleted file mode 100644 index ebc1f392ab..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-resource/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-export-resource - Apache Tuscany SCA Contribution Resource Export Integration Tests - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f11eacb416..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html deleted file mode 100644 index 1ff281373a..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html +++ /dev/null @@ -1,27 +0,0 @@ - - - -Store - - - -

Sample Store Page

- - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/pom.xml deleted file mode 100644 index eee5c288b5..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-export-wsdl - Apache Tuscany SCA Contribution WSDL Export Integration Tests - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b7394ec14b..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl deleted file mode 100644 index 9b31363e1a..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd deleted file mode 100644 index d3c83b08c6..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/pom.xml deleted file mode 100644 index ec0a8061ef..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-import-composite - Apache Tuscany SCA Contribution Import Integration Tests - - - - org.apache.tuscany.sca - itest-contribution-export-composite - 1.3 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.3 - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 966f56d7d5..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.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 helloworld; - -import hello.Hello; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - @Reference - protected Hello helloServiceRef; - - public String getGreetings(String name) { - return helloServiceRef.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index 3d43290380..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - scaDomain.close(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 9f3f5be452..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl deleted file mode 100644 index 9b31363e1a..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd deleted file mode 100644 index d3c83b08c6..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite deleted file mode 100644 index e2f852ff7e..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 1176a89143..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.test.contribution; - -import hello.Hello; -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloWorldContribution; - private Contribution compositeContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - // File compositeContribLocation = new File("../export-composite/target/classes"); - // URL compositeContribURL = compositeContribLocation.toURL(); - URL compositeContribURL = getContributionURL(Hello.class); - compositeContribution = - contributionService.contribute("http://import-export/export-composite", compositeContribURL, false); - for (Composite deployable : compositeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - -// File helloWorldContribLocation = new File("./target/classes/"); -// URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldService.class); - helloWorldContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-composite"); - - //Stop Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - domain.close(); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-java/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-java/pom.xml deleted file mode 100644 index d9e6ad9e64..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-java/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-import-java - Apache Tuscany SCA Contribution Java Import Java Integration Tests - - - - org.apache.tuscany.sca - itest-contribution-export-java - 1.3 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.3 - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 4cdcc1fd0b..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 224e2c4d79..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite deleted file mode 100644 index 9b650e4acc..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 431988cc04..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.contribution; - -import helloworld.HelloWorldImpl; -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloWorldContribution; - private Contribution javaContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - //File javaContribLocation = new File("../export-java/target/classes"); - //URL javaContribURL = javaContribLocation.toURL(); - URL javaContribURL = getContributionURL(HelloWorldService.class); - javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false); - for (Composite deployable : javaContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - //File helloWorldContribLocation = new File("./target/classes/"); - //URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class); - helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testPing() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - assertEquals("Hello test", helloWorldService.getGreetings("test")); - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-java"); - - // Stop Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/pom.xml deleted file mode 100644 index f04a0825fb..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-import-resource - Apache Tuscany SCA Contribution Resource Import Java Integration Tests - - - - - org.apache.tuscany.sca - itest-contribution-export-resource - 1.3 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-host-http - 1.3 - - - - org.apache.tuscany.sca - tuscany-binding-http-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-resource-runtime - 1.3 - test - - - - javax.servlet - servlet-api - 2.5 - provided - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.3 - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ac6d7becb3..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/store.composite deleted file mode 100644 index bb5a7b764f..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/store.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java deleted file mode 100644 index 1b7542b7d9..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.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 org.apache.tuscany.sca.test.contribution; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class StoreTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution storeContribution; - private Contribution resourceContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - URL javaContribURL = getContributionURL(cl, "ufservices/store.html"); - resourceContribution = contributionService.contribute("http://import-export/export-resource", javaContribURL, false); - for (Composite deployable : resourceContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - URL storeContributionURL = getContributionURL(cl, "store.composite"); - - storeContribution = - contributionService.contribute("http://import-export/store", storeContributionURL, false); - for (Composite deployable : storeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : storeContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/store"); - contributionService.remove("http://import-export/export-resource"); - - // Stop Components from my composite - for (Composite deployable : storeContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - - - /** - * Utility methods - */ - - - private URL getContributionURL(ClassLoader cl, Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cl.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - private URL getContributionURL(ClassLoader cl, String uri) throws MalformedURLException { - URL url = cl.getResource(uri); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - uri.length()); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/pom.xml deleted file mode 100644 index b71624734f..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-import-wsdl - Apache Tuscany SCA Contribution WSDL Import Integration Tests - - - - org.apache.tuscany.sca - itest-contribution-export-wsdl - 1.3 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.3 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.3 - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 4cdcc1fd0b..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index 3d43290380..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - scaDomain.close(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d46fe0b57c..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite deleted file mode 100644 index 5008a2ea5b..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 5c40606e50..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.test.contribution; - -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution wsdlContribution; - private Contribution consumerContribution; - - @Override - protected void setUp() throws Exception { - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - // File wsdlContribLocation = new File("../export-wsdl/target/classes"); - // URL wsdlContribURL = wsdlContribLocation.toURL(); - URL wsdlContribURL = getContributionURL(getClass().getClassLoader(), "helloworld.wsdl"); - wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false); - for (Composite deployable : wsdlContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // File helloWorldContribLocation = new File("./target/classes/"); - // URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldService.class); - consumerContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - private URL getContributionURL(ClassLoader cl, String flag) throws MalformedURLException { - URL url = cl.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length()); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - // System.out.println(url); - return url; - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-wsdl"); - - // Stop Components from my composite - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - -} diff --git a/tags/java/sca/1.3/itest/contribution-import-export/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/pom.xml deleted file mode 100644 index d485679f28..0000000000 --- a/tags/java/sca/1.3/itest/contribution-import-export/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3 - ../pom.xml - - itest-contribution-import-export - pom - Apache Tuscany SCA Contribution Import/Export Integration Tests - - - export-composite - export-java - export-resource - export-wsdl - import-composite - import-java - import-resource - import-wsdl - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3 - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.3 - - - -- cgit v1.2.3