From 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 7 Oct 2013 22:23:21 +0000 Subject: Official Tuscany 2.0.1 Release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/itest/nodes/Helloworld.java | 29 -- .../org/apache/tuscany/sca/impl/Node2TestCase.java | 312 --------------------- .../sca/runtime/DomainCompositeTestCase.java | 69 ----- .../tuscany/sca/runtime/TwoNodesTestCase.java | 50 ---- .../src/test/java/sample/Helloworld.java | 27 -- .../src/test/resources/compositeImpl.composite | 30 -- .../src/test/resources/export.jar | Bin 2285 -> 0 bytes .../test/resources/helloworld-invalidComposite.jar | Bin 4868 -> 0 bytes .../src/test/resources/helloworld2.composite | 29 -- .../src/test/resources/helloworld2.jar | Bin 5620 -> 0 bytes .../src/test/resources/helloworldNode.xml | 27 -- .../src/test/resources/import.jar | Bin 3932 -> 0 bytes .../src/test/resources/include.composite | 28 -- .../itest-nodes-helloworld-client-2.0-SNAPSHOT.jar | Bin 4779 -> 0 bytes ...itest-nodes-helloworld-service-2.0-SNAPSHOT.jar | Bin 4586 -> 0 bytes .../src/test/resources/nested.composite | 28 -- .../resources/sample-helloworld-nodeployable.jar | Bin 4761 -> 0 bytes .../src/test/resources/sample-helloworld.jar | Bin 4808 -> 0 bytes .../src/test/resources/sample-helloworld2.jar | Bin 4845 -> 0 bytes .../test/resources/sca-contribution-generated.xml | 23 -- .../test-domains/MyDomain/domain.properties | 17 -- .../helloworld-contribution.deployable.composite | 29 -- .../MyDomain/helloworld-contribution.jar | Bin 4788 -> 0 bytes .../MyDomain/helloworld-contribution.xml | 23 -- .../resources/test-domains/MyDomain/readme.txt | 8 - .../resources/test-domains/NodeXMLDomain/node.xml | 27 -- .../test-domains/NodeXMLDomain/readme.txt | 2 - .../test/resources/test-domains/default/readme.txt | 4 - .../test-domains/default/sample-helloworld.jar | Bin 4808 -> 0 bytes .../test-domains/dependencies/export1.jar | Bin 2270 -> 0 bytes .../test-domains/dependencies/export2.jar | Bin 2269 -> 0 bytes .../test-domains/dependencies/import1.dependencies | 19 -- .../test-domains/dependencies/import1.jar | Bin 3969 -> 0 bytes .../test-domains/dependencies/import2.dependencies | 19 -- .../test-domains/dependencies/import2.jar | Bin 3969 -> 0 bytes .../resources/test-domains/dependencies/readme.txt | 14 - .../resources/test-domains/exploded/readme.txt | 4 - .../test-domains/exploded/sample-helloworld.jar | Bin 4808 -> 0 bytes .../sample-helloworld/META-INF/MANIFEST.MF | 14 - .../sample-helloworld/pom.properties | 5 - .../sample-helloworld/pom.xml | 58 ---- .../META-INF/sca-contribution.xml | 24 -- .../sample-helloworld/helloworld.composite | 29 -- .../sample-helloworld/sample/Helloworld.class | Bin 251 -> 0 bytes .../sample-helloworld/sample/HelloworldImpl.class | Bin 819 -> 0 bytes 45 files changed, 948 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/itest/nodes/Helloworld.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/DomainCompositeTestCase.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/sample/Helloworld.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/compositeImpl.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/export.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld-invalidComposite.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworldNode.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/import.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/include.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/nested.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld-nodeployable.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld2.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sca-contribution-generated.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/domain.properties delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.deployable.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/readme.txt delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/node.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/readme.txt delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/readme.txt delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/sample-helloworld.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export1.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export2.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.dependencies delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.dependencies delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/readme.txt delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/readme.txt delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/MANIFEST.MF delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.properties delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/helloworld.composite delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/Helloworld.class delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/HelloworldImpl.class (limited to 'sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test') diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/itest/nodes/Helloworld.java deleted file mode 100644 index ee15dfba12..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/itest/nodes/Helloworld.java +++ /dev/null @@ -1,29 +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.nodes; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java deleted file mode 100644 index 45dbec605a..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java +++ /dev/null @@ -1,312 +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.impl; - -import java.io.Reader; -import java.io.StringReader; -import java.util.List; -import java.util.Map; - -import javax.xml.stream.XMLStreamException; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.apache.tuscany.sca.runtime.ActivationException; -import org.apache.tuscany.sca.runtime.ContributionDescription; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; - -public class Node2TestCase { - - @Test - public void localInstall() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/import.jar"); - - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - Assert.assertEquals("import", node.getInstalledContributionURIs().get(0)); - Contribution c = node.getContribution("import"); - Assert.assertNotNull(c); - } - - @Test - public void remoteInstall() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.0-SNAPSHOT/helloworld-2.0-SNAPSHOT.jar"); - - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - Assert.assertEquals("helloworld", node.getInstalledContributionURIs().get(0)); - Contribution c = node.getContribution("helloworld"); - Assert.assertNotNull(c); - } - - @Test - public void DistributedInstall() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - TuscanyRuntime runtime = TuscanyRuntime.newInstance(); - try { - Node nodeA = runtime.createNode("uri:DistributedInstall"); - nodeA.installContribution("https://repository.apache.org/content/groups/snapshots/org/apache/tuscany/sca/samples/helloworld/2.0-SNAPSHOT/helloworld-2.0-SNAPSHOT.jar"); - nodeA.installContribution("src/test/resources/export.jar"); - - Assert.assertEquals(2, nodeA.getInstalledContributionURIs().size()); - Assert.assertTrue(nodeA.getInstalledContributionURIs().contains("export")); - Assert.assertTrue(nodeA.getInstalledContributionURIs().contains("helloworld")); - Contribution cA = nodeA.getContribution("helloworld"); - Assert.assertNotNull(cA); - - Node nodeB = runtime.createNode("uri:DistributedInstall"); - Assert.assertEquals(2, nodeB.getInstalledContributionURIs().size()); - Assert.assertTrue(nodeB.getInstalledContributionURIs().contains("export")); - Assert.assertTrue(nodeB.getInstalledContributionURIs().contains("helloworld")); - Contribution cB = nodeB.getContribution("helloworld"); - Assert.assertNotNull(cB); - - ContributionDescription cd = ((NodeImpl)nodeB).getInstalledContribution("export"); - Assert.assertEquals(1, cd.getJavaExports().size()); - Assert.assertEquals("sample", cd.getJavaExports().get(0)); - } finally { - runtime.stop(); - } - } - - @Test - public void deployables() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/import.jar"); - - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - Assert.assertEquals("import", node.getInstalledContributionURIs().get(0)); - List ds = node.getDeployableCompositeURIs("import"); - Assert.assertEquals(1, ds.size()); - Assert.assertEquals("helloworld.composite", ds.get(0)); - - } - - @Test - public void exports() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/export.jar"); - - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - Assert.assertEquals("export", node.getInstalledContributionURIs().get(0)); - - ContributionDescription cd = ((NodeImpl)node).getInstalledContribution("export"); - Assert.assertEquals(1, cd.getJavaExports().size()); - Assert.assertEquals("sample", cd.getJavaExports().get(0)); - } - - @Test - public void validValidate() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/sample-helloworld.jar"); - node.validateContribution("sample-helloworld"); - } - - @Test - public void invalidValidate() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/import.jar"); - try { - node.validateContribution("import"); - } catch (ValidationException e) { - Assert.assertTrue(e.getMessage().endsWith("Unresolved import: Import = sample")); - } - } - - @Test - public void importExportValidate() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/import.jar"); - try { - node.validateContribution("import"); - } catch (ValidationException e) { - // expected - } - node.installContribution("src/test/resources/export.jar"); - node.validateContribution("import"); - node.startComposite("import", "helloworld.composite"); - Map> scs = node.getStartedCompositeURIs(); - Assert.assertEquals(1, scs.size()); - } - - @Test - public void importExportDistributedValidate() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - TuscanyRuntime runtime = TuscanyRuntime.newInstance(); - try { - Node nodeA = runtime.createNode("uri:ImportTestCase"); - nodeA.installContribution("src/test/resources/import.jar"); - try { - nodeA.validateContribution("import"); - } catch (ValidationException e) { - // expected - } - Node nodeB =runtime.createNode("uri:ImportTestCase"); - nodeB.installContribution("src/test/resources/export.jar"); - nodeA.validateContribution("import"); - nodeA.startComposite("import", "helloworld.composite"); - Map> scs = nodeB.getStartedCompositeURIs(); - Assert.assertEquals(1, scs.size()); - }finally { - runtime.stop(); - } - - } - - @Test - public void startTest() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase"); - node.installContribution("src/test/resources/sample-helloworld.jar"); - Assert.assertEquals(0, node.getStartedCompositeURIs().size()); - - node.startComposite("sample-helloworld", "helloworld.composite"); - Assert.assertEquals(1, node.getStartedCompositeURIs().size()); - Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0)); - - node.stopComposite("sample-helloworld", "helloworld.composite"); -// Assert.assertEquals(0, node.getStartedComposites().size()); - node.startComposite("sample-helloworld", "helloworld.composite"); - Assert.assertEquals(1, node.getStartedCompositeURIs().size()); - Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0)); - node.stopComposite("sample-helloworld", "helloworld.composite"); - } - - @Test - public void startDistributedTest() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, InterruptedException { - TuscanyRuntime runtime = TuscanyRuntime.newInstance(); - try { - Node node = runtime.createNode("uri:ImportTestCase"); - Node node2 = runtime.createNode("uri:ImportTestCase"); - - node.installContribution("src/test/resources/sample-helloworld.jar"); - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - Assert.assertEquals(1, node2.getInstalledContributionURIs().size()); - - node.startComposite("sample-helloworld", "helloworld.composite"); - Assert.assertEquals(1, node.getStartedCompositeURIs().size()); - Assert.assertEquals(1, node2.getStartedCompositeURIs().size()); - - Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0)); - Assert.assertEquals("helloworld.composite", node2.getStartedCompositeURIs().get("sample-helloworld").get(0)); - - node.stopComposite("sample-helloworld", "helloworld.composite"); - Assert.assertEquals(0, node.getStartedCompositeURIs().size()); - Assert.assertEquals(0, node2.getStartedCompositeURIs().size()); - - node2.startComposite("sample-helloworld", "helloworld.composite"); - Assert.assertEquals(1, node.getStartedCompositeURIs().size()); - Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0)); - - Assert.assertEquals(1, node2.getStartedCompositeURIs().size()); - Assert.assertEquals("helloworld.composite", node2.getStartedCompositeURIs().get("sample-helloworld").get(0)); - - } finally { - runtime.stop(); - } - } - - @Test - public void addDeploymentCompositeTest() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, XMLStreamException { - Node node = TuscanyRuntime.newInstance().createNode("addDeploymentCompositeTest"); - String curi = node.installContribution("src/test/resources/sample-helloworld.jar"); - - String compositeXML = - "" - + " " - + " " - + " " - + ""; - String compositeURI = node.addDeploymentComposite(curi, new StringReader(compositeXML)); - - node.startComposite(curi, compositeURI); - Assert.assertEquals(1, node.getStartedCompositeURIs().size()); - - Composite dc = node.getDomainComposite(); - Assert.assertEquals(1, dc.getIncludes().size()); - Composite runningComposite = dc.getIncludes().get(0); - Assert.assertEquals("TestComposite", runningComposite.getName().getLocalPart()); - } - - @Test - public void invalidCompositeStartTest() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, XMLStreamException { - Node node = TuscanyRuntime.newInstance().createNode("invalidCompositeStartTest"); - String curi = node.installContribution("src/test/resources/helloworld-invalidComposite.jar"); - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - Assert.assertEquals(0, node.getStartedCompositeURIs().size()); - ContributionDescription cd = node.getInstalledContribution(curi); - Assert.assertEquals(1, cd.getDeployables().size()); - - String compositeXML = - "" - + " " - + " " - + " " - + ""; - String compositeURI = node.addDeploymentComposite(curi, new StringReader(compositeXML)); - node.startComposite(curi, compositeURI); - -// node.startComposite("sample-helloworld", "helloworld.composite"); -// Assert.assertEquals(1, node.getStartedCompositeURIs().size()); -// Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0)); -// -// node.stopComposite("sample-helloworld", "helloworld.composite"); -//// Assert.assertEquals(0, node.getStartedComposites().size()); -// node.startComposite("sample-helloworld", "helloworld.composite"); -// Assert.assertEquals(1, node.getStartedCompositeURIs().size()); -// Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0)); -// node.stopComposite("sample-helloworld", "helloworld.composite"); - } - - @Test - public void stopAndUnistallTest() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, XMLStreamException { - Node node = TuscanyRuntime.newInstance().createNode("stopAndUnistallTest"); - node.installContribution("src/test/resources/import.jar"); - node.installContribution("src/test/resources/export.jar"); - String compositeXML = - "" - + " " - + " " - + " " - + ""; - String compositeURI = node.addDeploymentComposite("export", new StringReader(compositeXML)); - node.startComposite("import", "helloworld.composite"); - node.startComposite("export", compositeURI); - Assert.assertEquals(2, node.getInstalledContributionURIs().size()); - node.stopCompositeAndUninstallUnused("import", "helloworld.composite"); - Assert.assertEquals(1, node.getInstalledContributionURIs().size()); - node.stopCompositeAndUninstallUnused("export", compositeURI); - Assert.assertEquals(0, node.getInstalledContributionURIs().size()); - } -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/DomainCompositeTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/DomainCompositeTestCase.java deleted file mode 100644 index 97910aaf37..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/DomainCompositeTestCase.java +++ /dev/null @@ -1,69 +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.runtime; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.xml.Utils; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.impl.NodeImpl; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; - -public class DomainCompositeTestCase { - - @Test - public void localOnlyDomain() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node node = TuscanyRuntime.newInstance().createNode("DomainCompositeTestCase"); - testIt(node); - } - - @Test - public void distributedDomain() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - TuscanyRuntime runtime = TuscanyRuntime.newInstance(); - try { - Node node = runtime.createNode("uri:DomainCompositeTestCase"); - testIt(node); - } finally { runtime.stop(); } - } - - private void testIt(Node node) throws ContributionReadException, ActivationException, ValidationException { - node.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null); - node.startComposite("helloworld", "helloworld.composite"); - - Composite dc = node.getDomainComposite(); - Assert.assertEquals("DomainCompositeTestCase", dc.getName().getLocalPart()); - Assert.assertEquals(1, dc.getIncludes().size()); - Composite c = dc.getIncludes().get(0); - Assert.assertEquals("helloworld", c.getName().getLocalPart()); - -// String s = node.getDomainLevelCompositeAsString(); - System.out.println(Utils.modelToXML(node.getDomainComposite(), true, ((NodeImpl)node).getExtensionPointRegistry())); -// Assert.assertTrue(s.contains(":helloworld\"")); - - node.stopComposite("helloworld", "helloworld.composite"); - Assert.assertEquals(0, node.getDomainComposite().getIncludes().size()); - } - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java deleted file mode 100644 index 7827d5dcf0..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/org/apache/tuscany/sca/runtime/TwoNodesTestCase.java +++ /dev/null @@ -1,50 +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.runtime; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.Node; -import org.apache.tuscany.sca.TuscanyRuntime; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.monitor.ValidationException; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; - -import sample.Helloworld; - -public class TwoNodesTestCase { - - @Test - public void testInstallDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - TuscanyRuntime runtime = TuscanyRuntime.newInstance(); - try { - Node node1 = runtime.createNode("uri:TwoNodesTestCase?multicast=off&bind=127.0.0.1:44331"); - node1.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null); - node1.startComposite("helloworld", "helloworld.composite"); - - Node node2 = TuscanyRuntime.newInstance().createNode("uri:TwoNodesTestCase?multicast=off&bind=127.0.0.1:44332&wka=127.0.0.1:44331"); - - Helloworld helloworldService = node2.getService(Helloworld.class, "HelloworldComponent"); - Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); - } finally { runtime.stop(); } - } - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/sample/Helloworld.java deleted file mode 100644 index a422c23e6a..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/java/sample/Helloworld.java +++ /dev/null @@ -1,27 +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 sample; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - String sayHello(String name); -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/compositeImpl.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/compositeImpl.composite deleted file mode 100644 index 735bf3bbcc..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/compositeImpl.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/export.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/export.jar deleted file mode 100644 index 0ca3450bed..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/export.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld-invalidComposite.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld-invalidComposite.jar deleted file mode 100644 index fa35a21696..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld-invalidComposite.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.composite deleted file mode 100644 index 8c7a789380..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.jar deleted file mode 100644 index 2f8e473cd0..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworld2.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworldNode.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworldNode.xml deleted file mode 100644 index 3095200945..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/helloworldNode.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/import.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/import.jar deleted file mode 100644 index 4931074878..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/import.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/include.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/include.composite deleted file mode 100644 index a1d9a658be..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/include.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar deleted file mode 100644 index 7f6073ce7f..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar deleted file mode 100644 index 2306ce4d1a..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/nested.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/nested.composite deleted file mode 100644 index 1c31941a83..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/nested.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld-nodeployable.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld-nodeployable.jar deleted file mode 100644 index 16dde03858..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld-nodeployable.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld.jar deleted file mode 100644 index 1ea85c8e63..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld2.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld2.jar deleted file mode 100644 index 80b8b2315f..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sample-helloworld2.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sca-contribution-generated.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sca-contribution-generated.xml deleted file mode 100644 index 5b3d81cb97..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/sca-contribution-generated.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/domain.properties b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/domain.properties deleted file mode 100644 index d7ac22d6ad..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/domain.properties +++ /dev/null @@ -1,17 +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. -# -domainName=foo diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.deployable.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.deployable.composite deleted file mode 100644 index 8c7a789380..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.deployable.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.jar deleted file mode 100644 index 5198370d85..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.xml deleted file mode 100644 index 2788e14022..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/helloworld-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/readme.txt b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/readme.txt deleted file mode 100644 index 10114926c4..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/MyDomain/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -A file named domain.properties is used to override the domain name, see in the properties file for what -other properties are supportted. - -Side files are used to modify the helloworld-contribution.jar installed contribution. -- sca-contribution.xml metaData is modified by having a metaData side file named helloworld-contribution.xml -- additional deployment composites are added with files named helloworld-contribution..composite - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/node.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/node.xml deleted file mode 100644 index 1fe1ccff14..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/node.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/readme.txt b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/readme.txt deleted file mode 100644 index 15dac7bd0c..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/NodeXMLDomain/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -The domain directory gets all its config from a config XML file named node.xml, -which may refer to contributions at another location outside of the directory. \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/readme.txt b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/readme.txt deleted file mode 100644 index 34b3e347ff..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -The simplest domain. Just a directory of contrbutions, -the domain is named with the directory name an the contributions -are installed and all deployables are started. - \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/sample-helloworld.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/sample-helloworld.jar deleted file mode 100644 index 1ea85c8e63..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/default/sample-helloworld.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export1.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export1.jar deleted file mode 100644 index b2755b65c5..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export1.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export2.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export2.jar deleted file mode 100644 index eec5ded5ee..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/export2.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.dependencies b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.dependencies deleted file mode 100644 index b7c54895d0..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.dependencies +++ /dev/null @@ -1,19 +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. - - export1 - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.jar deleted file mode 100644 index 8402f6e3c3..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import1.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.dependencies b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.dependencies deleted file mode 100644 index dd3052994c..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.dependencies +++ /dev/null @@ -1,19 +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. - -export2 - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.jar deleted file mode 100644 index 6667994eb6..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/import2.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/readme.txt b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/readme.txt deleted file mode 100644 index fc645c0682..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/dependencies/readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -Uses the domain.properties file to show explicitly defining a contrbutions dependent contribution URIS. - -Contributions export1.jar and export2.jar both export the Java package "sample" and both have -a class sample.HelloworldImpl but the classes return a sayHello string "Hello 1" in export1.jar -and "Hello 2" in export2.jar. - -Contributions import1.jar and import2.jar both import the package sample and use the -sample.HelloworldImpl class in the component implementation. - -The *.dependencies files explicitly set the dependency URIs used by -Contributions import1.jar and import2.jar, without the explicit property the imports would just t -use the first contribution found that exports the sample package. - -See section 10.2.1 and 10.4 in the Assembly spec. diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/readme.txt b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/readme.txt deleted file mode 100644 index ea7af2b3f7..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -A domain directory showing a contribution jar exploded into a contribution directory. -In this case the contribution jar is ignored and the contribution directory is used. -Thats the same approach used for things like Tomcat with exploded webapps and it -enables more easily supporting dynamic updates to individual files in a contribution. \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld.jar deleted file mode 100644 index 1ea85c8e63..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/MANIFEST.MF deleted file mode 100644 index c5d7d06f98..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Archiver-Version: Plexus Archiver -Created-By: Apache Maven -Built-By: ant -Build-Jdk: 1.6.0_18 -Extension-Name: sample-helloworld -Implementation-Title: Apache Tuscany SCA Sample Helloworld -Implementation-Vendor: The Apache Software Foundation -Implementation-Vendor-Id: org.apache -Implementation-Version: 2.0-SNAPSHOT -Specification-Title: Apache Tuscany SCA Sample Helloworld -Specification-Vendor: The Apache Software Foundation -Specification-Version: 2.0-SNAPSHOT - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.properties b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.properties deleted file mode 100644 index ff83691757..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed May 19 10:03:09 BST 2010 -version=2.0-SNAPSHOT -groupId=org.apache.tuscany.sca -artifactId=sample-helloworld diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml deleted file mode 100644 index e480d4f534..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/maven/org.apache.tuscany.sca/sample-helloworld/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../../pom.xml - - - jar - sample-helloworld - Apache Tuscany SCA Sample Helloworld - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - junit - junit - 4.8.1 - test - - - - - ${artifactId} - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-SNAPSHOT - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/sca-contribution.xml deleted file mode 100644 index e81e94d9a1..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/helloworld.composite deleted file mode 100644 index 324395c246..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/helloworld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/Helloworld.class b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/Helloworld.class deleted file mode 100644 index 19c82db88e..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/Helloworld.class and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/HelloworldImpl.class b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/HelloworldImpl.class deleted file mode 100644 index 575b3370c4..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/domain-node-hazelcast/src/test/resources/test-domains/exploded/sample-helloworld/sample/HelloworldImpl.class and /dev/null differ -- cgit v1.2.3