From 005ecc6b09c01be18cf558dfda84b316af6bb4b0 Mon Sep 17 00:00:00 2001 From: slaws Date: Mon, 20 Feb 2012 12:50:59 +0000 Subject: TUSCANY-4016 - when a composite fails to start ensure that it is stopped and move it to the stopped list so that calls to remove unused contributions work. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291234 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/impl/NodeImpl.java | 60 ++++++++++----- .../trunk/testing/itest/nodes/domain-node/pom.xml | 59 ++++++++++++++ .../main/java/helloworld/HelloWorldClientImpl.java | 37 +++++++++ .../src/main/java/helloworld/HelloWorldImpl.java | 32 ++++++++ .../main/java/helloworld/HelloWorldService.java | 33 ++++++++ .../main/resources/META-INF/sca-contribution.xml | 23 ++++++ .../src/main/resources/helloworld.composite | 47 +++++++++++ .../test/java/helloworld/DomainNodeTestCase.java | 90 ++++++++++++++++++++++ sca-java-2.x/trunk/testing/itest/nodes/pom.xml | 1 + 9 files changed, 362 insertions(+), 20 deletions(-) create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite create mode 100644 sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java (limited to 'sca-java-2.x') diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java index b56765f3c5..e95dd9f699 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java @@ -348,18 +348,34 @@ public class NodeImpl implements Node { throw new IllegalStateException("composite already started: " + compositeURI); } DeployedComposite dc = stoppedComposites.remove(key); - if (dc != null) { - dc.start(); - startedComposites.put(key, dc); - } else { - ContributionDescription cd = getInstalledContribution(contributionURI); - Contribution contribution = loadContribution(cd); - Composite composite = contribution.getArtifactModel(compositeURI); - List dependentContributions = calculateDependentContributions(cd); - dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry, endpointsIncludeDomainName); - dc.start(); - startedComposites.put(key, dc); - } + try { + if (dc != null) { + dc.start(); + startedComposites.put(key, dc); + } else { + ContributionDescription cd = getInstalledContribution(contributionURI); + Contribution contribution = loadContribution(cd); + Composite composite = contribution.getArtifactModel(compositeURI); + List dependentContributions = calculateDependentContributions(cd); + dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry, endpointsIncludeDomainName); + dc.start(); + startedComposites.put(key, dc); + } + }catch(ActivationException e){ + if(dc != null){ + try { + // try to stop the composite. This should have already happened + // in the activator if the composite failed to start but we're + // being sure + dc.stop(); + } catch (Exception ex) { + // do nothing as we are going to throw the + // original exception + } + stoppedComposites.put(key, dc); + } + throw e; + } if (logger.isLoggable(quietLogging? Level.FINE : Level.INFO)) logger.log(quietLogging? Level.FINE : Level.INFO, "startComposite: " + key); } @@ -395,18 +411,22 @@ public class NodeImpl implements Node { public void stopCompositeAndUninstallUnused(String contributionURI, String compositeURI) throws ActivationException { String key = contributionURI+"/"+compositeURI; DeployedComposite dc = startedComposites.remove(key); - if (dc == null) { - throw new IllegalArgumentException("No startd composite found: " + key); + if (dc != null) { + dc.stop(); + } else { + // check in the stopped list in case it stopped on failure during start + dc = stoppedComposites.get(key); } - dc.stop(); - loop: for (String curi : dc.getContributionURIs()) { - for (DeployedComposite started : startedComposites.values()) { - if (started.getContributionURIs().contains(curi)) { - continue loop; + if (dc != null) { + loop: for (String curi : dc.getContributionURIs()) { + for (DeployedComposite started : startedComposites.values()) { + if (started.getContributionURIs().contains(curi)) { + continue loop; + } } + uninstallContribution(curi); } - uninstallContribution(curi); } if (logger.isLoggable(quietLogging? Level.FINE : Level.INFO)) logger.log(quietLogging? Level.FINE : Level.INFO, "stopCompositeAndUninstallUnused: " + key); } diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml new file mode 100644 index 0000000000..fd1723a605 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/pom.xml @@ -0,0 +1,59 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-nodes + 2.0-SNAPSHOT + ../pom.xml + + itest-node-domain-node + Apache Tuscany SCA iTest Node DomainNode + + + + + org.apache.tuscany.sca + tuscany-base-runtime-pom + pom + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-binding-rmi-runtime + 2.0-SNAPSHOT + + + + + + + ${project.artifactId} + + + diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java new file mode 100644 index 0000000000..021a653c36 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package helloworld; + + +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; + +/** + * This class implements the HelloWorld service. + */ +@Service(HelloWorldService.class) +public class HelloWorldClientImpl implements HelloWorldService { + + @Reference + protected HelloWorldService hwService; + + public String getGreetings(String name) { + return "Hello " + hwService.getGreetings(name); + } +} diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java new file mode 100644 index 0000000000..636f7699ed --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package helloworld; + +import org.oasisopen.sca.annotation.Service; + +/** + * This class implements the HelloWorld service. + */ +@Service(HelloWorldService.class) +public class HelloWorldImpl implements HelloWorldService { + + public String getGreetings(String name) { + return "Hello " + name; + } +} diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java new file mode 100644 index 0000000000..32c2d0b907 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package helloworld; + +import javax.jws.WebService; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * This is the business interface of the HelloWorld greetings service. + */ +@Remotable +public interface HelloWorldService { + + public String getGreetings(String name); +} + diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..34da25216d --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..fae44b642d --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java new file mode 100644 index 0000000000..028db4cf33 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package helloworld; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; + +import java.io.IOException; +import java.util.List; + +import org.apache.tuscany.sca.Node; +import org.apache.tuscany.sca.TuscanyRuntime; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.oasisopen.sca.NoSuchServiceException; + + +/** + * Tests that the helloworld server is available + */ +public class DomainNodeTestCase{ + + private Node node; + + @Before + public void startServer() throws Exception { + node = TuscanyRuntime.newInstance().createNode("default"); + node.installContribution("helloworld", "target/classes", null, null); + try { + node.startComposite("helloworld", "helloworld.composite"); + } catch (Exception ex) { + System.out.println("Caught exception on composite start : " + ex); + } + } + + @Ignore + @Test + public void testWaitForInput() { + System.out.println("Press a key to end"); + try { + System.in.read(); + } catch (Exception ex) { + } + System.out.println("Shutting down"); + } + + @Test + public void testContributionUninstall() throws IOException, NoSuchServiceException { + List installedContributions = node.getInstalledContributionURIs(); + System.out.println(installedContributions); + + assertEquals(1, installedContributions.size()); + + try { + node.stopCompositeAndUninstallUnused("helloworld", "helloworld.composite"); + } catch (Exception ex) { + System.out.println("Caught exception on composite stop : " + ex); + } + + installedContributions = node.getInstalledContributionURIs(); + assertEquals(0, installedContributions.size()); + } + + + @After + public void stopServer() throws Exception { + if (node != null) { + node.stop(); + } + } + +} diff --git a/sca-java-2.x/trunk/testing/itest/nodes/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/pom.xml index 6a60de05da..6b7729d618 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/pom.xml @@ -58,6 +58,7 @@ + domain-node -- cgit v1.2.3