Author: antelder
Date: Sat May 16 08:03:50 2009
New Revision: 775426
URL: http://svn.apache.org/viewvc?rev=775426&view=rev
Log:
Decouple node-impl from sca-client-impl
Added:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
Modified:
tuscany/java/sca/itest/scaclient-api/pom.xml
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF
tuscany/java/sca/modules/node-impl/pom.xml
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/java/sca/modules/sca-client-impl/pom.xml
tuscany/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
Modified: tuscany/java/sca/itest/scaclient-api/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/scaclient-api/pom.xml?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
--- tuscany/java/sca/itest/scaclient-api/pom.xml (original)
+++ tuscany/java/sca/itest/scaclient-api/pom.xml Sat May 16 08:03:50 2009
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-sca-client-impl</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Added:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java?rev=775426&view=auto
==============================================================================
---
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
(added)
+++
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
Sat May 16 08:03:50 2009
@@ -0,0 +1,42 @@
+/*
+ * 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 org.apache.tuscany.sca.node;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+public class NodeFinder {
+
+ private static Map<URI, Node> nodes = new HashMap<URI, Node>();
+
+ public static void addNode(URI domainName, Node node) {
+ nodes.put(domainName, node);
+ }
+
+ public static Node removeNode(URI domainName) {
+ return nodes.remove(domainName);
+ }
+
+ public static Node getNode(URI domainURI) {
+ return nodes.get(domainURI);
+ }
+
+}
Modified:
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
(original)
+++
tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
Sat May 16 08:03:50 2009
@@ -37,7 +37,7 @@
*/
public class NodeConfigurationImpl implements NodeConfiguration {
private String uri;
- private String domainURI;
+ private String domainURI = "default";
private List<ContributionConfiguration> contributions = new
ArrayList<ContributionConfiguration>();
private List<BindingConfiguration> bindings = new
ArrayList<BindingConfiguration>();
Modified: tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF Sat May 16 08:03:50
2009
@@ -22,7 +22,6 @@
org.apache.tuscany.sca.assembly;version="2.0.0",
org.apache.tuscany.sca.assembly.builder;version="2.0.0",
org.apache.tuscany.sca.assembly.xml;version="2.0.0",
- org.apache.tuscany.sca.client.impl;version="2.0.0",
org.apache.tuscany.sca.contribution;version="2.0.0",
org.apache.tuscany.sca.contribution.processor;version="2.0.0",
org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
Modified: tuscany/java/sca/modules/node-impl/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/pom.xml?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/pom.xml (original)
+++ tuscany/java/sca/modules/node-impl/pom.xml Sat May 16 08:03:50 2009
@@ -71,13 +71,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Sat May 16 08:03:50 2009
@@ -52,7 +52,6 @@
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
-import org.apache.tuscany.sca.client.impl.SCAClientImpl;
import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.ContributionFactory;
@@ -92,6 +91,7 @@
import org.apache.tuscany.sca.monitor.Problem.Severity;
import org.apache.tuscany.sca.node.Client;
import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFinder;
import org.apache.tuscany.sca.node.configuration.ContributionConfiguration;
import org.apache.tuscany.sca.node.configuration.DeploymentComposite;
import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
@@ -140,6 +140,8 @@
private WorkScheduler workScheduler;
private Contribution systemContribution;
private Definitions systemDefinitions;
+
+ private URI domainURI;
NodeImpl(NodeConfiguration configuration) {
logger.log(Level.INFO, "Creating node: " + configuration.getURI());
@@ -284,6 +286,9 @@
}
private void configureNode(NodeConfiguration configuration) throws
Exception {
+
+ domainURI = URI.create(configuration.getDomainURI());
+
List<Contribution> contributions = new ArrayList<Contribution>();
// Load the specified contributions
@@ -548,7 +553,7 @@
compositeActivator.start(composite);
}
- SCAClientImpl.addDomain(getDomainName(), this);
+ NodeFinder.addNode(domainURI, this);
return this;
@@ -563,7 +568,7 @@
try {
- SCAClientImpl.removeDomain(getDomainName());
+ NodeFinder.removeNode(domainURI);
List<Composite> composites =
compositeActivator.getDomainComposite().getIncludes();
for (Composite composite : composites) {
@@ -582,16 +587,6 @@
}
- private URI getDomainName() {
- URI domainName;
- if (configurationName != null) {
- domainName = URI.create(configurationName);
- } else {
- domainName = URI.create("default");
- }
- return domainName;
- }
-
public void destroy() {
// Stop the runtime modules
for (ModuleActivator moduleActivator : moduleActivators) {
Modified: tuscany/java/sca/modules/sca-client-impl/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-client-impl/pom.xml?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-client-impl/pom.xml (original)
+++ tuscany/java/sca/modules/sca-client-impl/pom.xml Sat May 16 08:03:50 2009
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java?rev=775426&r1=775425&r2=775426&view=diff
==============================================================================
---
tuscany/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
(original)
+++
tuscany/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
Sat May 16 08:03:50 2009
@@ -20,28 +20,17 @@
package org.apache.tuscany.sca.client.impl;
import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFinder;
import org.oasisopen.sca.NoSuchDomainException;
import org.oasisopen.sca.NoSuchServiceException;
import org.oasisopen.sca.client.SCAClient;
public class SCAClientImpl implements SCAClient {
- private static Map<URI, Node> nodes = new HashMap<URI, Node>();
-
- public static void addDomain(URI domainName, Node node) {
- nodes.put(domainName, node);
- }
-
- public static Node removeDomain(URI domainName) {
- return nodes.remove(domainName);
- }
-
public <T> T getService(Class<T> serviceInterface, String serviceName, URI
domainURI) throws NoSuchServiceException, NoSuchDomainException {
- Node node = nodes.get(domainURI);
+ Node node = NodeFinder.getNode(domainURI);
if (node == null) {
throw new NoSuchDomainException(domainURI.toString());
}
