Author: slaws
Date: Mon Dec 17 08:40:31 2007
New Revision: 604921
URL: http://svn.apache.org/viewvc?rev=604921&view=rev
Log:
Separate the node method that service the node API from the methods that the
domain uses for controlling the node to avoid loops of events
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
Modified:
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java?rev=604921&r1=604920&r2=604921&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
Mon Dec 17 08:40:31 2007
@@ -862,7 +862,7 @@
// remove all contributions from this node including
the
// one that is specifically being removed.
for (ContributionModel tmpContributionModel :
node.getContributions().values()){
-
((NodeModelImpl)node).getSCANodeManagerService().removeContribution(contributionURI);
+
((NodeModelImpl)node).getSCANodeManagerService().removeContribution(tmpContributionModel.getContributionURI());
}
node.getContributions().clear();
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java?rev=604921&r1=604920&r2=604921&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Mon Dec 17 08:40:31 2007
@@ -21,7 +21,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.StringBufferInputStream;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.URI;
@@ -267,82 +266,27 @@
return null;
}
- // SCANode SPI methods
+ // SCANode SPI methods
public Object getNodeRuntime() {
return nodeRuntime;
}
- // SCANode API methods
-
- public void start() throws NodeException {
+ public void startFromDomain() throws NodeException {
if ((!nodeStarted) && (nodeComposite.getIncludes().size() > 0)){
startComposites();
nodeStarted = true;
-
- try {
- scaDomain.registerNodeStart(nodeURI);
- } catch (Exception ex) {
- throw new NodeException(ex);
- }
}
}
- public void stop() throws NodeException {
+ public void stopFromDomain() throws NodeException {
if (nodeStarted){
stopComposites();
- nodeStarted = false;
-
- try {
- scaDomain.registerNodeStop(nodeURI);
- } catch (Exception ex) {
- throw new NodeException(ex);
- }
+ nodeStarted = false;
}
}
- public void destroy() throws NodeException {
- try {
- stop();
-
- removeAllContributions();
-
- ModelFactoryExtensionPoint factories =
nodeRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class);
- factories.removeFactory(nodeFactory);
- nodeFactory.setNode(null);
-
- scaDomain.removeNode(this);
- scaDomain.destroy();
-
- // node runtime is stopped by the domain proxy once it has
- // removed the management components
-
- scaDomain = null;
- nodeRuntime = null;
- contributions = null;
- composites = null;
- compositeFiles = null;
-
- } catch(NodeException ex) {
- throw ex;
- } catch (Exception ex) {
- throw new NodeException(ex);
- }
- }
-
- public String getURI(){
- return nodeURI;
- }
-
- public SCADomain getDomain(){
- return scaDomain;
- }
-
- public void addContribution(String contributionURI, URL contributionURL)
throws NodeException {
- addContribution(contributionURI, contributionURL, null);
- }
-
- public void addContribution(String contributionURI, URL contributionURL,
ClassLoader contributionClassLoader ) throws NodeException {
+ public void addContributionFromDomain(String contributionURI, URL
contributionURL, ClassLoader contributionClassLoader ) throws NodeException {
if (nodeStarted){
throw new NodeException("Can't add contribution " +
contributionURI + " when the node is running. Call stop() on the node first");
@@ -387,17 +331,13 @@
compositeFiles.put(composite.getURI(), composite);
}
}
-
- // add the contribution to the domain. It will generally already
be there
- // unless the contribution has been added to the node itself.
- scaDomain.registerContribution(nodeURI, contributionURI,
contributionURL.toExternalForm());
-
+
} catch (Exception ex) {
throw new NodeException(ex);
}
- }
-
- public void removeContribution(String contributionURI) throws
NodeException {
+ }
+
+ public void removeContributionFromDomain(String contributionURI) throws
NodeException {
if (nodeStarted){
throw new NodeException("Can't remove contribution " +
contributionURI + " when the node is running. Call stop() on the node first");
@@ -433,7 +373,125 @@
}
// remove the local record of the contribution
- contributions.remove(contributionURI);
+ contributions.remove(contributionURI);
+
+ } catch (Exception ex) {
+ throw new NodeException(ex);
+ }
+ }
+
+ public void addToDomainLevelCompositeFromDomain(QName compositeQName)
throws NodeException {
+
+ if (nodeStarted){
+ throw new NodeException("Can't add composite " +
compositeQName.toString() + " when the node is running. Call stop() on the node
first");
+ }
+
+ // if no composite name is specified add all deployable composites
+ // to the domain
+ if (compositeQName == null){
+ for (Composite composite : composites.values()) {
+ if (!nodeComposite.getIncludes().contains(composite)) {
+ nodeComposite.getIncludes().add(composite);
+ }
+ }
+ } else {
+ Composite composite = composites.get(compositeQName);
+
+ if (composite == null) {
+ throw new NodeException("Composite " +
compositeQName.toString() + " not found" );
+ }
+
+ // if the named composite is not already in the list then deploy it
+ if (!nodeComposite.getIncludes().contains(composite)) {
+ nodeComposite.getIncludes().add(composite);
+ }
+ }
+ }
+
+ // SCANode API methods
+
+ public void start() throws NodeException {
+ if ((!nodeStarted) && (nodeComposite.getIncludes().size() > 0)){
+ startFromDomain();
+
+ try {
+ scaDomain.registerNodeStart(nodeURI);
+ } catch (Exception ex) {
+ throw new NodeException(ex);
+ }
+ }
+ }
+
+ public void stop() throws NodeException {
+ if (nodeStarted){
+ stopFromDomain();
+
+ try {
+ scaDomain.registerNodeStop(nodeURI);
+ } catch (Exception ex) {
+ throw new NodeException(ex);
+ }
+ }
+ }
+
+ public void destroy() throws NodeException {
+ try {
+ stop();
+
+ removeAllContributions();
+
+ ModelFactoryExtensionPoint factories =
nodeRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class);
+ factories.removeFactory(nodeFactory);
+ nodeFactory.setNode(null);
+
+ scaDomain.removeNode(this);
+ scaDomain.destroy();
+
+ // node runtime is stopped by the domain proxy once it has
+ // removed the management components
+
+ scaDomain = null;
+ nodeRuntime = null;
+ contributions = null;
+ composites = null;
+ compositeFiles = null;
+
+ } catch(NodeException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ throw new NodeException(ex);
+ }
+ }
+
+ public String getURI(){
+ return nodeURI;
+ }
+
+ public SCADomain getDomain(){
+ return scaDomain;
+ }
+
+ public void addContribution(String contributionURI, URL contributionURL)
throws NodeException {
+ addContribution(contributionURI, contributionURL, null);
+ }
+
+ public void addContribution(String contributionURI, URL contributionURL,
ClassLoader contributionClassLoader ) throws NodeException {
+
+ try {
+ addContributionFromDomain(contributionURI, contributionURL,
contributionClassLoader);
+
+ // add the contribution to the domain.
+ scaDomain.registerContribution(nodeURI, contributionURI,
contributionURL.toExternalForm());
+
+ } catch (Exception ex) {
+ throw new NodeException(ex);
+ }
+ }
+
+ public void removeContribution(String contributionURI) throws
NodeException {
+
+ try {
+ removeContributionFromDomain(contributionURI);
// remove the contribution from the domain. It will generally
already be removed
// unless the contribution has been removed from the node itself.
@@ -442,7 +500,6 @@
} catch (Exception ex) {
throw new NodeException(ex);
}
-
}
private void removeAllContributions() throws NodeException {
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java?rev=604921&r1=604920&r2=604921&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
Mon Dec 17 08:40:31 2007
@@ -70,26 +70,26 @@
public void addContribution(String contributionURI, String
contributionURL) throws NodeException {
try {
- node.addContribution(contributionURI, new URL(contributionURL));
+ node.addContributionFromDomain(contributionURI, new
URL(contributionURL), null);
} catch (MalformedURLException ex){
throw new NodeException(ex);
}
}
public void removeContribution(String contributionURI) throws
NodeException {
- node.removeContribution(contributionURI);
+ node.removeContributionFromDomain(contributionURI);
}
public void addToDomainLevelComposite(String compositeName) throws
NodeException {
- node.addToDomainLevelComposite(QName.valueOf(compositeName));
+
node.addToDomainLevelCompositeFromDomain(QName.valueOf(compositeName));
}
public void start() throws NodeException {
- node.start();
+ node.startFromDomain();
}
public void stop() throws NodeException {
- node.stop();
+ node.stopFromDomain();
}
public void destroyNode() throws NodeException {
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java?rev=604921&r1=604920&r2=604921&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainAPITestCase.java
Mon Dec 17 08:40:31 2007
@@ -78,7 +78,7 @@
domain.destroy();
}
- //@Test
+ @Test
public void testAddContribution() throws Exception {
try {
domain.addContribution("nodeD", cl.getResource("nodeD/"));
@@ -99,7 +99,7 @@
}
}
- //@Test
+ @Test
public void testAddDependentContribution() throws Exception {
try {
domain.addContribution("dependent",
cl.getResource("calculatordependent/"));
@@ -131,8 +131,10 @@
domain.startComposite(new QName("http://sample";, "CalculatorA"));
domain.startComposite(new QName("http://sample";, "CalculatorB"));
- Assert.assertEquals("<composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
targetNamespace=\"http://tuscany.apache.org/domain\";
xmlns:domain=\"http://tuscany.apache.org/domain\";
xmlns:include0=\"http://sample\"; xmlns:include1=\"http://sample\";
name=\"DomainLevelComposite\"><include name=\"include0:CalculatorA\"/><include
name=\"include1:CalculatorB\"/></composite>",
+/* The order of includes is variable so difficult to test
+ Assert.assertEquals("<composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
targetNamespace=\"http://tuscany.apache.org/domain\";
xmlns:domain=\"http://tuscany.apache.org/domain\";
xmlns:include0=\"http://sample\"; xmlns:include1=\"http://sample\";
name=\"DomainLevelComposite\"><include name=\"include0:CalculatorB\"/><include
name=\"include1:CalculatorA\"/></composite>",
domain.getDomainLevelComposite());
+*/
calculatorService = domain.getService(CalculatorService.class,
"CalculatorServiceComponentA");
Modified:
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java?rev=604921&r1=604920&r2=604921&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
(original)
+++
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
Mon Dec 17 08:40:31 2007
@@ -19,6 +19,10 @@
package org.apache.tuscany.sca.node;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
/**
* The SPI for a node
*
@@ -27,4 +31,14 @@
public interface SCANodeSPI {
public Object getNodeRuntime();
+
+ public void startFromDomain() throws NodeException;
+
+ public void stopFromDomain() throws NodeException;
+
+ public void addContributionFromDomain(String contributionURI, URL
contributionURL, ClassLoader contributionClassLoader ) throws NodeException;
+
+ public void removeContributionFromDomain(String contributionURI) throws
NodeException;
+
+ public void addToDomainLevelCompositeFromDomain(QName compositeQName)
throws NodeException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
