You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/04 13:41:47 UTC
svn commit: r535187 - in
/incubator/tuscany/java/sca/modules/implementation-script/src:
main/java/org/apache/tuscany/implementation/spi/
main/java/org/apache/tuscany/sca/implementation/script/
test/java/org/apache/tuscany/implementation/ test/java/org/...
Author: antelder
Date: Fri May 4 04:41:46 2007
New Revision: 535187
URL: http://svn.apache.org/viewvc?view=rev&rev=535187
Log:
Get helloworld going again
Added:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java
- copied, changed from r535170, incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ScriptPropertyValueObjectFactory.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java
- copied, changed from r535173, incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ResourceHelper.java
Removed:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ScriptPropertyValueObjectFactory.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ResourceHelper.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/implementation/
incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/implementation/
Modified:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
Copied: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java (from r535170, incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ScriptPropertyValueObjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java?view=diff&rev=535187&p1=incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ScriptPropertyValueObjectFactory.java&r1=535170&p2=incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ScriptPropertyValueObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java Fri May 4 04:41:46 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.implementation.spi;
-
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@ -35,13 +34,16 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-public class ScriptPropertyValueObjectFactory {
+/**
+ * TODO: Shouldn't this class be provided by the runtime?
+ */
+public class PropertyValueObjectFactory {
// protected DataBindingRegistry dbRegistry = new DataBindingRegistryImpl();
protected Mediator mediator = null;
protected SimpleTypeMapper simpleTypeMapper = new SimpleTypeMapperImpl();
boolean isSimpleType;
- public ScriptPropertyValueObjectFactory(Mediator mediator) {
+ public PropertyValueObjectFactory(Mediator mediator) {
this.mediator = mediator;
}
Copied: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java (from r535173, incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ResourceHelper.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java?view=diff&rev=535187&p1=incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ResourceHelper.java&r1=535173&p2=incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ResourceHelper.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java Fri May 4 04:41:46 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.implementation.script;
+package org.apache.tuscany.implementation.spi;
import java.io.IOException;
import java.io.InputStream;
@@ -25,25 +25,25 @@
import java.io.Reader;
import java.net.URL;
-import org.apache.tuscany.contribution.service.ContributionResolveException;
+import org.apache.tuscany.contribution.service.ContributionReadException;
/**
* TODO: Shouldn't this be using the contrabution service?
*/
public class ResourceHelper {
- public static String readResource(String scriptName) throws ContributionResolveException {
+ public static String readResource(String scriptName) throws ContributionReadException {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
URL scriptSrcUrl = cl.getResource(scriptName);
if (scriptSrcUrl == null) {
- throw new ContributionResolveException("No script: " + scriptName);
+ throw new ContributionReadException("No script: " + scriptName);
}
InputStream is;
try {
is = scriptSrcUrl.openStream();
} catch (IOException e) {
- throw new ContributionResolveException(e);
+ throw new ContributionReadException(e);
}
try {
@@ -59,7 +59,7 @@
return source.toString();
} catch (IOException e) {
- throw new ContributionResolveException(e);
+ throw new ContributionReadException(e);
} finally {
try {
is.close();
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java?view=diff&rev=535187&r1=535186&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java Fri May 4 04:41:46 2007
@@ -37,7 +37,8 @@
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
import org.apache.tuscany.contribution.service.ContributionWriteException;
-import org.apache.tuscany.implementation.spi.ScriptPropertyValueObjectFactory;
+import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
+import org.apache.tuscany.implementation.spi.ResourceHelper;
// TODO: I hate the way this has to mess about with the .componentType side file,
// the runtime should do that for me
@@ -47,9 +48,9 @@
private static final QName IMPLEMENTATION_SCRIPT_QNAME = new QName(Constants.SCA10_NS, "implementation.script");
private AssemblyFactory assemblyFactory;
- private ScriptPropertyValueObjectFactory propertyFactory;
+ private PropertyValueObjectFactory propertyFactory;
- public ScriptArtifactProcessor(AssemblyFactory assemblyFactory, ScriptPropertyValueObjectFactory propertyFactory) {
+ public ScriptArtifactProcessor(AssemblyFactory assemblyFactory, PropertyValueObjectFactory propertyFactory) {
this.assemblyFactory = assemblyFactory;
this.propertyFactory = propertyFactory;
}
@@ -72,6 +73,9 @@
}
}
+ String scriptSrc = ResourceHelper.readResource(scriptImplementation.getScriptName());
+ scriptImplementation.setScriptSrc(scriptSrc);
+
processComponentType(scriptImplementation);
return scriptImplementation;
@@ -118,9 +122,6 @@
}
public void resolve(ScriptImplementation scriptImplementation, ArtifactResolver resolver) throws ContributionResolveException {
-
- String scriptSrc = ResourceHelper.readResource(scriptImplementation.getScriptName());
- scriptImplementation.setScriptSrc(scriptSrc);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
String scriptURI = cl.getResource(scriptImplementation.getScriptName()).toString();
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java?view=diff&rev=535187&r1=535186&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java Fri May 4 04:41:46 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.TransformerExtensionPoint;
import org.apache.tuscany.databinding.impl.DefaultMediator;
-import org.apache.tuscany.implementation.spi.ScriptPropertyValueObjectFactory;
+import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
public class ScriptModuleActivator implements ModuleActivator {
@@ -40,7 +40,7 @@
DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
DefaultMediator mediator = new DefaultMediator(dataBindings, transformers);
- ScriptPropertyValueObjectFactory propertyFactory = new ScriptPropertyValueObjectFactory(mediator);
+ PropertyValueObjectFactory propertyFactory = new PropertyValueObjectFactory(mediator);
scriptArtifactProcessor = new ScriptArtifactProcessor(new DefaultAssemblyFactory(), propertyFactory);
processors.addArtifactProcessor(scriptArtifactProcessor);
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java?view=diff&rev=535187&r1=535186&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java Fri May 4 04:41:46 2007
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.host.embedded.SCARuntime;
import org.apache.tuscany.host.embedded.SCARuntimeActivator;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite?view=diff&rev=535187&r1=535186&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite Fri May 4 04:41:46 2007
@@ -21,12 +21,12 @@
name="JavaScriptHelloWorld">
<component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.implementation.script.itests.helloworld.HelloWorldProxy"/>
+ <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>
<reference name="delegate" target="HelloWorldComponent"></reference>
</component>
<component name="HelloWorldComponent">
- <implementation.script script="org/apache/tuscany/implementation/script/itests/helloworld/helloworld.js"/>
+ <implementation.script script="org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType?view=diff&rev=535187&r1=535186&r2=535187
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType Fri May 4 04:41:46 2007
@@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<service name="HelloWorldService">
- <interface.java interface="org.apache.tuscany.implementation.script.itests.helloworld.HelloWorld" />
+ <interface.java interface="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorld" />
</service>
</componentType>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org