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 2006/04/12 02:56:04 UTC

svn commit: r393353 - in /incubator/tuscany/java/sca/core/src: main/java/org/apache/tuscany/core/context/impl/ main/java/org/apache/tuscany/core/runtime/ test/java/org/apache/tuscany/core/context/ test/java/org/apache/tuscany/core/system/builder/

Author: jboynes
Date: Tue Apr 11 17:56:02 2006
New Revision: 393353

URL: http://svn.apache.org/viewcvs?rev=393353&view=rev
Log:
normal CompositeContext does not need special support for wiring to a monitor factory either

Modified:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContextImpl.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java Tue Apr 11 17:56:02 2006
@@ -1,6 +1,5 @@
 package org.apache.tuscany.core.context.impl;
 
-import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.config.ConfigurationException;
@@ -70,10 +69,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;
@@ -109,13 +104,11 @@
         module = new AssemblyFactoryImpl().createModule();
     }
 
-    public AbstractCompositeContext(String name, CompositeContext parent, ScopeStrategy strategy, EventContext ctx,
-                                    ConfigurationContext configCtx, MonitorFactory factory) {
+    public AbstractCompositeContext(String name, CompositeContext parent, ScopeStrategy strategy, EventContext ctx, ConfigurationContext configCtx) {
         super(name);
         this.scopeStrategy = strategy;
         this.eventContext = ctx;
         this.configurationContext = configCtx;
-        this.monitorFactory = factory;
         scopeIndex = new ConcurrentHashMap<String, ScopeContext>();
         parentContext = parent;
         // FIXME the factory should be injected
@@ -226,10 +219,6 @@
 
     public void setEventContext(EventContext eventContext) {
         this.eventContext = eventContext;
-    }
-
-    public void setMonitorFactory(MonitorFactory factory) {
-        this.monitorFactory = factory;
     }
 
     public void setConfigurationContext(ConfigurationContext context) {

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java Tue Apr 11 17:56:02 2006
@@ -16,7 +16,6 @@
  */
 package org.apache.tuscany.core.context.impl;
 
-import org.apache.tuscany.common.monitor.MonitorFactory;
 import org.apache.tuscany.core.builder.BuilderConfigException;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.config.ConfigurationException;
@@ -70,13 +69,13 @@
     }
 
     public CompositeContextImpl(String name, CompositeContext parent, ScopeStrategy strategy, EventContext ctx,
-                                ConfigurationContext configCtx, MonitorFactory factory) {
-        super(name, parent, strategy, ctx, configCtx, factory);
+                                ConfigurationContext configCtx) {
+        super(name, parent, strategy, ctx, configCtx);
     }
 
     public CompositeContextImpl(String name, CompositeContext parent, AutowireContext autowireContext, ScopeStrategy strategy,
-                                EventContext ctx, ConfigurationContext configCtx, MonitorFactory factory) {
-        super(name, parent, strategy, ctx, configCtx, factory);
+                                EventContext ctx, ConfigurationContext configCtx) {
+        super(name, parent, strategy, ctx, configCtx);
         this.autowireContext = autowireContext;
     }
 
@@ -154,9 +153,7 @@
     }
 
     public <T> T resolveInstance(Class<T> instanceInterface) throws AutowireResolutionException {
-        if (MonitorFactory.class.equals(instanceInterface)) {
-            return instanceInterface.cast(monitorFactory);
-        } else if (ConfigurationContext.class.equals(instanceInterface)) {
+        if (ConfigurationContext.class.equals(instanceInterface)) {
             return instanceInterface.cast(this);
         } else if (AutowireContext.class.equals(instanceInterface)) {
             return instanceInterface.cast(this);

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=393353&r1=393352&r2=393353&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:56:02 2006
@@ -86,8 +86,8 @@
         this.builders = (builders == null) ? new ArrayList<ContextFactoryBuilder>(1) : builders;
         this.wireBuilder = (wireBuilder == null) ? new DefaultWireBuilder() : wireBuilder;
 
-        rootContext = new CompositeContextImpl(ROOT, this, this, new RuntimeScopeStrategy(), new EventContextImpl(), this,
-                monitorFactory);
+        rootContext = new CompositeContextImpl(ROOT, this, this, new RuntimeScopeStrategy(), new EventContextImpl(), this
+        );
         systemContext = new SystemCompositeContextImpl(SYSTEM, this, this, new SystemScopeStrategy(), new EventContextImpl(), this);
     }
 

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/AbstractCompositeHierarchyTests.java Tue Apr 11 17:56:02 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.impl.CompositeContextImpl;
 import org.apache.tuscany.core.context.impl.EventContextImpl;
@@ -69,7 +68,7 @@
      */
     public void testRegisterSameName() throws Exception {
         CompositeContext parent = new CompositeContextImpl("test.parent", null, new DefaultScopeStrategy(),
-                new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory());
+                new EventContextImpl(), new MockConfigContext(builders));
         parent.registerModelObject(MockFactory.createSystemCompositeComponent("test.child"));
         try {
             parent.registerModelObject(MockFactory.createSystemCompositeComponent("test.child"));
@@ -85,7 +84,7 @@
      */
     public void testRegisterSameNameAfterStart() throws Exception {
         CompositeContext parent = new CompositeContextImpl("test.parent", null, new DefaultScopeStrategy(),
-                new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory());
+                new EventContextImpl(), new MockConfigContext(builders));
         parent.registerModelObject(MockFactory.createSystemCompositeComponent("test.child"));
         parent.start();
         CompositeContext child = (CompositeContext) parent.getContext("test.child");

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeContextRegisterTestCase.java Tue Apr 11 17:56:02 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.impl.CompositeContextImpl;
 import org.apache.tuscany.core.context.impl.EventContextImpl;
@@ -121,7 +120,7 @@
     protected CompositeContext createContext() {
         List<ContextFactoryBuilder> builders = MockFactory.createSystemBuilders();
         return new CompositeContextImpl("test.context", null, new DefaultScopeStrategy(), new EventContextImpl(),
-                new MockConfigContext(builders), new NullMonitorFactory());
+                new MockConfigContext(builders));
     }
 
     protected void setUp() throws Exception {

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/context/CompositeHierarchyTestCase.java Tue Apr 11 17:56:02 2006
@@ -14,7 +14,6 @@
 package org.apache.tuscany.core.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.impl.CompositeContextImpl;
 import org.apache.tuscany.core.context.impl.EventContextImpl;
@@ -84,7 +83,7 @@
     protected CompositeContext createContextHierachy() throws Exception {
         List<ContextFactoryBuilder> systemBuilders = MockFactory.createSystemBuilders();
         CompositeContext parent = new CompositeContextImpl("test.parent", null, new DefaultScopeStrategy(),
-                new EventContextImpl(), new MockConfigContext(systemBuilders), new NullMonitorFactory());
+                new EventContextImpl(), new MockConfigContext(systemBuilders));
         Component component = MockFactory.createCompositeComponent("test.child");
         parent.registerModelObject(component);
         parent.start();

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java Tue Apr 11 17:56:02 2006
@@ -20,7 +20,6 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
 import org.apache.tuscany.core.builder.ContextFactory;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.Context;
@@ -100,6 +99,6 @@
     }
 
     private static CompositeContext createContext() {
-        return new CompositeContextImpl("test.parent", null, new DefaultScopeStrategy(), new EventContextImpl(), new MockConfigContext(null), new NullMonitorFactory());
+        return new CompositeContextImpl("test.parent", null, new DefaultScopeStrategy(), new EventContextImpl(), new MockConfigContext(null));
     }
 }

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java?rev=393353&r1=393352&r2=393353&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java Tue Apr 11 17:56:02 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.ContextFactory;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.Context;
@@ -129,7 +128,7 @@
 
     private static CompositeContext createContext() {
         return new CompositeContextImpl("test.parent", null, new DefaultScopeStrategy(), new EventContextImpl(),
-                new MockConfigContext(null), new NullMonitorFactory());
+                new MockConfigContext(null));
     }
 
 }