From a8050885e94b2948dd945c4115f7098587175066 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 2 Sep 2009 00:10:33 +0000 Subject: Start to fix the MANIFEST.MF and rename split packages git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@810317 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/domain-node/META-INF/MANIFEST.MF | 6 +- java/sca/modules/domain-node/pom.xml | 8 ++ .../sca/domain/node/ConfigAttributesImpl.java | 35 +++++ .../apache/tuscany/sca/domain/node/DomainNode.java | 157 +++++++++++++++++++++ .../tuscany/sca/domain/node/DomainNodeMain.java | 63 +++++++++ .../tuscany/sca/node/ConfigAttributesImpl.java | 35 ----- .../org/apache/tuscany/sca/node/DomainNode.java | 154 -------------------- .../apache/tuscany/sca/node/DomainNodeMain.java | 63 --------- .../tuscany/sca/domain/node/ConfigTestCase.java | 64 +++++++++ .../domain/node/MultipleNodesPerJVMTestCase.java | 91 ++++++++++++ .../tuscany/sca/domain/node/OneNodeTestCase.java | 102 +++++++++++++ .../sca/domain/node/StopStartNodesTestCase.java | 80 +++++++++++ .../apache/tuscany/sca/node/ConfigTestCase.java | 63 --------- .../sca/node/MultipleNodesPerJVMTestCase.java | 90 ------------ .../apache/tuscany/sca/node/OneNodeTestCase.java | 101 ------------- .../tuscany/sca/node/StopStartNodesTestCase.java | 79 ----------- .../modules/endpoint-tribes/META-INF/MANIFEST.MF | 1 + java/sca/modules/endpoint-wrapper/pom.xml | 18 +++ java/sca/modules/node-impl/META-INF/MANIFEST.MF | 1 + 19 files changed, 623 insertions(+), 588 deletions(-) create mode 100644 java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java create mode 100644 java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java create mode 100644 java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java delete mode 100644 java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java delete mode 100644 java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java delete mode 100644 java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java create mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java create mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java create mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java create mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java delete mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java delete mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java delete mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java delete mode 100644 java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java (limited to 'java/sca') diff --git a/java/sca/modules/domain-node/META-INF/MANIFEST.MF b/java/sca/modules/domain-node/META-INF/MANIFEST.MF index ef676509b6..89432db62f 100644 --- a/java/sca/modules/domain-node/META-INF/MANIFEST.MF +++ b/java/sca/modules/domain-node/META-INF/MANIFEST.MF @@ -1,6 +1,4 @@ Manifest-Version: 1.0 -Export-Package: org.apache.tuscany.sca.node;uses:="org.apache.tuscany. - sca.node";version="2.0.0" Tool: Bnd-0.0.255 Bundle-Name: Apache Tuscany SCA Domain Node Created-By: 1.6.0_07 (Sun Microsystems Inc.) @@ -11,7 +9,9 @@ Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Domain Node Import-Package: - org.apache.tuscany.sca.node;version="2.0.0" + org.apache.tuscany.sca.management;version="2.0.0", + org.apache.tuscany.sca.node;version="2.0.0", + org.apache.tuscany.sca.node.impl;version="2.0.0" Bundle-SymbolicName: org.apache.tuscany.sca.domain.node Bundle-DocURL: http://www.apache.org/ Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/java/sca/modules/domain-node/pom.xml b/java/sca/modules/domain-node/pom.xml index 4cf6e4e279..0a2d3c274c 100644 --- a/java/sca/modules/domain-node/pom.xml +++ b/java/sca/modules/domain-node/pom.xml @@ -38,10 +38,18 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-SNAPSHOT + test + + org.apache.tuscany.sca tuscany-sca-client-impl 2.0-SNAPSHOT + test diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java new file mode 100644 index 0000000000..9a10cbd306 --- /dev/null +++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java @@ -0,0 +1,35 @@ +/* + * 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.domain.node; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.management.ConfigAttributes; + +public class ConfigAttributesImpl implements ConfigAttributes { + + private Map attributes = new HashMap(); + + public Map getAttributes() { + return attributes; + } + +} diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java new file mode 100644 index 0000000000..761e9d25a7 --- /dev/null +++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java @@ -0,0 +1,157 @@ +/* + * 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.domain.node; + +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.management.ConfigAttributes; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; + +public class DomainNode { + + public static final String DOMAIN_NAME_ATTR = "domainName"; + public static final String DOMAIN_SCHEME_ATTR = "domainScheme"; + public static final String DEFAULT_DOMAIN_SCHEME = "vm"; + public static final String DEFAULT_DOMAIN_NAME = "defaultDomain"; + + private ConfigAttributes configAttributes = new ConfigAttributesImpl(); + + private NodeFactoryImpl nodeFactory; + private Map nodes = new HashMap(); + + public DomainNode() { + this(DEFAULT_DOMAIN_SCHEME + "://" + DEFAULT_DOMAIN_NAME); + } + + public DomainNode(String configURI) { + parseConfigURI(configURI); + start(); + } + + public DomainNode(String configURI, String... contributionLocations) { + parseConfigURI(configURI); + start(); + for (String loc : contributionLocations) { + addContribution(loc); + } + } + + public void start() { + if (nodeFactory != null) { + throw new IllegalStateException("Already started"); + } + + //TODO shouldn't really be working with the impl + nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance(configAttributes.getAttributes().get(DOMAIN_NAME_ATTR)); + nodeFactory.setConfigAttributes(configAttributes); + } + + public boolean isStarted() { + return nodeFactory != null; + } + + public void stop() { + if (nodeFactory == null) { + throw new IllegalStateException("not started"); + } + + for (Node node : nodes.values()) { + node.stop(); + } + +// TODO: stopping the node factory stops _all_ domain nodes not just this instance +// nodeFactory.destroy(); +// nodeFactory = null; +// nodes.clear(); + } + + public String addContribution(String location) { + String uri = location; + addContribution(uri, location); + return uri; + } + + public void addContribution(String location, String uri) { + if (nodes.containsKey(uri)) { + throw new IllegalArgumentException("contribution already added: " + uri); + } + Node node = nodeFactory.createNode(new Contribution(uri, location)).start(); + nodes.put(uri, node); + } + + public void removeContribution(String uri) { + if (!nodes.containsKey(uri)) { + throw new IllegalArgumentException("contribution not found: " + uri); + } + Node node = nodes.remove(uri); + node.stop(); + } + + public ConfigAttributes getConfigAttributes() { + return configAttributes; + } + + public String getDomainName() { + return configAttributes.getAttributes().get(DOMAIN_NAME_ATTR); + } + + protected void parseConfigURI(String configURI) { + URI uri = URI.create(fixScheme(configURI)); + String dn = uri.getHost(); + if (dn == null || dn.length() < 1) { + dn = DEFAULT_DOMAIN_NAME; + } + configAttributes.getAttributes().put(DOMAIN_NAME_ATTR, dn); + String scheme = uri.getScheme(); + if (scheme != null && scheme.length() > 0) { + configAttributes.getAttributes().put(DOMAIN_SCHEME_ATTR, scheme); + } + + String query = uri.getQuery(); + if (query != null && query.length() > 0) { + String[] params = query.split("&"); + for (String param : params){ + String name = param.split("=")[0]; + String value = param.split("=")[1]; + configAttributes.getAttributes().put(name, value); + } + } + } + + /** + * I keep typing the scheme part with just a colon instead of colon slash slash + * which URI doesn't parse properly which irritates me so fix it up here + */ + private String fixScheme(String uri) { + int i = uri.indexOf(":"); + if (i > -1 && uri.charAt(i+1) != '/') { + uri = uri.replaceFirst(":", ":/"); + } + if (i > -1 && uri.charAt(i+2) != '/') { + uri = uri.replaceFirst(":/", "://"); + } + return uri; + } +} diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java new file mode 100644 index 0000000000..2d8d15342a --- /dev/null +++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java @@ -0,0 +1,63 @@ +/* + * 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.domain.node; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class DomainNodeMain { + + /** + * Start an SCA domain node + * @param args a list of contribution jars for the node to run + */ + public static void main(String[] args) throws Exception { + + String configURI = "vm://defaultDoamin"; + + List contributions = new ArrayList(); + for (int i = 0; i < args.length; i++) { + if (args[i].startsWith("vm:") || args[i].startsWith("tribes:")) { + configURI = args[i]; + } else{ + File f = new File(args[i]); + if (!f.exists()) { + System.err.println("contribution not found: " + f); + System.exit(1); + } + contributions.add(f.toURI().toString()); + } + } + + DomainNode node = new DomainNode(configURI, contributions.toArray(new String[contributions.size()])); + + System.out.println("Hit enter to stop node..."); + if (System.in.read() == -1) { + // no sysin so wait for ever letting caller do the terminate + Object lock = new Object(); + synchronized (lock) { + lock.wait(); + } + } + + node.stop(); + } +} diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java deleted file mode 100644 index c38c59f0ba..0000000000 --- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java +++ /dev/null @@ -1,35 +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.node; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.management.ConfigAttributes; - -public class ConfigAttributesImpl implements ConfigAttributes { - - private Map attributes = new HashMap(); - - public Map getAttributes() { - return attributes; - } - -} diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java deleted file mode 100644 index 39f60c4a1d..0000000000 --- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java +++ /dev/null @@ -1,154 +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.node; - -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.management.ConfigAttributes; -import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; - -public class DomainNode { - - public static final String DOMAIN_NAME_ATTR = "domainName"; - public static final String DOMAIN_SCHEME_ATTR = "domainScheme"; - public static final String DEFAULT_DOMAIN_SCHEME = "vm"; - public static final String DEFAULT_DOMAIN_NAME = "defaultDomain"; - - private ConfigAttributes configAttributes = new ConfigAttributesImpl(); - - private NodeFactoryImpl nodeFactory; - private Map nodes = new HashMap(); - - public DomainNode() { - this(DEFAULT_DOMAIN_SCHEME + "://" + DEFAULT_DOMAIN_NAME); - } - - public DomainNode(String configURI) { - parseConfigURI(configURI); - start(); - } - - public DomainNode(String configURI, String... contributionLocations) { - parseConfigURI(configURI); - start(); - for (String loc : contributionLocations) { - addContribution(loc); - } - } - - public void start() { - if (nodeFactory != null) { - throw new IllegalStateException("Already started"); - } - - //TODO shouldn't really be working with the impl - nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance(configAttributes.getAttributes().get(DOMAIN_NAME_ATTR)); - nodeFactory.setConfigAttributes(configAttributes); - } - - public boolean isStarted() { - return nodeFactory != null; - } - - public void stop() { - if (nodeFactory == null) { - throw new IllegalStateException("not started"); - } - - for (Node node : nodes.values()) { - node.stop(); - } - -// TODO: stopping the node factory stops _all_ domain nodes not just this instance -// nodeFactory.destroy(); -// nodeFactory = null; -// nodes.clear(); - } - - public String addContribution(String location) { - String uri = location; - addContribution(uri, location); - return uri; - } - - public void addContribution(String location, String uri) { - if (nodes.containsKey(uri)) { - throw new IllegalArgumentException("contribution already added: " + uri); - } - Node node = nodeFactory.createNode(new Contribution(uri, location)).start(); - nodes.put(uri, node); - } - - public void removeContribution(String uri) { - if (!nodes.containsKey(uri)) { - throw new IllegalArgumentException("contribution not found: " + uri); - } - Node node = nodes.remove(uri); - node.stop(); - } - - public ConfigAttributes getConfigAttributes() { - return configAttributes; - } - - public String getDomainName() { - return configAttributes.getAttributes().get(DOMAIN_NAME_ATTR); - } - - protected void parseConfigURI(String configURI) { - URI uri = URI.create(fixScheme(configURI)); - String dn = uri.getHost(); - if (dn == null || dn.length() < 1) { - dn = DEFAULT_DOMAIN_NAME; - } - configAttributes.getAttributes().put(DOMAIN_NAME_ATTR, dn); - String scheme = uri.getScheme(); - if (scheme != null && scheme.length() > 0) { - configAttributes.getAttributes().put(DOMAIN_SCHEME_ATTR, scheme); - } - - String query = uri.getQuery(); - if (query != null && query.length() > 0) { - String[] params = query.split("&"); - for (String param : params){ - String name = param.split("=")[0]; - String value = param.split("=")[1]; - configAttributes.getAttributes().put(name, value); - } - } - } - - /** - * I keep typing the scheme part with just a colon instead of colon slash slash - * which URI doesn't parse properly which irritates me so fix it up here - */ - private String fixScheme(String uri) { - int i = uri.indexOf(":"); - if (i > -1 && uri.charAt(i+1) != '/') { - uri = uri.replaceFirst(":", ":/"); - } - if (i > -1 && uri.charAt(i+2) != '/') { - uri = uri.replaceFirst(":/", "://"); - } - return uri; - } -} diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java deleted file mode 100644 index aaf1c6ca5e..0000000000 --- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -public class DomainNodeMain { - - /** - * Start an SCA domain node - * @param args a list of contribution jars for the node to run - */ - public static void main(String[] args) throws Exception { - - String configURI = "vm://defaultDoamin"; - - List contributions = new ArrayList(); - for (int i = 0; i < args.length; i++) { - if (args[i].startsWith("vm:") || args[i].startsWith("tribes:")) { - configURI = args[i]; - } else{ - File f = new File(args[i]); - if (!f.exists()) { - System.err.println("contribution not found: " + f); - System.exit(1); - } - contributions.add(f.toURI().toString()); - } - } - - DomainNode node = new DomainNode(configURI, contributions.toArray(new String[contributions.size()])); - - System.out.println("Hit enter to stop node..."); - if (System.in.read() == -1) { - // no sysin so wait for ever letting caller do the terminate - Object lock = new Object(); - synchronized (lock) { - lock.wait(); - } - } - - node.stop(); - } -} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java new file mode 100644 index 0000000000..1d31a5467f --- /dev/null +++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java @@ -0,0 +1,64 @@ +/* + * 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.domain.node; + +import static org.junit.Assert.assertEquals; + +import org.apache.tuscany.sca.domain.node.DomainNode; +import org.junit.Test; + +/** + * This shows how to test the Calculator service component. + */ +public class ConfigTestCase{ + + @Test + public void testConfig() throws Exception { + DomainNode domain = new DomainNode("foo://someDomain:1234?p1=x&p2=y"); + assertEquals(4, domain.getConfigAttributes().getAttributes().size()); + assertEquals("someDomain", domain.getDomainName()); + assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); + assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); + assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); + assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); + } + + @Test + public void testConfig1() throws Exception { + DomainNode domain = new DomainNode("foo:someDomain:1234?p1=x&p2=y"); + assertEquals(4, domain.getConfigAttributes().getAttributes().size()); + assertEquals("someDomain", domain.getDomainName()); + assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); + assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); + assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); + assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); + } + + @Test + public void testConfig2() throws Exception { + DomainNode domain = new DomainNode("foo:/someDomain:1234?p1=x&p2=y"); + assertEquals(4, domain.getConfigAttributes().getAttributes().size()); + assertEquals("someDomain", domain.getDomainName()); + assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); + assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); + assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); + assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); + } +} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java new file mode 100644 index 0000000000..20d7470a66 --- /dev/null +++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java @@ -0,0 +1,91 @@ +/* + * 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.domain.node; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import itest.nodes.Helloworld; +import static org.junit.Assert.fail; + +import org.apache.tuscany.sca.domain.node.DomainNode; +import org.junit.After; +import org.junit.Test; +import org.oasisopen.sca.SCARuntimeException; +import org.oasisopen.sca.client.SCAClient; + +/** + * This shows how to test the Calculator service component. + */ +public class MultipleNodesPerJVMTestCase{ + + private static DomainNode clientNode; + private static DomainNode serviceNode; + + @Test + public void testTwoNodesSameDomain() throws Exception { + serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); + clientNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + + Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); + assertNotNull(service); + assertEquals("Hello Petra", service.sayHello("Petra")); + + Helloworld client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); + assertNotNull(client); + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + + if (clientNode != null && clientNode.isStarted()) { + clientNode.stop(); + } + if (serviceNode != null && serviceNode.isStarted()) { + serviceNode.stop(); + } + } + + @Test + public void testTwoNodesDifferentDomains() throws Exception { + serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); + Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); + assertNotNull(service); + assertEquals("Hello Petra", service.sayHello("Petra")); + + clientNode = new DomainNode("vm://barDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + Helloworld client = SCAClient.getService(Helloworld.class, "barDomain/HelloworldClient"); + assertNotNull(client); + + try { + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + fail(); + } catch (SCARuntimeException e) { + // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException? + // expected + } + } + + @After + public void tearDownAfterClass() throws Exception { + if (clientNode != null && clientNode.isStarted()) { + clientNode.stop(); + } + if (serviceNode != null && serviceNode.isStarted()) { + serviceNode.stop(); + } + } +} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java new file mode 100644 index 0000000000..a5c829b87f --- /dev/null +++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java @@ -0,0 +1,102 @@ +/* + * 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.domain.node; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import itest.nodes.Helloworld; + +import org.apache.tuscany.sca.domain.node.DomainNode; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.oasisopen.sca.NoSuchDomainException; +import org.oasisopen.sca.NoSuchServiceException; +import org.oasisopen.sca.client.SCAClient; + +/** + * This shows how to test the Calculator service component. + */ +public class OneNodeTestCase{ + + private static DomainNode domain; + private static String serviceContributionUri; + + @Before + public void setUpBeforeClass() throws Exception { + domain = new DomainNode(); + serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); + domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + } + + @Test + public void testService() throws Exception { + Helloworld service = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldService"); + assertNotNull(service); + assertEquals("Hello Petra", service.sayHello("Petra")); + } + + @Test + public void testClient() throws Exception { + Helloworld client = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); + assertNotNull(client); + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + } + + @Test + public void testRemovingServiceContribution() throws Exception { + domain.removeContribution(serviceContributionUri); + try { + SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldService"); + // FIXME: should this be NoSuchServiceException or ServiceNotFoundException? + } catch (NoSuchServiceException e) { + // expected + } + + Helloworld client = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); + assertNotNull(client); + try { + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + fail(); + } catch (Exception e) { + // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException + // expected + } + } + + @Test + public void testStoppingDomainNode() throws Exception { + domain.stop(); + try { + SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); + fail(); + } catch (NoSuchDomainException e) { + // expected + } + } + + @After + public void tearDownAfterClass() throws Exception { + if (domain != null && domain.isStarted()) { + domain.stop(); + } + } +} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java new file mode 100644 index 0000000000..52093129a8 --- /dev/null +++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java @@ -0,0 +1,80 @@ +/* + * 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.domain.node; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import itest.nodes.Helloworld; + +import org.apache.tuscany.sca.domain.node.DomainNode; +import org.junit.After; +import org.junit.Test; +import org.oasisopen.sca.client.SCAClient; + +/** + * This shows how to test the Calculator service component. + */ +public class StopStartNodesTestCase{ + + private static DomainNode clientNode; + private static DomainNode serviceNode; + + @Test + public void testTwoNodesSameDomain() throws Exception { + serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); + clientNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + + Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); + assertNotNull(service); + assertEquals("Hello Petra", service.sayHello("Petra")); + + Helloworld client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); + assertNotNull(client); + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + + serviceNode.stop(); + + client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); + assertNotNull(client); + try { + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + fail(); + } catch (Exception e) { + e.printStackTrace(); + // expected + } + + serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); + client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); + assertNotNull(client); + assertEquals("Hi Hello Petra", client.sayHello("Petra")); + } + + @After + public void tearDownAfterClass() throws Exception { + if (clientNode != null && clientNode.isStarted()) { + clientNode.stop(); + } + if (serviceNode != null && serviceNode.isStarted()) { + serviceNode.stop(); + } + } +} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java deleted file mode 100644 index 4ca8f180bb..0000000000 --- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.node; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class ConfigTestCase{ - - @Test - public void testConfig() throws Exception { - DomainNode domain = new DomainNode("foo://someDomain:1234?p1=x&p2=y"); - assertEquals(4, domain.getConfigAttributes().getAttributes().size()); - assertEquals("someDomain", domain.getDomainName()); - assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); - assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); - assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); - assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); - } - - @Test - public void testConfig1() throws Exception { - DomainNode domain = new DomainNode("foo:someDomain:1234?p1=x&p2=y"); - assertEquals(4, domain.getConfigAttributes().getAttributes().size()); - assertEquals("someDomain", domain.getDomainName()); - assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); - assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); - assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); - assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); - } - - @Test - public void testConfig2() throws Exception { - DomainNode domain = new DomainNode("foo:/someDomain:1234?p1=x&p2=y"); - assertEquals(4, domain.getConfigAttributes().getAttributes().size()); - assertEquals("someDomain", domain.getDomainName()); - assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); - assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); - assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); - assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); - } -} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java deleted file mode 100644 index 95e470bb28..0000000000 --- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java +++ /dev/null @@ -1,90 +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.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; -import static org.junit.Assert.fail; - -import org.junit.After; -import org.junit.Test; -import org.oasisopen.sca.SCARuntimeException; -import org.oasisopen.sca.client.SCAClient; - -/** - * This shows how to test the Calculator service component. - */ -public class MultipleNodesPerJVMTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - - Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - if (clientNode != null && clientNode.isStarted()) { - clientNode.stop(); - } - if (serviceNode != null && serviceNode.isStarted()) { - serviceNode.stop(); - } - } - - @Test - public void testTwoNodesDifferentDomains() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - clientNode = new DomainNode("vm://barDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - Helloworld client = SCAClient.getService(Helloworld.class, "barDomain/HelloworldClient"); - assertNotNull(client); - - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (SCARuntimeException e) { - // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException? - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null && clientNode.isStarted()) { - clientNode.stop(); - } - if (serviceNode != null && serviceNode.isStarted()) { - serviceNode.stop(); - } - } -} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java deleted file mode 100644 index d14dfd4a02..0000000000 --- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java +++ /dev/null @@ -1,101 +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.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClient; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeTestCase{ - - private static DomainNode domain; - private static String serviceContributionUri; - - @Before - public void setUpBeforeClass() throws Exception { - domain = new DomainNode(); - serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - } - - @Test - public void testService() throws Exception { - Helloworld service = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - } - - @Test - public void testClient() throws Exception { - Helloworld client = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testRemovingServiceContribution() throws Exception { - domain.removeContribution(serviceContributionUri); - try { - SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldService"); - // FIXME: should this be NoSuchServiceException or ServiceNotFoundException? - } catch (NoSuchServiceException e) { - // expected - } - - Helloworld client = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); - assertNotNull(client); - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (Exception e) { - // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException - // expected - } - } - - @Test - public void testStoppingDomainNode() throws Exception { - domain.stop(); - try { - SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); - fail(); - } catch (NoSuchDomainException e) { - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (domain != null && domain.isStarted()) { - domain.stop(); - } - } -} diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java deleted file mode 100644 index db2e5590a1..0000000000 --- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java +++ /dev/null @@ -1,79 +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.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import org.junit.After; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClient; - -/** - * This shows how to test the Calculator service component. - */ -public class StopStartNodesTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - - Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - serviceNode.stop(); - - client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (Exception e) { - e.printStackTrace(); - // expected - } - - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null && clientNode.isStarted()) { - clientNode.stop(); - } - if (serviceNode != null && serviceNode.isStarted()) { - serviceNode.stop(); - } - } -} diff --git a/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF b/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF index d5213a0116..d8d1594c02 100644 --- a/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF +++ b/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF @@ -21,5 +21,6 @@ Import-Package: org.apache.catalina.tribes, org.apache.juli.logging;resolution:=optional, org.apache.tuscany.sca.assembly;version="2.0.0", org.apache.tuscany.sca.core;version="2.0.0", + org.apache.tuscany.sca.management;version="2.0.0", org.apache.tuscany.sca.policy;version="2.0.0", org.apache.tuscany.sca.runtime;version="2.0.0" diff --git a/java/sca/modules/endpoint-wrapper/pom.xml b/java/sca/modules/endpoint-wrapper/pom.xml index dbdda7384e..e1142c7d60 100644 --- a/java/sca/modules/endpoint-wrapper/pom.xml +++ b/java/sca/modules/endpoint-wrapper/pom.xml @@ -44,5 +44,23 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-assembly-xml + 2.0-SNAPSHOT + test + + + org.apache.tuscany.sca + tuscany-core + 2.0-SNAPSHOT + test + + + org.apache.tuscany.sca + tuscany-assembly + 2.0-SNAPSHOT + test + diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF index bb4dc4f5e5..11f988243c 100644 --- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF @@ -35,6 +35,7 @@ Import-Package: javax.management, org.apache.tuscany.sca.definitions.util;version="2.0.0", org.apache.tuscany.sca.definitions.xml;version="2.0.0", org.apache.tuscany.sca.extensibility;version="2.0.0", + org.apache.tuscany.sca.management;version="2.0.0", org.apache.tuscany.sca.monitor;version="2.0.0", org.apache.tuscany.sca.node;version="2.0.0", org.apache.tuscany.sca.node.configuration;version="2.0.0", -- cgit v1.2.3