Author: jsdelfino
Date: Wed Mar 1 19:23:13 2006
New Revision: 382266
URL: http://svn.apache.org/viewcvs?rev=382266&view=rev
Log:
Adjusted to Jeremy's ResourceLoader related changes, we now have 2
ResourceLoaders on AssemblyModelContext, use getApplicationResourceLoader() to
a get a loader to load resources packaged with SCA applications, use
getSystemResourceLoader() for a loader to load system resources packaged with
the system/server
Modified:
incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/engine/config/AxisEngineConfigurationFactory.java
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaSCDLModelLoader.java
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.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/system/loader/SystemSCDLModelLoader.java
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/AggregateImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.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/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
Modified:
incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/engine/config/AxisEngineConfigurationFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/engine/config/AxisEngineConfigurationFactory.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/engine/config/AxisEngineConfigurationFactory.java
(original)
+++
incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/engine/config/AxisEngineConfigurationFactory.java
Wed Mar 1 19:23:13 2006
@@ -119,7 +119,7 @@
AssemblyModelContext modelContext =
module.getAssemblyModelContext();
// Load the .wsdd configuration
- ResourceLoader bundleContext = modelContext.getResourceLoader();
+ ResourceLoader bundleContext =
modelContext.getApplicationResourceLoader();
InputStream wsdd;
try {
URL url =
bundleContext.getResource("org/apache/tuscany/binding/axis/engine/config/server-config.wsdd");
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaSCDLModelLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaSCDLModelLoader.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaSCDLModelLoader.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaSCDLModelLoader.java
Wed Mar 1 19:23:13 2006
@@ -63,7 +63,7 @@
JavaImplementation
implementation=javaFactory.createJavaImplementation();
Class implementationClass;
try {
-
implementationClass=modelContext.getArtifactResourceLoader().loadClass(scdlJavaImplementation.getClass_());
+
implementationClass=modelContext.getApplicationResourceLoader().loadClass(scdlJavaImplementation.getClass_());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(e);
}
Modified:
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
Wed Mar 1 19:23:13 2006
@@ -32,7 +32,7 @@
if (isInitialized()) {
return;
}
- this.resourceLoader = modelContext.getResourceLoader();
+ this.resourceLoader = modelContext.getApplicationResourceLoader();
if(resourceLoader == null){
throw new ModelInitException("No resource loader set on model
context");
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/ModuleComponentConfigurationLoaderImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/ModuleComponentConfigurationLoaderImpl.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/ModuleComponentConfigurationLoaderImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/ModuleComponentConfigurationLoaderImpl.java
Wed Mar 1 19:23:13 2006
@@ -56,7 +56,7 @@
this.modelContext=modelContext;
this.modelLoader=this.modelContext.getAssemblyLoader();
this.assemblyFactory=this.modelContext.getAssemblyFactory();
- this.resourceLoader=this.modelContext.getArtifactResourceLoader();
+ this.resourceLoader=this.modelContext.getApplicationResourceLoader();
}
/**
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/loader/SystemSCDLModelLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/loader/SystemSCDLModelLoader.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/loader/SystemSCDLModelLoader.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/loader/SystemSCDLModelLoader.java
Wed Mar 1 19:23:13 2006
@@ -37,7 +37,7 @@
org.apache.tuscany.core.system.assembly.SystemImplementation
implementation=systemFactory.createSystemImplementation();
Class implementationClass;
try {
-
implementationClass=modelContext.getResourceLoader().loadClass(scdlImplementation.getClass_());
+
implementationClass=modelContext.getSystemResourceLoader().loadClass(scdlImplementation.getClass_());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(e);
}
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=382266&r1=382265&r2=382266&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
Wed Mar 1 19:23:13 2006
@@ -32,18 +32,18 @@
AssemblyFactory getAssemblyFactory();
/**
- * Returns a loader for resources in the application environment
+ * Returns a loader for resources in the system environment
*
* @return a resource loader
*/
- ResourceLoader getResourceLoader();
+ ResourceLoader getSystemResourceLoader();
/**
- * Returns a loader for resources in the system environment.
+ * Returns a loader for resources in the application environment.
*
* @return a loader for resources in the system environment
*/
- ResourceLoader getArtifactResourceLoader();
+ ResourceLoader getApplicationResourceLoader();
/**
* Returns a loader that can be used to load sub-models.
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java
Wed Mar 1 19:23:13 2006
@@ -202,7 +202,7 @@
this.modelContext=modelContext;
// Populate map of WSDL imports
- ResourceLoader resourceLoader=modelContext.getResourceLoader();
+ ResourceLoader
resourceLoader=modelContext.getApplicationResourceLoader();
WSDLReader reader=null;
wsdlImportsMap = new HashMap<String, List<Import>>();
for (Import wsdlImport : wsdlImports) {
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=382266&r1=382265&r2=382266&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
Wed Mar 1 19:23:13 2006
@@ -43,11 +43,10 @@
this.assemblyLoader = assemblyLoader;
this.resourceLoader = resourceLoader;
this.artifactLoader = artifactLoader;
-
- // FIXME isn't this dangerous?
- if (assemblyLoader!=null) {
+
+ //FIXME the caller should configure the assemblyLoader himself
+ if (assemblyLoader!=null)
assemblyLoader.setModelContext(this);
- }
}
/**
@@ -58,13 +57,13 @@
}
/**
- * @see
org.apache.tuscany.model.assembly.AssemblyModelContext#getResourceLoader()
+ * @see
org.apache.tuscany.model.assembly.AssemblyModelContext#getSystemResourceLoader()
*/
- public ResourceLoader getResourceLoader() {
+ public ResourceLoader getSystemResourceLoader() {
return resourceLoader;
}
- public ResourceLoader getArtifactResourceLoader() {
+ public ResourceLoader getApplicationResourceLoader() {
return artifactLoader;
}
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=382266&r1=382265&r2=382266&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 Mar 1 19:23:13 2006
@@ -78,11 +78,4 @@
*/
List<Definition> loadDefinitions(String namespace);
- /**
- * Load a class
- * @param uri
- * @return
- */
- Class loadClass(String className) throws ClassNotFoundException;
-
}
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=382266&r1=382265&r2=382266&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 Mar 1 19:23:13 2006
@@ -47,7 +47,6 @@
private SCDLXMLReader xmlReader=new SCDLXMLReader();
private WSDLReader wsdlReader;
private AssemblyModelContext modelContext;
- private ResourceLoader resourceLoader;
private List<SCDLModelLoader> scdlModelLoaders;
@@ -70,7 +69,6 @@
*/
public void setModelContext(AssemblyModelContext modelContext) {
this.modelContext = modelContext;
- this.resourceLoader=this.modelContext.getResourceLoader();
}
/**
@@ -182,13 +180,6 @@
return definitionsByNamespace.get(namespace);
}
- /**
- * @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadClass(java.lang.String)
- */
- public Class loadClass(String className) throws ClassNotFoundException {
- return resourceLoader.loadClass(className);
- }
-
/**
* Transform a model and return the handler containing the result of the
transformation.
* @param object
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
Wed Mar 1 19:23:13 2006
@@ -58,7 +58,7 @@
// Load the interface
if (getInterface()==null && interfaceName!=null) {
try {
- Class
interfaceClass=modelContext.getAssemblyLoader().loadClass(interfaceName);
+ Class
interfaceClass=modelContext.getApplicationResourceLoader().loadClass(interfaceName);
setInterface(interfaceClass);
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(e);
@@ -68,7 +68,7 @@
// Load the callback interface
if (getCallbackInterface()==null && callbackInterfaceName!=null) {
try {
- Class
callbackInterfaceClass=modelContext.getAssemblyLoader().loadClass(callbackInterfaceName);
+ Class
callbackInterfaceClass=modelContext.getApplicationResourceLoader().loadClass(callbackInterfaceName);
setInterface(callbackInterfaceClass);
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException(e);
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java?rev=382266&r1=382265&r2=382266&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
Wed Mar 1 19:23:13 2006
@@ -123,10 +123,10 @@
Class interfaceClass;
try {
// Load the interface
- interfaceClass=modelLoader.loadClass(interfaceName);
+
interfaceClass=modelContext.getApplicationResourceLoader().loadClass(interfaceName);
} catch (ClassNotFoundException e) {
// Generate the interface on the fly
-
interfaceClass=generateJavaInterface(modelContext.getResourceLoader(),
portType, interfaceName);
+
interfaceClass=generateJavaInterface(modelContext.getApplicationResourceLoader(),
portType, interfaceName);
}
super.setInterface(interfaceClass);
}
@@ -138,10 +138,10 @@
Class interfaceClass;
try {
// Load the interface
- interfaceClass=modelLoader.loadClass(interfaceName);
+
interfaceClass=modelContext.getApplicationResourceLoader().loadClass(interfaceName);
} catch (ClassNotFoundException e) {
// Generate the interface on the fly
-
interfaceClass=generateJavaInterface(modelContext.getResourceLoader(),
portType, interfaceName);
+
interfaceClass=generateJavaInterface(modelContext.getApplicationResourceLoader(),
portType, interfaceName);
}
super.setCallbackInterface(interfaceClass);
}
