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/09 15:15:54 UTC
svn commit: r536510 -
/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/
Author: antelder
Date: Wed May 9 06:15:53 2007
New Revision: 536510
URL: http://svn.apache.org/viewvc?view=rev&rev=536510
Log:
move around the propertyfactory
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/ScriptImplementation.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
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=536510&r1=536509&r2=536510
==============================================================================
--- 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 Wed May 9 06:15:53 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.assembly.xml.Constants;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.implementation.spi.AbstractStAXArtifactProcessor;
-import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
import org.apache.tuscany.implementation.spi.ResourceHelper;
/**
@@ -42,12 +41,8 @@
private static final QName IMPLEMENTATION_SCRIPT_QNAME = new QName(Constants.SCA10_NS, "implementation.script");
- // TODO: runtime needs to provide a better way to get the PropertyValueObjectFactory
- private PropertyValueObjectFactory propertyFactory;
-
- public ScriptArtifactProcessor(AssemblyFactory assemblyFactory, PropertyValueObjectFactory propertyFactory) {
+ public ScriptArtifactProcessor(AssemblyFactory assemblyFactory) {
super(assemblyFactory);
- this.propertyFactory = propertyFactory;
}
public QName getArtifactType() {
@@ -74,7 +69,7 @@
}
String scriptSrc = ResourceHelper.readResource(scriptName);
- ScriptImplementation scriptImpl = new ScriptImplementation(scriptName, scriptLanguage, scriptSrc, propertyFactory);
+ ScriptImplementation scriptImpl = new ScriptImplementation(scriptName, scriptLanguage, scriptSrc);
// TODO: How to get the script URI? Should use the contrabution service
// the uri is used in the resolve method (perhaps incorrectly?) to get the .componentType sidefile
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java?view=diff&rev=536510&r1=536509&r2=536510
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java Wed May 9 06:15:53 2007
@@ -19,10 +19,7 @@
package org.apache.tuscany.sca.implementation.script;
import org.apache.tuscany.assembly.Implementation;
-import org.apache.tuscany.core.RuntimeComponent;
import org.apache.tuscany.implementation.spi.AbstractImplementation;
-import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
-import org.apache.tuscany.provider.ImplementationProvider;
/**
* Represents a Script implementation.
@@ -33,13 +30,10 @@
protected String scriptSrc;
protected String scriptLanguage;
- protected PropertyValueObjectFactory propertyFactory;
-
- public ScriptImplementation(String scriptName, String scriptLanguage, String scriptSrc, PropertyValueObjectFactory propertyFactory) {
+ public ScriptImplementation(String scriptName, String scriptLanguage, String scriptSrc) {
this.scriptName = scriptName;
this.scriptLanguage = scriptLanguage;
this.scriptSrc = scriptSrc;
- this.propertyFactory = propertyFactory;
}
public String getScriptName() {
@@ -58,7 +52,4 @@
this.scriptSrc = scriptSrc;
}
- public ImplementationProvider createImplementationProvider(RuntimeComponent component) {
- return new ScriptImplementationProvider(component, this);
- }
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java?view=diff&rev=536510&r1=536509&r2=536510
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java Wed May 9 06:15:53 2007
@@ -34,6 +34,7 @@
import org.apache.tuscany.core.RuntimeComponentService;
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.core.invocation.JDKProxyService;
+import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.java.JavaInterface;
@@ -52,10 +53,12 @@
protected RuntimeComponent component;
protected ScriptImplementation implementation;
protected ScriptEngine scriptEngine;
+ protected PropertyValueObjectFactory propertyFactory;
- public ScriptImplementationProvider(RuntimeComponent component, ScriptImplementation implementation) {
+ public ScriptImplementationProvider(RuntimeComponent component, ScriptImplementation implementation, PropertyValueObjectFactory propertyFactory) {
this.component = component;
this.implementation = implementation;
+ this.propertyFactory = propertyFactory;
}
public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
@@ -82,7 +85,7 @@
}
for (Property property : implementation.getProperties()) {
- ObjectFactory<?> propertyValueFactory = implementation.propertyFactory.createValueFactory(property);
+ ObjectFactory<?> propertyValueFactory = propertyFactory.createValueFactory(property);
if ( propertyValueFactory != null) {
scriptEngine.put(property.getName(), propertyValueFactory.getInstance());
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java?view=diff&rev=536510&r1=536509&r2=536510
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java Wed May 9 06:15:53 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.implementation.script;
import org.apache.tuscany.core.RuntimeComponent;
+import org.apache.tuscany.implementation.spi.PropertyValueObjectFactory;
import org.apache.tuscany.provider.ImplementationProvider;
import org.apache.tuscany.provider.ImplementationProviderFactory;
@@ -27,11 +28,14 @@
*/
public class ScriptImplementationProviderFactory implements ImplementationProviderFactory<ScriptImplementation> {
- public ScriptImplementationProviderFactory() {
+ private PropertyValueObjectFactory propertyFactory;
+
+ public ScriptImplementationProviderFactory(PropertyValueObjectFactory propertyFactory) {
+ this.propertyFactory = propertyFactory;
}
public ImplementationProvider<ScriptImplementation> createImplementationProvider(RuntimeComponent component, ScriptImplementation implementation) {
- return new ScriptImplementationProvider(component, implementation);
+ return new ScriptImplementationProvider(component, implementation, propertyFactory);
}
public Class<ScriptImplementation> getModelType() {
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=536510&r1=536509&r2=536510
==============================================================================
--- 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 Wed May 9 06:15:53 2007
@@ -36,19 +36,18 @@
public void start(ExtensionPointRegistry registry) {
+ StAXArtifactProcessorExtensionPoint staxProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ StAXArtifactProcessor scriptArtifactProcessor = new ScriptArtifactProcessor(new DefaultAssemblyFactory());
+ staxProcessors.addArtifactProcessor(scriptArtifactProcessor);
+
// TODO: could the runtime have a default PropertyValueObjectFactory in the registry
DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
DefaultMediator mediator = new DefaultMediator(dataBindings, transformers);
PropertyValueObjectFactory propertyFactory = new PropertyValueObjectFactory(mediator);
- StAXArtifactProcessor scriptArtifactProcessor = new ScriptArtifactProcessor(new DefaultAssemblyFactory(), propertyFactory);
-
- StAXArtifactProcessorExtensionPoint staxProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- staxProcessors.addArtifactProcessor(scriptArtifactProcessor);
-
ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
- providerFactories.addProviderFactory(new ScriptImplementationProviderFactory());
+ providerFactories.addProviderFactory(new ScriptImplementationProviderFactory(propertyFactory));
}
public void stop(ExtensionPointRegistry registry) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org