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 2007/05/02 20:39:23 UTC
svn commit: r534584 - in /incubator/tuscany/java/sca/modules:
core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/
core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/
core-databinding/src/main/java/org...
Author: jsdelfino
Date: Wed May 2 11:39:21 2007
New Revision: 534584
URL: http://svn.apache.org/viewvc?view=rev&rev=534584
Log:
Minor refactoring and clean up. Renamed MediatorImpl to DefaultMediator. Removed its registration as an extension point as it's not really an extension point, but more like a utility class. Changed the setter injection of databindings and transformers to parameters on its constructor.
Added:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java (with props)
Removed:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingInteceptor.java
incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java Wed May 2 11:39:21 2007
@@ -32,10 +32,9 @@
import org.apache.tuscany.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.databinding.DefaultTransformerExtensionPoint;
-import org.apache.tuscany.databinding.Mediator;
import org.apache.tuscany.databinding.TransformerExtensionPoint;
+import org.apache.tuscany.databinding.impl.DefaultMediator;
import org.apache.tuscany.databinding.impl.Group2GroupTransformer;
-import org.apache.tuscany.databinding.impl.MediatorImpl;
import org.apache.tuscany.databinding.javabeans.DOMNode2JavaBeanTransformer;
import org.apache.tuscany.databinding.javabeans.JavaBean2DOMNodeTransformer;
import org.apache.tuscany.databinding.javabeans.JavaBeansDataBinding;
@@ -78,16 +77,14 @@
DefaultTransformerExtensionPoint transformerRegistryImpl = new DefaultTransformerExtensionPoint();
transformerRegistryImpl.setDataBindingRegistry(dataBindingRegistryImpl);
map.put(TransformerExtensionPoint.class, transformerRegistryImpl);
- MediatorImpl mediatorImpl = new MediatorImpl();
- mediatorImpl.setDataBindingRegistry(dataBindingRegistryImpl);
- mediatorImpl.setTransformerRegistry(transformerRegistryImpl);
- map.put(Mediator.class, mediatorImpl);
return map;
}
public void start(ExtensionPointRegistry registry) {
+ DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
TransformerExtensionPoint transformerRegistry = registry.getExtensionPoint(TransformerExtensionPoint.class);
- Mediator mediator = registry.getExtensionPoint(Mediator.class);
+
+ DefaultMediator mediator = new DefaultMediator(dataBindingRegistry, transformerRegistry);
Input2InputTransformer input2InputTransformer = new Input2InputTransformer();
input2InputTransformer.setMediator(mediator);
@@ -104,14 +101,13 @@
JavaInterfaceIntrospectorExtensionPoint javaIntrospectorExtensionPoint = registry
.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
javaIntrospectorExtensionPoint.addExtension(new DataBindingJavaInterfaceProcessor(mediator
- .getDataBindingRegistry()));
+ .getDataBindings()));
WirePostProcessorRegistry wirePostProcessorRegistry = registry
.getExtensionPoint(WirePostProcessorRegistry.class);
ComponentManager componentManager = registry.getExtensionPoint(ComponentManager.class);
wirePostProcessorRegistry.register(new DataBindingWirePostProcessor(componentManager, mediator));
- DataBindingExtensionPoint dataBindingRegistry = registry.getExtensionPoint(DataBindingExtensionPoint.class);
DOMDataBinding domDataBinding = new DOMDataBinding();
domDataBinding.setDataBindingRegistry(dataBindingRegistry);
dataBindingRegistry.addDataBinding(domDataBinding);
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java Wed May 2 11:39:21 2007
@@ -116,7 +116,7 @@
private ExceptionHandler getExceptionHandler(DataType<DataType> targetType) {
DataType targetFaultType = (DataType)targetType.getLogical();
DataBinding targetDataBinding =
- mediator.getDataBindingRegistry().getDataBinding(targetFaultType.getDataBinding());
+ mediator.getDataBindings().getDataBinding(targetFaultType.getDataBinding());
if (targetDataBinding == null) {
return null;
}
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java Wed May 2 11:39:21 2007
@@ -187,7 +187,7 @@
private WrapperHandler getWrapperHandler(String dataBindingId, boolean required) {
WrapperHandler wrapperHandler = null;
if (dataBindingId != null) {
- DataBinding dataBinding = mediator.getDataBindingRegistry().getDataBinding(dataBindingId);
+ DataBinding dataBinding = mediator.getDataBindings().getDataBinding(dataBindingId);
wrapperHandler = dataBinding == null ? null : dataBinding.getWrapperHandler();
}
if (wrapperHandler == null && required) {
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java Wed May 2 11:39:21 2007
@@ -103,7 +103,7 @@
private WrapperHandler getWrapperHandler(String dataBindingId, boolean required) {
WrapperHandler wrapperHandler = null;
if (dataBindingId != null) {
- DataBinding dataBinding = mediator.getDataBindingRegistry().getDataBinding(dataBindingId);
+ DataBinding dataBinding = mediator.getDataBindings().getDataBinding(dataBindingId);
wrapperHandler = dataBinding == null ? null : dataBinding.getWrapperHandler();
}
if (wrapperHandler == null && required) {
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingInteceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingInteceptor.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingInteceptor.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingInteceptor.java Wed May 2 11:39:21 2007
@@ -192,7 +192,7 @@
private DataType getFaultType(DataType exceptionType) {
// FIXME: We cannot assume the exception will have a databinding set
DataBinding targetDataBinding =
- mediator.getDataBindingRegistry().getDataBinding(exceptionType.getDataBinding());
+ mediator.getDataBindings().getDataBinding(exceptionType.getDataBinding());
if (targetDataBinding == null) {
return null;
}
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessorOptimizationTestCase.java Wed May 2 11:39:21 2007
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.databinding.Mediator;
-import org.apache.tuscany.databinding.impl.MediatorImpl;
+import org.apache.tuscany.databinding.impl.DefaultMediator;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
@@ -65,7 +65,7 @@
URI targetUri = URI.create("/componentB/#svc1");
// FIXME: [rfeng] We should use Mocks here
- Mediator mediator = new MediatorImpl();
+ Mediator mediator = new DefaultMediator(null, null);
ComponentManager componentManager = createMock(ComponentManager.class);
Component component = createMock(Component.class);
expect(componentManager.getComponent(URIHelper.getDefragmentedName(sourceUri))).andReturn(component);
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/Mediator.java Wed May 2 11:39:21 2007
@@ -54,14 +54,14 @@
Map<String, Object> context);
/**
- * Get the DataBinding registry
+ * Get the DataBindings used by this mediator.
* @return
*/
- DataBindingExtensionPoint getDataBindingRegistry();
+ DataBindingExtensionPoint getDataBindings();
/**
- * Get the Transformer registry
+ * Get the Transformers used by this mediator.
* @return
*/
- TransformerExtensionPoint getTransformerRegistry();
+ TransformerExtensionPoint getTransformers();
}
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java?view=auto&rev=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java Wed May 2 11:39:21 2007
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.databinding.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.databinding.DataPipe;
+import org.apache.tuscany.databinding.Mediator;
+import org.apache.tuscany.databinding.PullTransformer;
+import org.apache.tuscany.databinding.PushTransformer;
+import org.apache.tuscany.databinding.TransformationContext;
+import org.apache.tuscany.databinding.TransformationException;
+import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
+
+/**
+ * Default Mediator implementation
+ */
+public class DefaultMediator implements Mediator {
+
+ private DataBindingExtensionPoint dataBindings;
+ private TransformerExtensionPoint transformers;
+
+ public DefaultMediator(DataBindingExtensionPoint dataBindings,
+ TransformerExtensionPoint transformers) {
+ this.dataBindings = dataBindings;
+ this.transformers = transformers;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Object mediate(Object source, DataType sourceDataType, DataType targetDataType, Map<String, Object> metadata) {
+ if (sourceDataType == null || sourceDataType.getDataBinding() == null) {
+ sourceDataType = dataBindings.introspectType(source);
+ }
+ if (sourceDataType == null) {
+ return source;
+ } else if (sourceDataType.equals(targetDataType)) {
+ return source;
+ }
+
+ List<Transformer> path = getTransformerChain(sourceDataType, targetDataType);
+
+ Object result = source;
+ int size = path.size();
+ int i = 0;
+ while (i < size) {
+ Transformer transformer = path.get(i);
+ TransformationContext context = createTransformationContext(sourceDataType,
+ targetDataType,
+ size,
+ i,
+ transformer,
+ metadata);
+ // the source and target type
+ if (transformer instanceof PullTransformer) {
+ // For intermediate node, set data type to null
+ result = ((PullTransformer)transformer).transform(result, context);
+ } else if (transformer instanceof PushTransformer) {
+ DataPipe dataPipe = (i < size - 1) ? (DataPipe)path.get(++i) : null;
+ ((PushTransformer)transformer).transform(result, dataPipe.getSink(), context);
+ result = dataPipe.getResult();
+ }
+ i++;
+ }
+
+ return result;
+ }
+
+ private TransformationContext createTransformationContext(DataType sourceDataType,
+ DataType targetDataType,
+ int size,
+ int index,
+ Transformer transformer,
+ Map<String, Object> metadata) {
+ DataType sourceType = (index == 0) ? sourceDataType : new DataTypeImpl<Object>(transformer
+ .getSourceDataBinding(), Object.class, null);
+ DataType targetType = (index == size - 1) ? targetDataType : new DataTypeImpl<Object>(transformer
+ .getTargetDataBinding(), Object.class, null);
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ TransformationContext context = new TransformationContextImpl(sourceType, targetType, classLoader, metadata);
+ return context;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void mediate(Object source,
+ Object target,
+ DataType sourceDataType,
+ DataType targetDataType,
+ Map<String, Object> metadata) {
+ if (source == null) {
+ // Shortcut for null value
+ return;
+ }
+ if (sourceDataType == null || sourceDataType.getDataBinding() == null) {
+ sourceDataType = dataBindings.introspectType(source);
+ }
+ if (sourceDataType == null) {
+ return;
+ } else if (sourceDataType.equals(targetDataType)) {
+ return;
+ }
+
+ List<Transformer> path = getTransformerChain(sourceDataType, targetDataType);
+ Object result = source;
+ int size = path.size();
+ for (int i = 0; i < size; i++) {
+ Transformer transformer = path.get(i);
+ TransformationContext context = createTransformationContext(sourceDataType,
+ targetDataType,
+ size,
+ i,
+ transformer,
+ metadata);
+
+ if (transformer instanceof PullTransformer) {
+ result = ((PullTransformer)transformer).transform(result, context);
+ } else if (transformer instanceof PushTransformer) {
+ DataPipe dataPipe = (i < size - 1) ? (DataPipe)path.get(++i) : null;
+ Object sink = dataPipe != null ? dataPipe.getSink() : target;
+ ((PushTransformer)transformer).transform(result, sink, context);
+ result = (dataPipe != null) ? dataPipe.getResult() : null;
+ }
+ }
+ }
+
+ private List<Transformer> getTransformerChain(DataType sourceDataType, DataType targetDataType) {
+ String sourceId = sourceDataType.getDataBinding();
+ String targetId = targetDataType.getDataBinding();
+ List<Transformer> path = transformers.getTransformerChain(sourceId, targetId);
+ if (path == null) {
+ TransformationException ex = new TransformationException("No path found for the transformation");
+ ex.setSourceDataBinding(sourceId);
+ ex.setTargetDataBinding(targetId);
+ throw ex;
+ }
+ return path;
+ }
+
+ public DataBindingExtensionPoint getDataBindings() {
+ return dataBindings;
+ }
+
+ public TransformerExtensionPoint getTransformers() {
+ return transformers;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/databinding/impl/DefaultMediator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java Wed May 2 11:39:21 2007
@@ -73,22 +73,20 @@
+ " </items>"
+ "</ipo:purchaseOrder>";
- private MediatorImpl mediator;
+ private DefaultMediator mediator;
protected void setUp() throws Exception {
super.setUp();
TransformerExtensionPoint registry = new DefaultTransformerExtensionPoint();
+ DataBindingExtensionPoint dataBindingRegistry = new DefaultDataBindingExtensionPoint();
+
registry.addTransformer(new String2SAX());
registry.addTransformer(new SAX2DOMPipe());
registry.addTransformer(new Node2String());
registry.addTransformer(new Node2Writer());
- mediator = new MediatorImpl();
- mediator.setTransformerRegistry(registry);
-
- DataBindingExtensionPoint dataBindingRegistry = new DefaultDataBindingExtensionPoint();
- mediator.setDataBindingRegistry(dataBindingRegistry);
+ mediator = new DefaultMediator(dataBindingRegistry, registry);
}
private TransformationContext createTransformationContext(Class sourceType, Class targetType) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaPropertyValueObjectFactory.java Wed May 2 11:39:21 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.databinding.Mediator;
import org.apache.tuscany.databinding.SimpleTypeMapper;
import org.apache.tuscany.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.databinding.impl.MediatorImpl;
+import org.apache.tuscany.databinding.impl.DefaultMediator;
import org.apache.tuscany.databinding.impl.SimpleTypeMapperImpl;
import org.apache.tuscany.databinding.javabeans.DOMNode2JavaBeanTransformer;
import org.apache.tuscany.databinding.javabeans.JavaBeansDataBinding;
@@ -178,7 +178,7 @@
targetDataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
} else {
targetDataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
- mediator.getDataBindingRegistry().introspectType(targetDataType, null);
+ mediator.getDataBindings().introspectType(targetDataType, null);
}
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Wed May 2 11:39:21 2007
@@ -28,7 +28,8 @@
import org.apache.tuscany.core.ExtensionPointRegistry;
import org.apache.tuscany.core.ModuleActivator;
import org.apache.tuscany.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.databinding.Mediator;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
+import org.apache.tuscany.databinding.impl.DefaultMediator;
import org.apache.tuscany.implementation.java.JavaImplementation;
import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.context.JavaComponentBuilder;
@@ -127,7 +128,9 @@
builder.setWorkContext(extensionPointRegistry.getExtensionPoint(WorkContext.class));
builderRegistry.register(JavaImplementation.class, builder);
- Mediator mediator = extensionPointRegistry.getExtensionPoint(Mediator.class);
+ DefaultMediator mediator =
+ new DefaultMediator(extensionPointRegistry.getExtensionPoint(DataBindingExtensionPoint.class),
+ extensionPointRegistry.getExtensionPoint(TransformerExtensionPoint.class));
JavaPropertyValueObjectFactory factory = new JavaPropertyValueObjectFactory(mediator);
builder.setPropertyValueObjectFactory(factory);
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java?view=diff&rev=534584&r1=534583&r2=534584
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java Wed May 2 11:39:21 2007
@@ -26,7 +26,8 @@
import org.apache.tuscany.core.ExtensionPointRegistry;
import org.apache.tuscany.core.ModuleActivator;
import org.apache.tuscany.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.databinding.Mediator;
+import org.apache.tuscany.databinding.TransformerExtensionPoint;
+import org.apache.tuscany.databinding.impl.DefaultMediator;
import org.apache.tuscany.spi.builder.BuilderRegistry;
public class ScriptModuleActivator implements ModuleActivator {
@@ -44,7 +45,9 @@
builder = new ScriptComponentBuilder();
builder.setBuilderRegistry(builderRegistry);
- Mediator mediator = registry.getExtensionPoint(Mediator.class);
+ DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
+ TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
+ DefaultMediator mediator = new DefaultMediator(dataBindings, transformers);
ScriptPropertyValueObjectFactory factory = new ScriptPropertyValueObjectFactory(mediator);
builder.setPropertyValueObjectFactory(factory);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org