You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/18 23:50:50 UTC
svn commit: r539613 - in
/incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src:
main/java/org/apache/tuscany/sca/host/embedded/impl/
test/java/org/apache/tuscany/sca/host/embedded/impl/ test/resources/
Author: jsdelfino
Date: Fri May 18 14:50:49 2007
New Revision: 539613
URL: http://svn.apache.org/viewvc?view=rev&rev=539613
Log:
Merged changed from trunk: Cleaned up EmbeddedSCADomain, and added a test case for it.
Added:
incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
- copied unchanged from r539562, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
- copied unchanged from r539562, incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/test/resources/test.txt
- copied unchanged from r539562, incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/test.txt
Modified:
incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
Modified: incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java?view=diff&rev=539613&r1=539612&r2=539613
==============================================================================
--- incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (original)
+++ incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java Fri May 18 14:50:49 2007
@@ -107,38 +107,41 @@
/**
* Constructs a new domain facade.
- *
+ *
+ * @param runtimeClassLoader
* @param domainURI
- * @param contributionLocation
- * @param composites
*/
public EmbeddedSCADomain(ClassLoader runtimeClassLoader,
String domainURI) {
this.uri = domainURI;
-
- // Create an in-memory domain level composite
- AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
- domainComposite = assemblyFactory.createComposite();
- domainComposite.setName(new QName(Constants.SCA_NS, "domain"));
- domainComposite.setURI(domainURI);
- domainCompositeHelper = new DomainCompositeHelper();
-
- // Create the runtime
+ // Create a runtime
runtime = new ReallySmallRuntime(runtimeClassLoader);
-
- // Index the top level components
- for (Component component : domainComposite.getComponents()) {
- components.put(component.getName(), component);
- }
}
public void start() throws ActivationException {
+
+ // Start the runtime
runtime.start();
+
+ // Create an in-memory domain level composite
+ AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
+ domainComposite = assemblyFactory.createComposite();
+ domainComposite.setName(new QName(Constants.SCA_NS, "domain"));
+ domainComposite.setURI(uri);
+
+ // Create a domain composite helper
+ domainCompositeHelper = new DomainCompositeHelper();
}
public void stop() throws ActivationException {
+
+ // Stop the runtime
runtime.stop();
+
+ // Cleanup
+ domainComposite = null;
+ domainCompositeHelper = null;
}
public ContributionService getContributionService() {
Modified: incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java?view=diff&rev=539613&r1=539612&r2=539613
==============================================================================
--- incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java Fri May 18 14:50:49 2007
@@ -118,7 +118,15 @@
// Stop and destroy the work manager
workManager.destroy();
-
+
+ // Cleanup
+ modules = null;
+ registry = null;
+ assemblyFactory = null;
+ contributionService = null;
+ compositeActivator = null;
+ workManager = null;
+ scopeRegistry = null;
}
public ContributionService getContributionService() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org