You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/01/10 22:03:21 UTC
svn commit: r494983 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/runtime/
kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/
plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/
runt...
Author: jboynes
Date: Wed Jan 10 13:03:19 2007
New Revision: 494983
URL: http://svn.apache.org/viewvc?view=rev&rev=494983
Log:
remove createDefaultMonitorFactory
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Wed Jan 10 13:03:19 2007
@@ -48,6 +48,14 @@
private MonitorFactory monitorFactory;
private ManagementService<?> managementService;
+ protected AbstractRuntime() {
+ this(new NullMonitorFactory());
+ }
+
+ protected AbstractRuntime(MonitorFactory monitorFactory) {
+ this.monitorFactory = monitorFactory;
+ }
+
public URL getSystemScdl() {
return systemScdl;
}
@@ -110,10 +118,6 @@
public void setManagementService(ManagementService<?> managementService) {
this.managementService = managementService;
- }
-
- public MonitorFactory createDefaultMonitorFactory() {
- return new NullMonitorFactory();
}
protected CompositeComponent deploySystemScdl(Deployer deployer,
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/runtime/TuscanyRuntime.java Wed Jan 10 13:03:19 2007
@@ -89,13 +89,6 @@
void setMonitorFactory(MonitorFactory monitorFactory);
/**
- * Create the default MonitorFactory for this runtime.
- *
- * @return the default MonitorFactory for this runtime
- */
- MonitorFactory createDefaultMonitorFactory();
-
- /**
* Sets the ManagementService that this runtime should use.
*
* @param managementService the ManagementService that this runtime should use
Modified: incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java (original)
+++ incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java Wed Jan 10 13:03:19 2007
@@ -254,7 +254,6 @@
}
}
- runtime.setMonitorFactory(runtime.createDefaultMonitorFactory());
runtime.setSystemScdl(systemScdl);
runtime.setHostClassLoader(hostClassLoader);
Modified: incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java Wed Jan 10 13:03:19 2007
@@ -133,7 +133,6 @@
Class<?> implClass = Class.forName(className, true, bootClassLoader);
TuscanyRuntime runtime = (TuscanyRuntime) implClass.newInstance();
- runtime.setMonitorFactory(runtime.createDefaultMonitorFactory());
runtime.setHostClassLoader(hostClassLoader);
runtime.setSystemScdl(systemSCDL);
runtime.setRuntimeInfo(runtimeInfo);
Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java Wed Jan 10 13:03:19 2007
@@ -219,7 +219,6 @@
runtimeInfo.getProperty("tuscany.launcherClass",
"org.apache.tuscany.runtime.standalone.host.StandaloneRuntimeImpl");
final TuscanyRuntime runtime = (TuscanyRuntime) Beans.instantiate(bootClassLoader, className);
- runtime.setMonitorFactory(runtime.createDefaultMonitorFactory());
runtime.setSystemScdl(systemScdl);
runtime.setHostClassLoader(hostClassLoader);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java Wed Jan 10 13:03:19 2007
@@ -66,7 +66,6 @@
String name = utils.getApplicationName();
runtime.setServletContext(servletContext);
- runtime.setMonitorFactory(runtime.createDefaultMonitorFactory());
runtime.setRuntimeInfo(info);
runtime.setHostClassLoader(webappClassLoader);
runtime.setSystemScdl(systemScdl);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java?view=diff&rev=494983&r1=494982&r2=494983
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java Wed Jan 10 13:03:19 2007
@@ -64,8 +64,6 @@
expect(listener.getUtils(context)).andReturn(utils);
replay(listener);
runtime.setServletContext(context);
- expect(runtime.createDefaultMonitorFactory()).andReturn(monitorFactory);
- runtime.setMonitorFactory(monitorFactory);
runtime.setRuntimeInfo(isA(WebappRuntimeInfo.class));
runtime.setHostClassLoader(cl);
runtime.setSystemScdl(systemUrl);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org