You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/23 08:28:25 UTC
svn commit: r380064 - in /incubator/tuscany/java/sca/container.js/src:
main/java/org/apache/tuscany/container/js/assembly/
main/java/org/apache/tuscany/container/js/assembly/impl/
main/java/org/apache/tuscany/container/js/loader/ main/resources/model/ ...
Author: jsdelfino
Date: Wed Feb 22 23:28:19 2006
New Revision: 380064
URL: http://svn.apache.org/viewcvs?rev=380064&view=rev
Log:
integrated SCDL loader
Added:
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java (with props)
Modified:
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
incubator/tuscany/java/sca/container.js/src/main/resources/model/sca-implementation-js.xsd
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockAssemblyFactory.java
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java
Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java Wed Feb 22 23:28:19 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.container.js.assembly;
-import org.apache.tuscany.common.resource.loader.ResourceLoader;
+import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.container.js.rhino.RhinoInvoker;
import org.apache.tuscany.model.assembly.ComponentImplementation;
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=380064&r1=380063&r2=380064&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 Feb 22 23:28:19 2006
@@ -4,7 +4,7 @@
import java.io.InputStream;
import java.net.URL;
-import org.apache.tuscany.common.resource.loader.ResourceLoader;
+import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.container.js.assembly.JavaScriptImplementation;
import org.apache.tuscany.container.js.rhino.RhinoInvoker;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
Added: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java?rev=380064&view=auto
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java (added)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java Wed Feb 22 23:28:19 2006
@@ -0,0 +1,38 @@
+package org.apache.tuscany.container.js.loader;
+
+import org.apache.tuscany.container.js.assembly.JavaScriptAssemblyFactory;
+import org.apache.tuscany.container.js.assembly.JavaScriptImplementation;
+import org.apache.tuscany.container.js.assembly.impl.JavaScriptAssemblyFactoryImpl;
+import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.model.assembly.AssemblyModelObject;
+import org.apache.tuscany.model.scdl.loader.SCDLModelLoader;
+
+/**
+ * Populates the assembly model from an SCDL model
+ */
+public class JavaScriptSCDLModelLoader implements SCDLModelLoader {
+
+ private AssemblyModelContext modelContext;
+ private JavaScriptAssemblyFactory jsFactory;
+
+ /**
+ * Constructs a new JavaSCDLModelLoader.
+ */
+ public JavaScriptSCDLModelLoader(AssemblyModelContext modelContext) {
+ this.modelContext=modelContext;
+ this.jsFactory=new JavaScriptAssemblyFactoryImpl();
+ }
+
+ /**
+ * @see org.apache.tuscany.model.scdl.loader.SCDLModelLoader#load(java.lang.Object)
+ */
+ public AssemblyModelObject load(Object object) {
+ if (object instanceof org.apache.tuscany.container.js.scdl.JavaScriptImplementation) {
+ org.apache.tuscany.container.js.scdl.JavaScriptImplementation scdlImplementation=(org.apache.tuscany.container.js.scdl.JavaScriptImplementation)object;
+ JavaScriptImplementation implementation=jsFactory.createJavaScriptImplementation();
+ implementation.setScriptFile(scdlImplementation.getScriptFile());
+ return implementation;
+ } else
+ return null;
+ }
+}
Propchange: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptSCDLModelLoader.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/java/sca/container.js/src/main/resources/model/sca-implementation-js.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/resources/model/sca-implementation-js.xsd?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/resources/model/sca-implementation-js.xsd (original)
+++ incubator/tuscany/java/sca/container.js/src/main/resources/model/sca-implementation-js.xsd Wed Feb 22 23:28:19 2006
@@ -19,7 +19,7 @@
xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
elementFormDefault="qualified"
xmlns:sdojava="commonj.sdo/java"
- sdojava:package="org.apache.tuscany.container.js.assembly.scdl"
+ sdojava:package="org.apache.tuscany.container.js.scdl"
targetNamespace="http://org.apache.tuscany/xmlns/js/0.9">
<import namespace="http://www.osoa.org/xmlns/sca/0.9" schemaLocation="../../../../../model/src/main/resources/model/sca-core.xsd"/>
Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java Wed Feb 22 23:28:19 2006
@@ -16,18 +16,7 @@
*/
package org.apache.tuscany.container.js.assembly.impl;
-import java.util.List;
-
-import junit.framework.Assert;
import junit.framework.TestCase;
-
-import org.apache.tuscany.common.resource.loader.ResourceLoaderFactory;
-import org.apache.tuscany.model.assembly.ComponentType;
-import org.apache.tuscany.model.assembly.Property;
-import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
-import org.apache.tuscany.model.assembly.loader.AssemblyLoader;
-import org.apache.tuscany.model.assembly.loader.impl.AssemblyLoaderImpl;
/**
* FIXME commented out until SCDL loading works
Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java Wed Feb 22 23:28:19 2006
@@ -18,7 +18,9 @@
import junit.framework.TestCase;
+import org.apache.tuscany.model.assembly.AssemblyFactory;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
+import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
/**
@@ -68,7 +70,7 @@
super.setUp();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- modelContext = new AssemblyModelContextImpl(null,null);
+ modelContext = new AssemblyModelContextImpl(null, null,null);
}
}
Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSComponentContextBuilderTestCase.java Wed Feb 22 23:28:19 2006
@@ -5,7 +5,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.common.resource.loader.ResourceLoaderFactory;
+import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
import org.apache.tuscany.container.js.assembly.mock.HelloWorldService;
import org.apache.tuscany.container.js.config.JavaScriptComponentRuntimeConfiguration;
import org.apache.tuscany.container.js.mock.MockAssemblyFactory;
@@ -19,8 +19,9 @@
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.SimpleComponent;
+import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
-import org.apache.tuscany.model.assembly.loader.impl.AssemblyLoaderImpl;
+import org.apache.tuscany.model.scdl.loader.impl.SCDLAssemblyModelLoaderImpl;
public class JSComponentContextBuilderTestCase extends TestCase {
@@ -30,8 +31,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 AssemblyLoaderImpl(), ResourceLoaderFactory
- .getResourceLoader(Thread.currentThread().getContextClassLoader())));
+ component.initialize(new AssemblyModelContextImpl(new AssemblyFactoryImpl(), new SCDLAssemblyModelLoaderImpl(), new ResourceLoaderImpl(Thread.currentThread().getContextClassLoader())));
jsBuilder.build(component, null);
ModuleScopeContext context = new ModuleScopeContext(new EventContextImpl());
RuntimeConfiguration<InstanceContext> config = (RuntimeConfiguration) component.getComponentImplementation()
Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockAssemblyFactory.java?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockAssemblyFactory.java Wed Feb 22 23:28:19 2006
@@ -60,7 +60,7 @@
impl.getComponentType().getServices().add(s);
ConfiguredService cService = factory.createConfiguredService();
cService.setService(s);
- cService.initialize(new AssemblyModelContextImpl(null,null));
+ cService.initialize(new AssemblyModelContextImpl(null, null,null));
sc.getConfiguredServices().add(cService);
sc.setName(name);
sc.setComponentImplementation(impl);
Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java?rev=380064&r1=380063&r2=380064&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/mock/MockModuleFactory.java Wed Feb 22 23:28:19 2006
@@ -13,7 +13,7 @@
*/
package org.apache.tuscany.container.js.mock;
-import org.apache.tuscany.common.resource.loader.ResourceLoaderFactory;
+import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
import org.apache.tuscany.container.js.assembly.mock.HelloWorldService;
import org.apache.tuscany.model.assembly.AssemblyFactory;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
@@ -26,7 +26,7 @@
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
-import org.apache.tuscany.model.assembly.loader.impl.AssemblyLoaderImpl;
+import org.apache.tuscany.model.scdl.loader.impl.SCDLAssemblyModelLoaderImpl;
import org.apache.tuscany.model.types.java.JavaServiceContract;
/**
@@ -38,8 +38,8 @@
private static AssemblyFactory factory = new AssemblyFactoryImpl();
- private static AssemblyModelContext assemblyContext = new AssemblyModelContextImpl(new AssemblyLoaderImpl(),
- ResourceLoaderFactory.getResourceLoader(Thread.currentThread().getContextClassLoader()));
+ private static AssemblyModelContext assemblyContext = new AssemblyModelContextImpl(new AssemblyFactoryImpl(), new SCDLAssemblyModelLoaderImpl(),
+ new ResourceLoaderImpl(Thread.currentThread().getContextClassLoader()));
private MockModuleFactory() {
}