Author: jboynes
Date: Tue Apr 11 15:47:26 2006
New Revision: 393326
URL: http://svn.apache.org/viewcvs?rev=393326&view=rev
Log:
loader registry and assembly factory are now regular system components and do
not need special handling
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=393326&r1=393325&r2=393326&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 15:47:26 2006
@@ -37,8 +37,6 @@
import org.apache.tuscany.core.context.ConfigurationContext;
import org.apache.tuscany.core.context.AutowireContext;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
-import org.apache.tuscany.core.loader.impl.StAXLoaderRegistryImpl;
-import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
import org.apache.tuscany.core.system.context.SystemScopeStrategy;
import org.apache.tuscany.model.assembly.Aggregate;
@@ -91,7 +89,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, new StAXLoaderRegistryImpl(), new
SystemAssemblyFactoryImpl());
+ this, monitorFactory);
}
/**
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=393326&r1=393325&r2=393326&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 15:47:26 2006
@@ -16,6 +16,16 @@
*/
package org.apache.tuscany.core.system.context;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.apache.tuscany.common.TuscanyRuntimeException;
import org.apache.tuscany.common.monitor.MonitorFactory;
import org.apache.tuscany.core.builder.BuilderConfigException;
@@ -32,31 +42,33 @@
import org.apache.tuscany.core.context.DuplicateNameException;
import org.apache.tuscany.core.context.EntryPointContext;
import org.apache.tuscany.core.context.EventContext;
-import static org.apache.tuscany.core.context.EventContext.*;
+import static org.apache.tuscany.core.context.EventContext.HTTP_SESSION;
+import static org.apache.tuscany.core.context.EventContext.REQUEST_END;
+import static org.apache.tuscany.core.context.EventContext.SESSION_NOTIFY;
import org.apache.tuscany.core.context.EventException;
+import org.apache.tuscany.core.context.MissingContextFactoryException;
+import org.apache.tuscany.core.context.MissingScopeException;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.context.RuntimeEventListener;
import org.apache.tuscany.core.context.ScopeContext;
import org.apache.tuscany.core.context.ScopeStrategy;
import org.apache.tuscany.core.context.SystemCompositeContext;
import org.apache.tuscany.core.context.TargetException;
-import org.apache.tuscany.core.context.MissingContextFactoryException;
-import org.apache.tuscany.core.context.MissingScopeException;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactoryFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyFactoryFactory;
-import org.apache.tuscany.core.loader.StAXLoaderRegistry;
import org.apache.tuscany.core.message.MessageFactory;
import org.apache.tuscany.core.message.impl.MessageFactoryImpl;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.system.annotation.ParentContext;
-import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
import org.apache.tuscany.core.system.assembly.SystemBinding;
import org.apache.tuscany.core.system.config.SystemObjectContextFactory;
import org.apache.tuscany.model.assembly.Aggregate;
+import org.apache.tuscany.model.assembly.AggregatePart;
import org.apache.tuscany.model.assembly.AssemblyModelObject;
+import org.apache.tuscany.model.assembly.Binding;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.model.assembly.Extensible;
@@ -65,20 +77,8 @@
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.AggregatePart;
-import org.apache.tuscany.model.assembly.Binding;
import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* Implements an composite context for system components. By default a system
context uses the scopes specified by
* [EMAIL PROTECTED]
org.apache.tuscany.core.system.context.SystemScopeStrategy}. In addition, it
implements an autowire policy
@@ -141,10 +141,6 @@
@Autowire(required = false)
private AutowireContext autowireContext;
- private final StAXLoaderRegistry loaderRegistry;
-
- private final SystemAssemblyFactory assemblyFactory;
-
// ----------------------------------
// Constructors
// ----------------------------------
@@ -156,13 +152,16 @@
module = new AssemblyFactoryImpl().createModule();
eventContext = new EventContextImpl();
scopeStrategy = new SystemScopeStrategy();
- this.loaderRegistry = null;
- this.assemblyFactory = null;
}
- public SystemCompositeContextImpl(String name, CompositeContext parent,
AutowireContext autowire, ScopeStrategy strategy,
- EventContext ctx, ConfigurationContext
configCtx, MonitorFactory factory, StAXLoaderRegistry loaderRegistry,
- SystemAssemblyFactory assemblyFactory) {
+ public SystemCompositeContextImpl(String name,
+ CompositeContext parent,
+ AutowireContext autowire,
+ ScopeStrategy strategy,
+ EventContext ctx,
+ ConfigurationContext configCtx,
+ MonitorFactory factory
+ ) {
super(name);
this.parentContext = parent;
this.autowireContext = autowire;
@@ -173,8 +172,6 @@
scopeIndex = new ConcurrentHashMap<String, ScopeContext>();
// FIXME the assembly factory should be injected here
module = new AssemblyFactoryImpl().createModule();
- this.loaderRegistry = loaderRegistry;
- this.assemblyFactory = assemblyFactory;
}
// ----------------------------------
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=393326&r1=393325&r2=393326&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 15:47:26 2006
@@ -98,7 +98,7 @@
List<ContextFactoryBuilder> builders =
MockFactory.createSystemBuilders();
system = new SystemCompositeContextImpl("system", null, null, new
SystemScopeStrategy(),
- new EventContextImpl(), new MockConfigContext(builders), new
NullMonitorFactory(), null, null);
+ new EventContextImpl(), new MockConfigContext(builders), new
NullMonitorFactory());
}
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=393326&r1=393325&r2=393326&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 15:47:26 2006
@@ -34,6 +34,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(), null, null);
+ null, new DefaultScopeStrategy(), new EventContextImpl(), new
MockConfigContext(builders), new NullMonitorFactory());
}
}
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=393326&r1=393325&r2=393326&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 15:47:26 2006
@@ -37,7 +37,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(), null, null);
+ new EventContextImpl(), new MockConfigContext(mockBuilders),
new NullMonitorFactory());
parent.registerModelObject(MockFactory.createCompositeComponent("test.child"));
parent.start();
CompositeContext child = (CompositeContext)
parent.getContext("test.child");
