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/07/06 13:54:14 UTC
svn commit: r960881 - in /tuscany/sca-java-2.x/trunk/modules:
domain-node/src/main/java/org/apache/tuscany/sca/node2/
endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/
shell/src/main/java/org/apache/tuscany/sca/shell/
Author: antelder
Date: Tue Jul 6 11:54:14 2010
New Revision: 960881
URL: http://svn.apache.org/viewvc?rev=960881&view=rev
Log:
Update to configure the registry from the domainURI
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java?rev=960881&r1=960880&r2=960881&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java Tue Jul 6 11:54:14 2010
@@ -95,8 +95,9 @@ public class NodeFactory {
}
public Node createNode(String domainURI) {
- EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry("default", domainURI);
- return new NodeImpl(domainURI, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null);
+ String domainName = getDomainName(domainURI);
+ EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry(domainURI, domainName);
+ return new NodeImpl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry, null);
}
protected Node createOneoffNode() {
@@ -152,4 +153,14 @@ public class NodeFactory {
public AssemblyFactory getAssemblyFactory() {
return assemblyFactory;
}
+
+ private String getDomainName(String domainURI) {
+ int scheme = domainURI.indexOf(':');
+ int qm = domainURI.indexOf('?');
+ if (qm == -1) {
+ return domainURI.substring(scheme+1);
+ } else {
+ return domainURI.substring(scheme+1, qm);
+ }
+ }
}
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java?rev=960881&r1=960880&r2=960881&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java Tue Jul 6 11:54:14 2010
@@ -32,7 +32,7 @@ import org.apache.tuscany.sca.runtime.Ru
* given domain
*/
public class HazelcastDomainRegistryFactory extends BaseDomainRegistryFactory {
- private final static String[] schemes = new String[] {"multicast", "wka", "tuscany", "hazelcast"};
+ private final static String[] schemes = new String[] {"multicast", "wka", "tuscany", "hazelcast", "uri"};
public HazelcastDomainRegistryFactory(ExtensionPointRegistry registry) {
super(registry);
Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=960881&r1=960880&r2=960881&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Tue Jul 6 11:54:14 2010
@@ -55,18 +55,28 @@ public class Shell {
Node node;
private boolean useJline;
final List<String> history = new ArrayList<String>();
+ private NodeFactory factory;
static final String[] COMMANDS = new String[] {"addDeploymentComposite", "addToDomainLevelComposite", "help",
"install", "installed", "listDeployedCompostes", "listInstalledContributions",
"printDomainLevelComposite", "removeFromDomainLevelComposite",
"remove", "start", "status", "stop"};
public static void main(final String[] args) throws Exception {
- boolean useJline = !Arrays.asList(args).contains("-nojline");
- new Shell(args.length > 0 ? args[0] : "default", useJline).run();
+ boolean useJline = true;
+ String domainURI = "default";
+ for (String s : args) {
+ if ("-nojline".equals(s)) {
+ useJline = false;
+ } else {
+ domainURI = s;
+ }
+ }
+ new Shell(domainURI, useJline).run();
}
public Shell(String domainURI, boolean useJLine) {
- this.node = NodeFactory.newInstance().createNode(domainURI);
+ this.factory = NodeFactory.newInstance();
+ this.node = factory.createNode(domainURI);
this.useJline = useJLine;
}
@@ -212,6 +222,7 @@ public class Shell {
boolean stop(List<String> toks) throws ActivationException {
if (toks == null || toks.size() < 2) {
node.stop();
+ factory.stop();
return false;
}
String curi = toks.get(1);