Author: jboynes
Date: Sat Apr 8 08:51:14 2006
New Revision: 392549
URL: http://svn.apache.org/viewcvs?rev=392549&view=rev
Log:
remove last references to SCDLModelLoader and model transformations
Removed:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/SCDLModelLoader.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/util/ModelContentHandler.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/util/ModelTransformer.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/util/ModelTransformerImpl.java
Modified:
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.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
Modified:
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java?rev=392549&r1=392548&r2=392549&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
Sat Apr 8 08:51:14 2006
@@ -28,7 +28,7 @@
JavaScriptTargetWireBuilder jsWireBuilder = new
JavaScriptTargetWireBuilder();
SimpleComponent component = MockAssemblyFactory.createComponent("foo",
"org/apache/tuscany/container/js/assembly/mock/HelloWorldImpl.js",
HelloWorldService.class, Scope.MODULE);
- component.initialize(new AssemblyModelContextImpl(new
AssemblyFactoryImpl(), new SCDLAssemblyModelLoaderImpl(null), new
ResourceLoaderImpl(Thread.currentThread().getContextClassLoader())));
+ component.initialize(new AssemblyModelContextImpl(new
AssemblyFactoryImpl(), new SCDLAssemblyModelLoaderImpl(), new
ResourceLoaderImpl(Thread.currentThread().getContextClassLoader())));
jsBuilder.build(component);
ModuleScopeContext context = new ModuleScopeContext(new
EventContextImpl());
ContextFactory<Context> contextFactory = (ContextFactory)
component.getComponentImplementation()
Modified:
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java?rev=392549&r1=392548&r2=392549&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java
Sat Apr 8 08:51:14 2006
@@ -39,7 +39,7 @@
private static AssemblyFactory factory = new AssemblyFactoryImpl();
private static AssemblyModelContext assemblyContext = new
AssemblyModelContextImpl(new AssemblyFactoryImpl(),
- new SCDLAssemblyModelLoaderImpl(null), new
ResourceLoaderImpl(Thread.currentThread().getContextClassLoader()));
+ new SCDLAssemblyModelLoaderImpl(), new
ResourceLoaderImpl(Thread.currentThread().getContextClassLoader()));
private MockModuleFactory() {
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java?rev=392549&r1=392548&r2=392549&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/BootstrapHelper.java
Sat Apr 8 08:51:14 2006
@@ -36,7 +36,6 @@
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
-import org.apache.tuscany.model.scdl.loader.SCDLModelLoader;
import org.apache.tuscany.model.scdl.loader.impl.SCDLAssemblyModelLoaderImpl;
import javax.xml.stream.XMLInputFactory;
@@ -61,8 +60,7 @@
AssemblyFactory modelFactory = new SystemAssemblyFactoryImpl();
// Create a default assembly model loader
- List<SCDLModelLoader> scdlLoaders = new ArrayList<SCDLModelLoader>();
- AssemblyModelLoader modelLoader = new
SCDLAssemblyModelLoaderImpl(scdlLoaders);
+ AssemblyModelLoader modelLoader = new SCDLAssemblyModelLoaderImpl();
// Create a resource loader from the supplied classloader
ResourceLoader resourceLoader = new ResourceLoaderImpl(classLoader);
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=392549&r1=392548&r2=392549&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
Sat Apr 8 08:51:14 2006
@@ -52,10 +52,6 @@
this.systemResourceLoader = resourceLoader;
this.applicationResourceLoader = artifactLoader;
this.typeHelper=typeHelper;
-
- //FIXME the caller should configure the assemblyLoader himself
- if (assemblyLoader!=null)
- assemblyLoader.setModelContext(this);
}
/**
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=392549&r1=392548&r2=392549&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
Sat Apr 8 08:51:14 2006
@@ -20,30 +20,10 @@
import javax.wsdl.Definition;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.ModuleFragment;
-import org.apache.tuscany.model.assembly.Subsystem;
-import org.apache.tuscany.model.scdl.loader.SCDLModelLoader;
-
/**
* An assembly model loader.
*/
public interface AssemblyModelLoader {
-
- /**
- * Sets the model context to use.
- * @param modelContext
- */
- void setModelContext(AssemblyModelContext modelContext);
-
- /**
- * Returns the component type at the given uri
- * @param uri
- * @return the ComponentType at the given uri
- */
- ComponentType loadComponentType(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=392549&r1=392548&r2=392549&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
Sat Apr 8 08:51:14 2006
@@ -17,80 +17,23 @@
package org.apache.tuscany.model.scdl.loader.impl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
-import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.ModuleFragment;
-import org.apache.tuscany.model.assembly.Subsystem;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
-import org.apache.tuscany.model.scdl.loader.SCDLModelLoader;
-import org.apache.tuscany.model.util.ModelTransformer;
-import org.apache.tuscany.model.util.ModelTransformerImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
/**
*/
public class SCDLAssemblyModelLoaderImpl implements AssemblyModelLoader {
-
- private SCDLXMLReader xmlReader=new SCDLXMLReader();
private WSDLReader wsdlReader;
- private AssemblyModelContext modelContext;
-
- private List<SCDLModelLoader> scdlModelLoaders;
-
- private Map<String, ComponentType> componentTypes=new HashMap<String,
ComponentType>();
- private Map<String, Module> modules=new HashMap<String, Module>();
- private Map<String, ModuleFragment> moduleFragments=new HashMap<String,
ModuleFragment>();
- private Map<String, Subsystem> subsystems=new HashMap<String, Subsystem>();
private Map<String, Definition> definitions=new HashMap<String,
Definition>();
private Map<String, List<Definition>> definitionsByNamespace=new
HashMap<String, List<Definition>>();
-
- /**
- * Constructor
- */
- public SCDLAssemblyModelLoaderImpl(List<SCDLModelLoader> loaders) {
- scdlModelLoaders=loaders!=null? loaders:new
ArrayList<SCDLModelLoader>();
- }
-
- /**
- * @param modelContext The modelContext to set.
- */
- public void setModelContext(AssemblyModelContext modelContext) {
- this.modelContext = modelContext;
- }
-
- /**
- * @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadComponentType(java.lang.String)
- */
- public ComponentType loadComponentType(String uri) {
- ComponentType componentType=componentTypes.get(uri);
- if (componentType!=null)
- return componentType;
-
- // 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#loadDefinition(java.lang.String)
- */
public Definition loadDefinition(String uri) {
Definition definition=definitions.get(uri);
if (definition!=null)
@@ -118,28 +61,9 @@
return definition;
}
-
- /**
- * @see
org.apache.tuscany.model.assembly.loader.AssemblyModelLoader#loadDefinitions(java.lang.String)
- */
+
public List<Definition> loadDefinitions(String namespace) {
return definitionsByNamespace.get(namespace);
}
- /**
- * Transform a model and return the handler containing the result of the
transformation.
- * @param object
- * @return a transformed model
- */
- @SuppressWarnings("unchecked")
- private SCDLModelContentHandlerImpl transform(Object object) {
- //FIXME Remove this dependency on EMF
- Iterator<Object>
contents=EcoreUtil.getAllContents(Collections.singleton(object), true);
-
- ModelTransformer transformer=new ModelTransformerImpl();
- SCDLModelContentHandlerImpl handler=new
SCDLModelContentHandlerImpl(modelContext, scdlModelLoaders);
- transformer.transform(contents, handler);
- return handler;
- }
-
}
