Author: jboynes
Date: Wed Apr 5 12:37:17 2006
New Revision: 391748
URL: http://svn.apache.org/viewcvs?rev=391748&view=rev
Log:
remove SCDLModelLoaderRegistry and SCDLModelLoaders for extensions that do not
use sidefiles
Removed:
incubator/tuscany/java/sca/bindings/binding.axis/src/main/java/org/apache/tuscany/binding/axis/loader/WebServiceSCDLModelLoader.java
incubator/tuscany/java/sca/bindings/binding.axis/src/test/java/org/apache/tuscany/binding/axis/assembly/tests/WebServiceAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceSCDLModelLoader.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/assembly/tests/WebServiceAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceClientTestCase.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/JSONRPCSCDLModelLoader.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/assembly/tests/JSONRPCAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaSCDLModelLoader.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/config/ModuleComponentConfigurationLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/config/ModuleComponentConfigurationLoaderTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/ModuleComponentConfigurationLoaderImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/SCDLModelLoaderRegistry.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/SCDLModelLoaderRegistryImpl.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/TomcatWebAppLifecycleListener.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis/src/main/resources/system.fragment
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/system.fragment
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/system.fragment
incubator/tuscany/java/sca/containers/container.java/src/main/resources/system.fragment
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
incubator/tuscany/java/sca/containers/container.js/src/main/resources/system.fragment
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
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/webapp/TuscanyServletListener.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/AssemblyModelLoader.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLAssemblyModelLoaderImpl.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis/src/main/resources/system.fragment
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis/src/main/resources/system.fragment?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis/src/main/resources/system.fragment
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis/src/main/resources/system.fragment
Wed Apr 5 12:37:17 2006
@@ -26,10 +26,6 @@
<system:implementation.system
class="org.apache.tuscany.binding.axis.builder.ExternalWebServiceWireBuilder"/>
</component>
- <component
name="org.apache.tuscany.binding.axis.loader.WebServiceSCDLModelLoader">
- <system:implementation.system
class="org.apache.tuscany.binding.axis.loader.WebServiceSCDLModelLoader"/>
- </component>
-
<component
name="org.apache.tuscany.binding.axis.builder.WebServiceEntryPointBuilder">
<system:implementation.system
class="org.apache.tuscany.binding.axis.builder.WebServiceEntryPointBuilder"/>
</component>
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/system.fragment
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/system.fragment?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/system.fragment
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/system.fragment
Wed Apr 5 12:37:17 2006
@@ -26,10 +26,6 @@
<system:implementation.system
class="org.apache.tuscany.binding.axis2.builder.ExternalWebServiceWireBuilder"/>
</component>
- <component
name="org.apache.tuscany.binding.axis2.loader.WebServiceSCDLModelLoader">
- <system:implementation.system
class="org.apache.tuscany.binding.axis2.loader.WebServiceSCDLModelLoader"/>
- </component>
-
<component
name="org.apache.tuscany.binding.axis2.builder.WebServiceEntryPointBuilder">
<system:implementation.system
class="org.apache.tuscany.binding.axis2.builder.WebServiceEntryPointBuilder"/>
</component>
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/system.fragment
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/system.fragment?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/system.fragment
(original)
+++
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/system.fragment
Wed Apr 5 12:37:17 2006
@@ -18,10 +18,6 @@
xmlns:system="http://org.apache.tuscany/xmlns/system/0.9";
name="org.apache.tuscany.binding.jsonrpc">
- <component
name="org.apache.tuscany.binding.jsonrpc.loader.JSONRPCSCDLModelLoader">
- <system:implementation.system
class="org.apache.tuscany.binding.jsonrpc.loader.JSONRPCSCDLModelLoader"/>
- </component>
-
<component
name="org.apache.tuscany.binding.jsonrpc.builder.JSONRPCEntryPointConfigurationBuilder">
<system:implementation.system
class="org.apache.tuscany.binding.jsonrpc.builder.JSONRPCEntryPointConfigurationBuilder"/>
</component>
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/resources/system.fragment
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/resources/system.fragment?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/main/resources/system.fragment
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/main/resources/system.fragment
Wed Apr 5 12:37:17 2006
@@ -26,15 +26,6 @@
<system:implementation.system
class="org.apache.tuscany.container.java.builder.JavaTargetWireBuilder"/>
</component>
- <component
name="org.apache.tuscany.container.java.loader.JavaSCDLModelLoader">
- <system:implementation.system
class="org.apache.tuscany.container.java.loader.JavaSCDLModelLoader"/>
-<!--
- <references>
-
<v:loaderRegistry>org.apache.tuscany.core.loader.SCDLModelLoaderRegistry</v:loaderRegistry>
- </references>
--->
- </component>
-
<component
name="org.apache.tuscany.container.java.loader.JavaImplementationLoader">
<system:implementation.system
class="org.apache.tuscany.container.java.loader.JavaImplementationLoader"/>
</component>
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
Wed Apr 5 12:37:17 2006
@@ -83,7 +83,7 @@
DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
- RuntimeContext runtime = new RuntimeContextImpl(null, null, builders,
defaultWireBuilder);
+ RuntimeContext runtime = new RuntimeContextImpl(null, builders,
defaultWireBuilder);
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
@@ -127,7 +127,7 @@
builders.add(javaBuilder);
DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
- RuntimeContext runtime = new RuntimeContextImpl(null, null, builders,
defaultWireBuilder);
+ RuntimeContext runtime = new RuntimeContextImpl(null, builders,
defaultWireBuilder);
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
@@ -174,7 +174,7 @@
DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
- RuntimeContext runtime = new RuntimeContextImpl(null, null, builders,
defaultWireBuilder);
+ RuntimeContext runtime = new RuntimeContextImpl(null, builders,
defaultWireBuilder);
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
@@ -217,7 +217,7 @@
DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
- RuntimeContext runtime = new RuntimeContextImpl(null, null, builders,
defaultWireBuilder);
+ RuntimeContext runtime = new RuntimeContextImpl(null, builders,
defaultWireBuilder);
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
Modified:
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
Wed Apr 5 12:37:17 2006
@@ -54,7 +54,6 @@
import org.apache.tuscany.core.context.EventContext;
import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.SystemAggregateContext;
-import org.apache.tuscany.core.context.impl.AggregateContextImpl;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.FieldInjector;
import org.apache.tuscany.core.injection.Injector;
@@ -66,12 +65,10 @@
import org.apache.tuscany.core.runtime.RuntimeContextImpl;
import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
import org.apache.tuscany.core.system.assembly.SystemBinding;
-import org.apache.tuscany.core.system.assembly.SystemImplementation;
import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
import org.apache.tuscany.core.system.builder.SystemContextFactoryBuilder;
import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
-import org.apache.tuscany.core.system.context.SystemAggregateContextImpl;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.ComponentType;
@@ -665,7 +662,7 @@
* @throws ConfigurationException
*/
public static RuntimeContext createJavaRuntime() throws
ConfigurationException {
- RuntimeContext runtime = new RuntimeContextImpl(null, null,
MockFactory.createSystemBuilders(), null);
+ RuntimeContext runtime = new RuntimeContextImpl(null,
MockFactory.createSystemBuilders(), null);
runtime.start();
runtime.getSystemContext().registerModelObject(createSystemAggregateComponent(SYSTEM_CHILD));
SystemAggregateContext ctx = (SystemAggregateContext)
runtime.getSystemContext().getContext(SYSTEM_CHILD);
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/resources/system.fragment
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/resources/system.fragment?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/resources/system.fragment
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/resources/system.fragment
Wed Apr 5 12:37:17 2006
@@ -22,10 +22,6 @@
<system:implementation.system
class="org.apache.tuscany.container.js.builder.JavaScriptContextFactoryBuilder"/>
</component>
- <component
name="org.apache.tuscany.container.js.loader.JavaScriptSCDLModelLoader">
- <system:implementation.system
class="org.apache.tuscany.container.js.loader.JavaScriptSCDLModelLoader"/>
- </component>
-
<component
name="org.apache.tuscany.container.js.builder.JavaScriptTargetWireBuilder">
<system:implementation.system
class="org.apache.tuscany.container.js.builder.JavaScriptTargetWireBuilder"/>
</component>
Modified:
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/integration/JSComponentContextTestCase.java
Wed Apr 5 12:37:17 2006
@@ -70,7 +70,7 @@
DefaultWireBuilder defaultWireBuilder = new DefaultWireBuilder();
- RuntimeContext runtime = new RuntimeContextImpl(null, null, builders,
defaultWireBuilder);
+ RuntimeContext runtime = new RuntimeContextImpl(null, builders,
defaultWireBuilder);
runtime.addBuilder(new JavaScriptTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
Wed Apr 5 12:37:17 2006
@@ -82,9 +82,8 @@
AssemblyModelContext modelContext =
BootstrapHelper.getModelContext(classLoader);
// Create a runtime context and start it
- List<SCDLModelLoader> loaders =
modelContext.getAssemblyLoader().getLoaders();
List<ContextFactoryBuilder> configBuilders =
BootstrapHelper.getBuilders();
- runtime = new RuntimeContextImpl(monitorFactory, loaders,
configBuilders, new DefaultWireBuilder());
+ runtime = new RuntimeContextImpl(monitorFactory, configBuilders, new
DefaultWireBuilder());
runtime.start();
monitor.started(runtime);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeContext.java
Wed Apr 5 12:37:17 2006
@@ -69,12 +69,6 @@
public void addBuilder(WireBuilder builder);
/**
- * Adds an SCDL model loader to the runtime
- */
- @Deprecated
- public void addLoader(SCDLModelLoader loader);
-
- /**
* Returns the monitor factory in use by the runtime
*/
@Deprecated
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=391748&r1=391747&r2=391748&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
Wed Apr 5 12:37:17 2006
@@ -58,8 +58,6 @@
private final List<ContextFactoryBuilder> builders;
- private final List<SCDLModelLoader> loaders;
-
// the top-level wire builder in the runtime
private final HierarchicalWireBuilder wireBuilder;
@@ -75,23 +73,20 @@
* Default constructor that creates a runtime with a NullMonitorFactory
and no builders.
*/
public RuntimeContextImpl() {
- this(new NullMonitorFactory(), null, null, null);
+ this(new NullMonitorFactory(), null, null);
}
/**
* Constructor for creating a runtime with a specified MonitorFactory and
pre-defined builders.
*
- * @param monitorFactory the default [EMAIL PROTECTED] MonitorFactory} for
this runtime
+ * @param monitorFactory the default [EMAIL PROTECTED]
org.apache.tuscany.common.monitor.MonitorFactory} for this runtime
* @param builders a list of builders automatically made available; may be
null
* @param wireBuilder the top-level hierarchical wire builder for the
runtime; if not specified, a default
- * implementation will be used
*/
- public RuntimeContextImpl(MonitorFactory monitorFactory,
List<SCDLModelLoader> loaders, List<ContextFactoryBuilder> builders,
- HierarchicalWireBuilder wireBuilder) {
+ public RuntimeContextImpl(MonitorFactory monitorFactory,
List<ContextFactoryBuilder> builders, HierarchicalWireBuilder wireBuilder) {
super(RUNTIME);
this.monitorFactory = monitorFactory;
this.builders = (builders == null) ? new
ArrayList<ContextFactoryBuilder>(1) : builders;
- this.loaders = (loaders == null) ? new ArrayList<SCDLModelLoader>(1) :
loaders;
this.wireBuilder = (wireBuilder == null) ? new DefaultWireBuilder() :
wireBuilder;
rootContext = new AggregateContextImpl(ROOT, this, this, new
RuntimeScopeStrategy(), new EventContextImpl(), this,
@@ -103,20 +98,21 @@
/**
* Specialized constructor that allows the default implementations of the
root and system contexts to be overridden.
*
- * @param monitorFactory the default [EMAIL PROTECTED] MonitorFactory} for
this runtime
+ * @param monitorFactory the default [EMAIL PROTECTED]
org.apache.tuscany.common.monitor.MonitorFactory} for this runtime
* @param rootContext the context to use for the root of the user context
tree
* @param systemContext the context to use for the root of the system
context tree
* @param builders a list of builders automatically made available; may be
null
* @param wireBuilder the top-level hierarchical wire builder for the
runtime; if not specified, a default
- * implementation will be used
*/
- public RuntimeContextImpl(MonitorFactory monitorFactory, AggregateContext
rootContext, SystemAggregateContext systemContext,
- List<SCDLModelLoader> loaders, List<ContextFactoryBuilder>
builders, HierarchicalWireBuilder wireBuilder) {
+ public RuntimeContextImpl(MonitorFactory monitorFactory,
+ AggregateContext rootContext,
+ SystemAggregateContext systemContext,
+ List<ContextFactoryBuilder> builders,
+ HierarchicalWireBuilder wireBuilder) {
super(RUNTIME);
this.rootContext = rootContext;
this.systemContext = systemContext;
this.monitorFactory = monitorFactory;
- this.loaders = (loaders == null) ? new ArrayList<SCDLModelLoader>(1) :
loaders;
this.builders = (builders == null) ? new
ArrayList<ContextFactoryBuilder>(1) : builders;
this.wireBuilder = (wireBuilder == null) ? new DefaultWireBuilder() :
wireBuilder;
}
@@ -147,11 +143,6 @@
public void addBuilder(WireBuilder builder) {
assert (builder != null) : "Builder was null";
wireBuilder.addWireBuilder(builder);
- }
-
- public void addLoader(SCDLModelLoader loader) {
- assert (loader != null) : "Loader was null";
- loaders.add(loader);
}
public AggregateContext getContext(String ctxName) {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/webapp/TuscanyServletListener.java
Wed Apr 5 12:37:17 2006
@@ -108,9 +108,8 @@
AssemblyModelContext modelContext =
BootstrapHelper.getModelContext(classLoader);
// Create a runtime context and start it
- List<SCDLModelLoader> loaders =
modelContext.getAssemblyLoader().getLoaders();
List<ContextFactoryBuilder> configBuilders =
BootstrapHelper.getBuilders();
- runtime = new RuntimeContextImpl(monitorFactory, loaders,
configBuilders, new DefaultWireBuilder());
+ runtime = new RuntimeContextImpl(monitorFactory, configBuilders, new
DefaultWireBuilder());
runtime.start();
// Load and start the system configuration
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
Wed Apr 5 12:37:17 2006
@@ -352,7 +352,7 @@
* Creates a default [EMAIL PROTECTED] RuntimeContext} configured with
support for Java component implementations
*/
public static RuntimeContext createCoreRuntime() {
- RuntimeContext runtime = new RuntimeContextImpl(null, null,
createSystemBuilders(), null);
+ RuntimeContext runtime = new RuntimeContextImpl(null,
createSystemBuilders(), null);
runtime.start();
return runtime;
}
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
Wed Apr 5 12:37:17 2006
@@ -61,7 +61,7 @@
List<ContextFactoryBuilder> builders =
MockFactory.createSystemBuilders();
// start the runtime context
- RuntimeContext runtimeContext = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtimeContext = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtimeContext.start();
AggregateContext system = runtimeContext.getSystemContext();
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
Wed Apr 5 12:37:17 2006
@@ -57,7 +57,7 @@
* point
*/
public void testSystemExplicitWiring() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
AggregateContext root = runtime.getRootContext();
@@ -106,7 +106,7 @@
* Tests autowiring an external service to a system entry point
*/
public void testSystemAutoWiring() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
AggregateContext root = runtime.getRootContext();
@@ -136,7 +136,7 @@
}
public void testServiceNotFound() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
// create a test module
@@ -155,7 +155,7 @@
}
public void testExternalServiceReferenceNotFound() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
AggregateContext system = runtime.getSystemContext();
@@ -181,7 +181,7 @@
}
public void testEntryPointReferenceNotFound() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
// create a test module
@@ -210,7 +210,7 @@
* Test two module components that have external services wired to entry
points contained in each
*/
public void testCircularWires() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
// create a test modules
@@ -248,7 +248,7 @@
* as an error condition FIXME this must be implemented
*/
public void testInterModuleCircularReference() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
// create a test modules
@@ -279,7 +279,7 @@
public void testRuntimeBuilderAutowire() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders, null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders, null);
runtime.start();
AggregateContext system = runtime.getSystemContext();
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/SystemBootstrapTestCase.java
Wed Apr 5 12:37:17 2006
@@ -51,7 +51,7 @@
* Simulates booting a runtime process
*/
public void testBoot() throws Exception {
- RuntimeContext runtimeContext = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders,null);
+ RuntimeContext runtimeContext = new RuntimeContextImpl(new
NullMonitorFactory(), builders,null);
runtimeContext.start();
AggregateContext systemContext = runtimeContext.getSystemContext();
@@ -81,7 +81,7 @@
}
public void testRuntimeBoot() throws Exception {
- RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), null, builders,null);
+ RuntimeContext runtime = new RuntimeContextImpl(new
NullMonitorFactory(), builders,null);
runtime.start();
runtime.getRootContext();
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/AssemblyModelLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/AssemblyModelLoader.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/AssemblyModelLoader.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/AssemblyModelLoader.java
Wed Apr 5 12:37:17 2006
@@ -39,38 +39,11 @@
void setModelContext(AssemblyModelContext modelContext);
/**
- * Returns the live list of sub-loaders this loader is using.
- * @return the list of sub-loaders
- */
- List<SCDLModelLoader> getLoaders();
-
- /**
- * Returns the module at the given uri
- * @param uri
- * @return the Module at the given uri
- */
- Module loadModule(String uri);
-
- /**
- * Returns the module at the given uri
- * @param uri
- * @return the ModuleFragment at the given uri
- */
- ModuleFragment loadModuleFragment(String uri);
-
- /**
* Returns the component type at the given uri
* @param uri
* @return the ComponentType at the given uri
*/
ComponentType loadComponentType(String uri);
-
- /**
- * Returns the subsystem at the given uri.
- * @param uri
- * @return the Subsystem at the given uri
- */
- Subsystem loadSubsystem(String uri);
/**
* Load a WSDL definition
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLAssemblyModelLoaderImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLAssemblyModelLoaderImpl.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLAssemblyModelLoaderImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLAssemblyModelLoaderImpl.java
Wed Apr 5 12:37:17 2006
@@ -70,10 +70,6 @@
this.modelContext = modelContext;
}
- public List<SCDLModelLoader> getLoaders() {
- return scdlModelLoaders;
- }
-
/**
* @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadComponentType(java.lang.String)
*/
@@ -84,75 +80,22 @@
// Load the SCDL component type
org.apache.tuscany.model.scdl.ComponentType
scdlComponentType=xmlReader.getComponentType(uri);
-
+
// Transform it to an assembly component type
componentType=transform(scdlComponentType).getComponentType();
-
+
componentTypes.put(uri, componentType);
return componentType;
}
/**
- * @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadModule(java.lang.String)
- */
- public Module loadModule(String uri) {
- Module module=modules.get(uri);
- if (module!=null)
- return module;
-
- // Load the SCDL module
- org.apache.tuscany.model.scdl.Module
scdlModule=xmlReader.getModule(uri);
-
- // Transform it to an assembly module
- module=transform(scdlModule).getModule();
-
- modules.put(uri, module);
- return module;
- }
-
- /**
- * @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadModuleFragment(java.lang.String)
- */
- public ModuleFragment loadModuleFragment(String uri) {
- ModuleFragment moduleFragment=moduleFragments.get(uri);
- if (moduleFragment!=null)
- return moduleFragment;
-
- // Load the SCDL module fragment
- org.apache.tuscany.model.scdl.ModuleFragment
scdlFragment=xmlReader.getModuleFragment(uri);
-
- // Transform it to an assembly module fragment
- moduleFragment=transform(scdlFragment).getModuleFragment();
-
- moduleFragments.put(uri, moduleFragment);
- return moduleFragment;
- }
-
- /**
- * @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadSubsystem(java.lang.String)
- */
- public Subsystem loadSubsystem(String uri) {
- Subsystem subsystem=subsystems.get(uri);
- if (subsystem!=null)
- return subsystem;
-
- // Load the SCDL subsystem
- org.apache.tuscany.model.scdl.Subsystem
scdlSubsystem=xmlReader.getSubsystem(uri);
-
- subsystem=transform(scdlSubsystem).getSubsystem();
-
- subsystems.put(uri, subsystem);
- return subsystem;
- }
-
- /**
* @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadDefinition(java.lang.String)
*/
public Definition loadDefinition(String uri) {
Definition definition=definitions.get(uri);
if (definition!=null)
return definition;
-
+
try {
if (wsdlReader==null)
wsdlReader=WSDLFactory.newInstance().newWSDLReader();
@@ -162,9 +105,9 @@
}
if (definition==null)
throw new IllegalArgumentException("Could not load WSDL definition
at "+uri);
-
+
definitions.put(uri, definition);
-
+
String namespace=definition.getTargetNamespace();
List<Definition> list=definitionsByNamespace.get(namespace);
if (list==null) {
@@ -172,7 +115,7 @@
definitionsByNamespace.put(namespace, list);
}
list.add(definition);
-
+
return definition;
}
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
Wed Apr 5 12:37:17 2006
@@ -78,7 +78,7 @@
// Create and start the runtime
List<ContextFactoryBuilder> configBuilders =
BootstrapHelper.getBuilders();
- runtime = new RuntimeContextImpl(new NullMonitorFactory(),
modelLoader.getLoaders(), configBuilders, new DefaultWireBuilder());
+ runtime = new RuntimeContextImpl(new NullMonitorFactory(),
configBuilders, new DefaultWireBuilder());
runtime.start();
// Load and start the system configuration
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java?rev=391748&r1=391747&r2=391748&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/RuntimeBootstrap.java
Wed Apr 5 12:37:17 2006
@@ -97,7 +97,7 @@
// throw new BootstrapConfigurationException("Error initializing
configuration loader in Tomcat configuration", e);
// }
// create the SCA Runtime and have it bound in the global JNDI context
- return new RuntimeContextImpl(monitorFactory, null,
createBuilders(),null);
+ return new RuntimeContextImpl(monitorFactory, createBuilders(),null);
}
/**
