Author: jmarino
Date: Sun Dec 3 20:41:50 2006
New Revision: 482067
URL: http://svn.apache.org/viewvc?view=rev&rev=482067
Log:
more initialization fixes for webapp; fix problem where system composites where
not being set as system SCAObject types by the composite builder
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/bootstrap/DefaultRuntimeTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java?view=diff&rev=482067&r1=482066&r2=482067
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
Sun Dec 3 20:41:50 2006
@@ -75,23 +75,23 @@
return systemComponent.resolveExternalInstance(Deployer.class);
}
- public void start() {
- super.start();
- if (rootComponent != null) {
- rootComponent.start();
- }
- if (systemComponent != null) {
- systemComponent.start();
- }
- }
+// public void start() {
+// super.start();
+// if (rootComponent != null) {
+// rootComponent.start();
+// }
+// if (systemComponent != null) {
+// systemComponent.start();
+// }
+// }
- public void stop() {
- if (rootComponent != null) {
- rootComponent.stop();
- }
- if (systemComponent != null) {
- systemComponent.stop();
- }
- super.stop();
- }
+// public void stop() {
+// if (rootComponent != null) {
+// rootComponent.stop();
+// }
+// if (systemComponent != null) {
+// systemComponent.stop();
+// }
+// super.stop();
+// }
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java?view=diff&rev=482067&r1=482066&r2=482067
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
Sun Dec 3 20:41:50 2006
@@ -32,6 +32,7 @@
*/
public class CompositeComponentImpl extends AbstractCompositeComponent {
private String uri;
+ private boolean systemComposite;
public CompositeComponentImpl(String name,
CompositeComponent parent,
@@ -40,6 +41,13 @@
this(name, null, parent, connector, propertyValues);
}
+ public CompositeComponentImpl(String name,
+ CompositeComponent parent,
+ Connector connector,
+ boolean systemComposite) {
+ this(name, null, parent, connector, null, systemComposite);
+ }
+
/**
* Constructor specifying name and URI.
*
@@ -58,8 +66,33 @@
this.uri = uri;
}
+ /**
+ * Constructor specifying name and URI.
+ *
+ * @param name the name of this Component
+ * @param uri the unique identifier for this component
+ * @param parent this component's parent
+ * @param connector
+ * @param propertyValues this composite's Property values
+ * @param systemComposite true if the composite is a system composite
+ */
+ public CompositeComponentImpl(String name,
+ String uri,
+ CompositeComponent parent,
+ Connector connector,
+ Map<String, Document> propertyValues,
+ boolean systemComposite) {
+ super(name, parent, connector, propertyValues);
+ this.uri = uri;
+ this.systemComposite = systemComposite;
+ }
+
public String getURI() {
return uri;
+ }
+
+ public boolean isSystem() {
+ return systemComposite;
}
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?view=diff&rev=482067&r1=482066&r2=482067
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
Sun Dec 3 20:41:50 2006
@@ -94,7 +94,7 @@
// create the composite component
String name = componentDefinition.getName();
- CompositeComponent component = new CompositeComponentImpl(name,
parent, connector, null);
+ CompositeComponent component = new CompositeComponentImpl(name,
parent, connector, true);
for (ComponentDefinition<? extends Implementation>
childComponentDefinition : allComponents) {
component.register(builderRegistry.build(component,
childComponentDefinition, deploymentContext));
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java?view=diff&rev=482067&r1=482066&r2=482067
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
Sun Dec 3 20:41:50 2006
@@ -79,16 +79,16 @@
// create and start the core runtime
runtime = bootstrapper.createRuntime();
- runtime.start(); // REVIEW: is this redundant w/ the composite.start()
call below?
+ runtime.start();
// initialize the runtime info
CompositeComponent parent = runtime.getSystemComponent();
RuntimeInfo runtimeInfo = new
LauncherRuntimeInfo(getInstallDirectory(), getApplicationRootDirectory(), true);
parent.registerJavaObject("RuntimeInfo", RuntimeInfo.class,
runtimeInfo);
- // registory the monitor factory
+ // register the monitor factory
parent.registerJavaObject("MonitorFactory", MonitorFactory.class,
monitor);
-
+ parent.start();
// create a ComponentDefinition to represent the component we are
going to deploy
SystemCompositeImplementation moduleImplementation = new
SystemCompositeImplementation();
moduleImplementation.setScdlLocation(systemScdl);
@@ -104,6 +104,7 @@
composite.start();
deployer = (Deployer)
composite.getSystemChild("deployer").getServiceInstance();
+ runtime.getRootComponent().start();
}
/**
Modified:
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java?view=diff&rev=482067&r1=482066&r2=482067
==============================================================================
---
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
(original)
+++
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
Sun Dec 3 20:41:50 2006
@@ -134,7 +134,7 @@
if (getApplicationScdl() == null) {
throw new TuscanyInitException("Could not find application
SCDL");
}
-
+ runtime.getRootComponent().start();
application = deployApplicationScdl(deployer,
runtime.getRootComponent(),
getApplicationName(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
