Author: rfeng
Date: Mon Oct 5 19:06:38 2009
New Revision: 821967
URL: http://svn.apache.org/viewvc?rev=821967&view=rev
Log:
Use ExtensionPointRegistry to pass arguments
Modified:
tuscany/java/sca/modules/core-databinding/META-INF/MANIFEST.MF
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
Modified: tuscany/java/sca/modules/core-databinding/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/META-INF/MANIFEST.MF?rev=821967&r1=821966&r2=821967&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-databinding/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/core-databinding/META-INF/MANIFEST.MF Mon Oct 5
19:06:38 2009
@@ -25,7 +25,6 @@
org.apache.tuscany.sca.databinding.annotation;version="2.0.0",
org.apache.tuscany.sca.databinding.impl;version="2.0.0",
org.apache.tuscany.sca.databinding.javabeans;version="2.0.0",
- org.apache.tuscany.sca.databinding.jaxb;version="2.0.0",
org.apache.tuscany.sca.databinding.xml;version="2.0.0",
org.apache.tuscany.sca.interfacedef;version="2.0.0",
org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",
@@ -37,7 +36,6 @@
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.apache.tuscany.sca.xsd;version="2.0.0",
-
org.oasisopen.sca;version="2.0.0",
org.oasisopen.sca.annotation;version="2.0.0",
org.w3c.dom;resolution:=optional
Modified:
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java?rev=821967&r1=821966&r2=821967&view=diff
==============================================================================
---
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
(original)
+++
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
Mon Oct 5 19:06:38 2009
@@ -34,7 +34,6 @@
import org.apache.tuscany.sca.databinding.Mediator;
import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
import org.apache.tuscany.sca.databinding.impl.Group2GroupTransformer;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import
org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
@@ -50,8 +49,6 @@
DataBindingExtensionPoint dataBindings =
registry.getExtensionPoint(DataBindingExtensionPoint.class);
TransformerExtensionPoint transformers =
registry.getExtensionPoint(TransformerExtensionPoint.class);
- XMLAdapterExtensionPoint xmlAdapterExtensionPoint =
registry.getExtensionPoint(XMLAdapterExtensionPoint.class);
-
FaultExceptionMapper faultExceptionMapper =
registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(FaultExceptionMapper.class);
Mediator mediator =
registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class);
@@ -85,12 +82,12 @@
javaFactory.addInterfaceVisitor(new WebServiceInterfaceProcessor());
// Introspect the data types
javaFactory.addInterfaceVisitor(new
DataBindingJavaInterfaceProcessor(dataBindings));
- javaFactory.addInterfaceVisitor(new
JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper,
xmlAdapterExtensionPoint));
+ javaFactory.addInterfaceVisitor(new
JAXWSJavaInterfaceProcessor(registry));
javaFactory.addInterfaceVisitor(new
WrapperJavaInterfaceProcessor(dataBindings));
RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint =
registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
if (wireProcessorExtensionPoint != null) {
- wireProcessorExtensionPoint.addWireProcessor(new
DataBindingRuntimeWireProcessor(mediator, dataBindings, faultExceptionMapper));
+ wireProcessorExtensionPoint.addWireProcessor(new
DataBindingRuntimeWireProcessor(mediator));
}
}
Modified:
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java?rev=821967&r1=821966&r2=821967&view=diff
==============================================================================
---
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
(original)
+++
tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
Mon Oct 5 19:06:38 2009
@@ -22,10 +22,10 @@
import java.util.List;
import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.databinding.Mediator;
import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Interceptor;
@@ -42,16 +42,15 @@
*/
public class DataBindingRuntimeWireProcessor implements RuntimeWireProcessor {
private Mediator mediator;
- private DataBindingExtensionPoint dataBindings;
- private FaultExceptionMapper faultExceptionMapper;
- public DataBindingRuntimeWireProcessor(Mediator mediator,
- DataBindingExtensionPoint
dataBindings,
- FaultExceptionMapper
faultExceptionMapper) {
+ public DataBindingRuntimeWireProcessor(Mediator mediator) {
super();
this.mediator = mediator;
- this.dataBindings = dataBindings;
- this.faultExceptionMapper = faultExceptionMapper;
+ }
+
+ public DataBindingRuntimeWireProcessor(ExtensionPointRegistry registry) {
+ super();
+ this.mediator =
registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Mediator.class);
}
public boolean isTransformationRequired(DataType source, DataType target) {
Modified:
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java?rev=821967&r1=821966&r2=821967&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
(original)
+++
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
Mon Oct 5 19:06:38 2009
@@ -39,6 +39,8 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;
import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
@@ -70,6 +72,12 @@
private XMLAdapterExtensionPoint xmlAdapterExtensionPoint;
+ public JAXWSJavaInterfaceProcessor(ExtensionPointRegistry registry) {
+ dataBindingExtensionPoint =
registry.getExtensionPoint(DataBindingExtensionPoint.class);
+ faultExceptionMapper =
registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(FaultExceptionMapper.class);
+ xmlAdapterExtensionPoint =
registry.getExtensionPoint(XMLAdapterExtensionPoint.class);
+ }
+
public JAXWSJavaInterfaceProcessor(DataBindingExtensionPoint
dataBindingExtensionPoint,
FaultExceptionMapper
faultExceptionMapper,
XMLAdapterExtensionPoint xmlAdapters) {
