Author: jboynes
Date: Mon Apr 10 16:23:09 2006
New Revision: 393114
URL: http://svn.apache.org/viewcvs?rev=393114&view=rev
Log:
remove system resourceloader from model context as it is not actually used
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java?rev=393114&r1=393113&r2=393114&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java
Mon Apr 10 16:23:09 2006
@@ -34,13 +34,6 @@
AssemblyFactory getAssemblyFactory();
/**
- * Returns a loader for resources in the system environment
- *
- * @return a resource loader
- */
- ResourceLoader getSystemResourceLoader();
-
- /**
* Returns a loader for resources in the application environment.
*
* @return a loader for resources in the system environment
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.java?rev=393114&r1=393113&r2=393114&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.java
Mon Apr 10 16:23:09 2006
@@ -30,26 +30,20 @@
private final AssemblyFactory assemblyFactory;
private final AssemblyModelLoader assemblyLoader;
- private final ResourceLoader systemResourceLoader;
private final ResourceLoader applicationResourceLoader;
private final TypeHelper typeHelper;
public AssemblyModelContextImpl(AssemblyModelLoader assemblyLoader,
ResourceLoader resourceLoader) {
- this(new AssemblyFactoryImpl(), assemblyLoader, resourceLoader,
resourceLoader);
+ this(new AssemblyFactoryImpl(), assemblyLoader, resourceLoader);
}
- public AssemblyModelContextImpl(AssemblyFactory assemblyFactory,
AssemblyModelLoader assemblyLoader, ResourceLoader resourceLoader) {
- this(assemblyFactory, assemblyLoader, resourceLoader, resourceLoader);
- }
-
- public AssemblyModelContextImpl(AssemblyFactory assemblyFactory,
AssemblyModelLoader assemblyLoader, ResourceLoader resourceLoader,
ResourceLoader artifactLoader) {
- this(assemblyFactory, assemblyLoader, resourceLoader, artifactLoader,
SDOUtil.createTypeHelper());
+ public AssemblyModelContextImpl(AssemblyFactory assemblyFactory,
AssemblyModelLoader assemblyLoader, ResourceLoader artifactLoader) {
+ this(assemblyFactory, assemblyLoader, artifactLoader,
SDOUtil.createTypeHelper());
}
- public AssemblyModelContextImpl(AssemblyFactory assemblyFactory,
AssemblyModelLoader assemblyLoader, ResourceLoader resourceLoader,
ResourceLoader artifactLoader, TypeHelper typeHelper) {
+ public AssemblyModelContextImpl(AssemblyFactory assemblyFactory,
AssemblyModelLoader assemblyLoader, ResourceLoader artifactLoader, TypeHelper
typeHelper) {
this.assemblyFactory = assemblyFactory;
this.assemblyLoader = assemblyLoader;
- this.systemResourceLoader = resourceLoader;
this.applicationResourceLoader = artifactLoader;
this.typeHelper=typeHelper;
}
@@ -59,13 +53,6 @@
*/
public AssemblyFactory getAssemblyFactory() {
return assemblyFactory;
- }
-
- /**
- * @see
org.apache.tuscany.model.assembly.AssemblyModelContext#getSystemResourceLoader()
- */
- public ResourceLoader getSystemResourceLoader() {
- return systemResourceLoader;
}
public ResourceLoader getApplicationResourceLoader() {
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java?rev=393114&r1=393113&r2=393114&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
Mon Apr 10 16:23:09 2006
@@ -57,14 +57,12 @@
private final AssemblyFactory modelFactory;
private final AssemblyModelLoader modelLoader;
private final RuntimeContext runtime;
- private final ResourceLoader systemLoader;
private CompositeContext moduleContext;
- public TuscanyContextListener(RuntimeContext runtimeContext,
AssemblyFactory modelFactory, AssemblyModelLoader modelLoader, ResourceLoader
systemLoader) {
+ public TuscanyContextListener(RuntimeContext runtimeContext,
AssemblyFactory modelFactory, AssemblyModelLoader modelLoader) {
this.runtime = runtimeContext;
this.modelFactory = modelFactory;
this.modelLoader = modelLoader;
- this.systemLoader = systemLoader;
}
public void lifecycleEvent(LifecycleEvent event) {
@@ -123,7 +121,7 @@
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
try {
- AssemblyModelContext modelContext = new
AssemblyModelContextImpl(modelFactory, modelLoader, systemLoader,
resourceLoader);
+ AssemblyModelContext modelContext = new
AssemblyModelContextImpl(modelFactory, modelLoader, resourceLoader);
ModuleComponentConfigurationLoader loader =
BootstrapHelper.getConfigurationLoader(runtime.getSystemContext(),
modelContext);
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=393114&r1=393113&r2=393114&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
Mon Apr 10 16:23:09 2006
@@ -25,7 +25,6 @@
import org.apache.catalina.util.StringManager;
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.client.BootstrapHelper;
@@ -57,7 +56,6 @@
private RuntimeContext runtime;
private AssemblyModelLoader modelLoader;
private AssemblyFactory modelFactory;
- private ResourceLoader systemLoader;
public synchronized void start() throws LifecycleException {
startRuntime();
@@ -74,7 +72,6 @@
AssemblyModelContext modelContext =
BootstrapHelper.getModelContext(getClass().getClassLoader());
modelFactory = modelContext.getAssemblyFactory();
modelLoader = modelContext.getAssemblyLoader();
- systemLoader = modelContext.getSystemResourceLoader();
// Create and start the runtime
NullMonitorFactory monitorFactory = new NullMonitorFactory();
@@ -117,7 +114,7 @@
throw new
IllegalArgumentException(sm.getString("tuscanyHost.notContext"));
}
StandardContext ctx = (StandardContext) child;
- ctx.addLifecycleListener(new TuscanyContextListener(runtime,
modelFactory, modelLoader, systemLoader));
+ ctx.addLifecycleListener(new TuscanyContextListener(runtime,
modelFactory, modelLoader));
super.addChild(child);
}
