Author: antelder
Date: Mon Jun 13 21:39:56 2011
New Revision: 1135297
URL: http://svn.apache.org/viewvc?rev=1135297&view=rev
Log:
Update for to use the domain uri and name from the registry and to use the
domain name in the binding base uri for non-default domains
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/DependencyUtilsTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java?rev=1135297&r1=1135296&r2=1135297&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
Mon Jun 13 21:39:56 2011
@@ -104,7 +104,7 @@ public class TuscanyRuntime {
TuscanyRuntime runtime = newInstance();
String domain = domainURI == null ? "default" :
domainURI.toString();
DomainRegistry domainRegistry =
runtime.domainRegistryFactory.getEndpointRegistry(domain,
getDomainName(domain));
- NodeImpl node = new NodeImpl(domain, runtime.deployer,
runtime.compositeActivator, domainRegistry, runtime.extensionPointRegistry,
runtime);
+ NodeImpl node = new NodeImpl(runtime.deployer,
runtime.compositeActivator, domainRegistry, runtime.extensionPointRegistry,
runtime);
if (dependentContributionURLs != null) {
for (int i=dependentContributionURLs.length-1; i>-1; i--) {
@@ -150,7 +150,7 @@ public class TuscanyRuntime {
domainName = getDomainName(domainURI);
}
DomainRegistry domainRegistry =
domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
- return new NodeImpl(domainName, deployer, compositeActivator,
domainRegistry, extensionPointRegistry, null);
+ return new NodeImpl(deployer, compositeActivator, domainRegistry,
extensionPointRegistry, null);
}
/**
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java?rev=1135297&r1=1135296&r2=1135297&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
Mon Jun 13 21:39:56 2011
@@ -88,8 +88,8 @@ public class DeployedComposite {
// TODO: don't hardcode the default domain name, instead do something
like having a property on Node that says whether or not the
// domain name should be included in the service uri
- if (!"default".equals(domainRegistry.getDomainURI())) {
- bs.put(new QName("default"), Arrays.asList(new
String[]{domainRegistry.getDomainURI()}));
+ if (!"default".equals(domainRegistry.getDomainName())) {
+ bs.put(new QName("default"), Arrays.asList(new
String[]{domainRegistry.getDomainName()}));
}
builtComposite = deployer.build(contributions,
dependedOnContributions, bs, monitor);
// TODO: Ideally deployer.build would set the name and uri to what
this needs
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java?rev=1135297&r1=1135296&r2=1135297&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
Mon Jun 13 21:39:56 2011
@@ -57,7 +57,6 @@ import org.oasisopen.sca.NoSuchServiceEx
public class NodeImpl implements Node {
- private String domainName;
private Deployer deployer;
private CompositeActivator compositeActivator;
private DomainRegistry domainRegistry;
@@ -69,13 +68,11 @@ public class NodeImpl implements Node {
private Map<String, DeployedComposite> startedComposites = new
HashMap<String, DeployedComposite>();
private Map<String, DeployedComposite> stoppedComposites = new
HashMap<String, DeployedComposite>();
- public NodeImpl(String domainName,
- Deployer deployer,
+ public NodeImpl(Deployer deployer,
CompositeActivator compositeActivator,
DomainRegistry domainRegistry,
ExtensionPointRegistry extensionPointRegistry,
TuscanyRuntime tuscanyRuntime) {
- this.domainName = domainName;
this.deployer = deployer;
this.compositeActivator = compositeActivator;
this.domainRegistry = domainRegistry;
@@ -250,7 +247,7 @@ public class NodeImpl implements Node {
@Override
public void startComposite(String contributionURI, String compositeURI,
String nodeName) throws ActivationException {
- String response = domainRegistry.remoteCommand(nodeName, new
RemoteCommand(domainName, "start", contributionURI, compositeURI));
+ String response = domainRegistry.remoteCommand(nodeName, new
RemoteCommand(domainRegistry.getDomainName(), "start", contributionURI,
compositeURI));
if (!"Started.".equals(response)) {
throw new ActivationException(response);
}
@@ -269,7 +266,7 @@ public class NodeImpl implements Node {
if (member == null) {
throw new IllegalStateException("composite not started: " +
compositeURI);
}
- RemoteCommand command = new RemoteCommand(domainName, "stop",
contributionURI, compositeURI);
+ RemoteCommand command = new
RemoteCommand(domainRegistry.getDomainName(), "stop", contributionURI,
compositeURI);
String response = domainRegistry.remoteCommand(member, command);
if (!"Stopped.".equals(response)) {
throw new ActivationException(response);
@@ -278,7 +275,7 @@ public class NodeImpl implements Node {
}
public String getDomainName() {
- return domainName;
+ return domainRegistry.getDomainName();
}
public Composite getDomainComposite() {
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/DependencyUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/DependencyUtilsTestCase.java?rev=1135297&r1=1135296&r2=1135297&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/DependencyUtilsTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/DependencyUtilsTestCase.java
Mon Jun 13 21:39:56 2011
@@ -58,5 +58,4 @@ public class DependencyUtilsTestCase {
contributions.put("unrelated", new ZipInputStream(new
BufferedInputStream(new
FileInputStream("src/test/resources/sample-helloworld-nodeployable.jar"))));
return contributions;
}
-
}
