Author: jboynes
Date: Tue Apr 11 17:47:25 2006
New Revision: 393350
URL: http://svn.apache.org/viewcvs?rev=393350&view=rev
Log:
SystemCompositeContext does not need special support for wiring to a monitor
factory
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java?rev=393350&r1=393349&r2=393350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
Tue Apr 11 17:47:25 2006
@@ -88,8 +88,7 @@
rootContext = new CompositeContextImpl(ROOT, this, this, new
RuntimeScopeStrategy(), new EventContextImpl(), this,
monitorFactory);
- systemContext = new SystemCompositeContextImpl(SYSTEM, this, this, new
SystemScopeStrategy(), new EventContextImpl(),
- this, monitorFactory);
+ systemContext = new SystemCompositeContextImpl(SYSTEM, this, this, new
SystemScopeStrategy(), new EventContextImpl(), this);
}
/**
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java?rev=393350&r1=393349&r2=393350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
Tue Apr 11 17:47:25 2006
@@ -101,10 +101,6 @@
@Autowire(required = false)
protected ConfigurationContext configurationContext;
- // The system monitor factory
- @Autowire(required = false)
- protected MonitorFactory monitorFactory;
-
// The logical model representing the module assembly
// protected ModuleComponent moduleComponent;
protected Module module;
@@ -159,8 +155,7 @@
AutowireContext autowire,
ScopeStrategy strategy,
EventContext ctx,
- ConfigurationContext configCtx,
- MonitorFactory factory
+ ConfigurationContext configCtx
) {
super(name);
this.parentContext = parent;
@@ -168,7 +163,6 @@
this.scopeStrategy = strategy;
this.eventContext = ctx;
this.configurationContext = configCtx;
- this.monitorFactory = factory;
scopeIndex = new ConcurrentHashMap<String, ScopeContext>();
// FIXME the assembly factory should be injected here
module = new AssemblyFactoryImpl().createModule();
@@ -273,10 +267,6 @@
this.eventContext = eventContext;
}
- public void setMonitorFactory(MonitorFactory factory) {
- this.monitorFactory = factory;
- }
-
public CompositeContext getParent() {
return parentContext;
}
@@ -516,8 +506,6 @@
public <T> T resolveInstance(Class<T> instanceInterface) throws
AutowireResolutionException {
if (RuntimeContext.class.equals(instanceInterface)) {
return autowireContext.resolveInstance(instanceInterface);
- } else if (MonitorFactory.class.equals(instanceInterface)) {
- return instanceInterface.cast(monitorFactory);
} else if (ConfigurationContext.class.equals(instanceInterface)) {
return instanceInterface.cast(this);
} else if (CompositeContext.class.equals(instanceInterface)) {
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java?rev=393350&r1=393349&r2=393350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
Tue Apr 11 17:47:25 2006
@@ -15,7 +15,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.context.EventContext;
@@ -97,8 +96,7 @@
factory = new SystemAssemblyFactoryImpl();
List<ContextFactoryBuilder> builders =
MockFactory.createSystemBuilders();
- system = new SystemCompositeContextImpl("system", null, null, new
SystemScopeStrategy(),
- new EventContextImpl(), new MockConfigContext(builders), new
NullMonitorFactory());
+ system = new SystemCompositeContextImpl("system", null, null, new
SystemScopeStrategy(), new EventContextImpl(), new MockConfigContext(builders));
}
protected void tearDown() throws Exception {
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java?rev=393350&r1=393349&r2=393350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java
Tue Apr 11 17:47:25 2006
@@ -13,7 +13,6 @@
*/
package org.apache.tuscany.core.system.context;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.context.CompositeContextRegisterTestCase;
import org.apache.tuscany.core.context.CompositeContext;
@@ -33,7 +32,6 @@
protected CompositeContext createContext() {
List<ContextFactoryBuilder> builders =
MockFactory.createSystemBuilders();
- return new SystemCompositeContextImpl("test.context", null,
- null, new DefaultScopeStrategy(), new EventContextImpl(), new
MockConfigContext(builders), new NullMonitorFactory());
+ return new SystemCompositeContextImpl("test.context", null, null, new
DefaultScopeStrategy(), new EventContextImpl(), new
MockConfigContext(builders));
}
}
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java?rev=393350&r1=393349&r2=393350&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java
Tue Apr 11 17:47:25 2006
@@ -14,7 +14,6 @@
package org.apache.tuscany.core.system.context;
import junit.framework.Assert;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.context.AbstractCompositeHierarchyTests;
import org.apache.tuscany.core.context.CompositeContext;
@@ -36,8 +35,7 @@
protected CompositeContext createContextHierachy() throws Exception {
List<ContextFactoryBuilder> mockBuilders =
MockFactory.createSystemBuilders();
- CompositeContext parent = new
SystemCompositeContextImpl("test.parent", null, null, new
DefaultScopeStrategy(),
- new EventContextImpl(), new MockConfigContext(mockBuilders),
new NullMonitorFactory());
+ CompositeContext parent = new
SystemCompositeContextImpl("test.parent", null, null, new
DefaultScopeStrategy(), new EventContextImpl(), new
MockConfigContext(mockBuilders));
parent.registerModelObject(MockFactory.createCompositeComponent("test.child"));
parent.start();
CompositeContext child = (CompositeContext)
parent.getContext("test.child");
