You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/07/30 22:37:07 UTC
svn commit: r681196 - in /tuscany/java/sca/modules/domain-manager: pom.xml
src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
Author: rfeng
Date: Wed Jul 30 13:37:07 2008
New Revision: 681196
URL: http://svn.apache.org/viewvc?rev=681196&view=rev
Log:
Switch to SCANode2 API
Modified:
tuscany/java/sca/modules/domain-manager/pom.xml
tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
Modified: tuscany/java/sca/modules/domain-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/pom.xml?rev=681196&r1=681195&r2=681196&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/pom.xml (original)
+++ tuscany/java/sca/modules/domain-manager/pom.xml Wed Jul 30 13:37:07 2008
@@ -67,9 +67,17 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node2-api</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node2-impl</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java?rev=681196&r1=681195&r2=681196&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java (original)
+++ tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java Wed Jul 30 13:37:07 2008
@@ -20,8 +20,9 @@
package org.apache.tuscany.sca.domain.manager.launcher;
import org.apache.tuscany.sca.domain.manager.impl.DomainManagerConfiguration;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
/**
* Bootstrap class for the SCA domain manager.
@@ -37,7 +38,7 @@
public static class NodeFacade implements SCANode2 {
private ClassLoader threadContextClassLoader;
private ClassLoader runtimeClassLoader;
- private SCADomain domainManager;
+ private SCANode2 node;
private String rootDirectory;
private NodeFacade(String rootDirectory) {
@@ -50,10 +51,12 @@
boolean started = false;
try {
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
- domainManager = SCADomain.newInstance("DomainManager.composite");
+ SCANode2Factory factory = SCANode2Factory.newInstance();
+ node = factory.createSCANodeFromClassLoader("DomainManager.composite", getClass().getClassLoader());
+ node.start();
// Set the domain manager's root directory
- DomainManagerConfiguration domainManagerConfiguration = domainManager.getService(DomainManagerConfiguration.class, "DomainManagerConfigurationComponent");
+ DomainManagerConfiguration domainManagerConfiguration = ((SCAClient) node).getService(DomainManagerConfiguration.class, "DomainManagerConfigurationComponent");
domainManagerConfiguration.setRootDirectory(rootDirectory);
started = true;
@@ -67,7 +70,7 @@
public void stop() {
try {
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
- domainManager.close();
+ node.stop();
} finally {
Thread.currentThread().setContextClassLoader(threadContextClassLoader);
}