You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/01/08 10:30:17 UTC
svn commit: r897143 -
/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
Author: antelder
Date: Fri Jan 8 09:30:16 2010
New Revision: 897143
URL: http://svn.apache.org/viewvc?rev=897143&view=rev
Log:
Allow starting an empty node (with no contributions) so its possible to configure and start a shared endpoint registry that gets reused by subsequent nodes taht are started with the in-VM scheme
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java?rev=897143&r1=897142&r2=897143&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java Fri Jan 8 09:30:16 2010
@@ -62,8 +62,12 @@
this.domainRegistryURI = configURI;
initDomainName(configURI);
nodeFactory = NodeFactory.getInstance(domainName);
- for (String loc : contributionLocations) {
- addContribution(loc);
+ if (contributionLocations == null || contributionLocations.length == 0) {
+ addContribution(null, "_null");
+ } else {
+ for (String loc : contributionLocations) {
+ addContribution(loc);
+ }
}
}
@@ -84,7 +88,9 @@
throw new IllegalArgumentException("contribution already added: " + uri);
}
NodeConfiguration configuration = nodeFactory.createNodeConfiguration();
- configuration.addContribution(uri, location);
+ if (location != null) {
+ configuration.addContribution(uri, location);
+ }
configuration.setDomainRegistryURI(domainRegistryURI);
configuration.setDomainURI(domainName);
configuration.setURI(uri); //???
@@ -145,7 +151,18 @@
// if (dn == null || dn.length() < 1) {
// dn = DEFAULT_DOMAIN_NAME;
// }
- domainName = configURI;
+ if (configURI.startsWith("tuscany:vm:")) {
+ domainName = configURI.substring("tuscany:vm:".length());
+ } else if (configURI.startsWith("tuscany:")) {
+ int i = configURI.indexOf('?');
+ if (i == -1) {
+ domainName = configURI.substring("tuscany:".length());
+ } else{
+ domainName = configURI.substring("tuscany:".length(), i);
+ }
+ } else {
+ domainName = configURI;
+ }
}
/**