You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/16 08:29:42 UTC
svn commit: r529142 - in /incubator/tuscany/java/sca/modules: host-embedded/
implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/
implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/
Author: rfeng
Date: Sun Apr 15 23:29:41 2007
New Revision: 529142
URL: http://svn.apache.org/viewvc?view=rev&rev=529142
Log:
Add pass-by-value for java components
Added:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java (with props)
Modified:
incubator/tuscany/java/sca/modules/host-embedded/pom.xml
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
Modified: incubator/tuscany/java/sca/modules/host-embedded/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/pom.xml?view=diff&rev=529142&r1=529141&r2=529142
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/pom.xml Sun Apr 15 23:29:41 2007
@@ -59,6 +59,14 @@
<artifactId>tuscany-interface-wsdl-runtime</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-databinding</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java?view=diff&rev=529142&r1=529141&r2=529142
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaAtomicComponent.java Sun Apr 15 23:29:41 2007
@@ -27,16 +27,18 @@
import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceUtil;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
+import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
/**
* The runtime instantiation of Java component implementations
- *
+ *
* @version $Rev$ $Date$
*/
public class JavaAtomicComponent extends PojoAtomicComponent {
private JavaPropertyValueObjectFactory propertyValueFactory;
+ private DataBindingRegistry dataBindingRegistry;
public JavaAtomicComponent(PojoConfiguration configuration) {
super(configuration);
@@ -47,13 +49,21 @@
Class<?> implClass;
if (isCallback) {
- implClass = ((JavaInterface) operation.getInterface()).getJavaClass();
+ implClass = ((JavaInterface)operation.getInterface()).getJavaClass();
} else {
implClass = configuration.getImplementationClass();
}
try {
Method method = JavaInterfaceUtil.findMethod(implClass, operation);
- return new JavaTargetInvoker(method, this, scopeContainer);
+ boolean passByValue = operation.getInterface().isRemotable() && (!configuration.getDefinition()
+ .isAllowsPassByReference(method));
+
+ TargetInvoker invoker = new JavaTargetInvoker(method, this, scopeContainer);
+ if (passByValue) {
+ return new PassByValueInvoker(dataBindingRegistry, operation, method, this, scopeContainer);
+ } else {
+ return invoker;
+ }
} catch (NoSuchMethodException e) {
throw new TargetMethodNotFoundException(operation);
}
@@ -63,15 +73,19 @@
protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire) {
return new WireObjectFactory<B>(interfaze, wire, proxyService);
}
-
- protected ObjectFactory<?> createPropertyValueFactory(ComponentProperty property, Object propertyValue, Class javaType) {
+ protected ObjectFactory<?> createPropertyValueFactory(ComponentProperty property,
+ Object propertyValue,
+ Class javaType) {
return propertyValueFactory.createValueFactory(property, propertyValue, javaType);
}
public void setPropertyValueFactory(JavaPropertyValueObjectFactory propertyValueFactory) {
this.propertyValueFactory = propertyValueFactory;
}
-
-
+
+ public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
+ this.dataBindingRegistry = dataBindingRegistry;
+ }
+
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java?view=diff&rev=529142&r1=529141&r2=529142
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilder.java Sun Apr 15 23:29:41 2007
@@ -28,6 +28,7 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.host.ResourceHost;
@@ -41,6 +42,8 @@
*/
public class JavaComponentBuilder extends ComponentBuilderExtension<JavaImplementation> {
private JavaPropertyValueObjectFactory propertyValueObjectFactory;
+ private DataBindingRegistry dataBindingRegistry;
+
private ResourceHost host;
@Reference
@@ -63,6 +66,7 @@
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setPropertyValueFactory(propertyValueObjectFactory);
+ component.setDataBindingRegistry(dataBindingRegistry);
if (componentType.getConversationIDMember() != null) {
component.addConversationIDFactory(componentType.getConversationIDMember());
@@ -106,6 +110,10 @@
public void setPropertyValueObjectFactory(JavaPropertyValueObjectFactory propertyValueObjectFactory) {
this.propertyValueObjectFactory = propertyValueObjectFactory;
+ }
+
+ public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
+ this.dataBindingRegistry = dataBindingRegistry;
}
}
Added: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java?view=auto&rev=529142
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java (added)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java Sun Apr 15 23:29:41 2007
@@ -0,0 +1,118 @@
+/*
+ * 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.implementation.java.context;
+
+import java.lang.reflect.Method;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.Operation;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.databinding.DataBinding;
+import org.apache.tuscany.spi.databinding.DataBindingRegistry;
+import org.apache.tuscany.spi.extension.TargetInvokerExtension;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+
+/**
+ * An interceptor to enforce pass-by-value semantics for remotable interfaces
+ *
+ * @version $Rev$ $Date$
+ */
+public class PassByValueInvoker extends JavaTargetInvoker {
+ private DataBindingRegistry registry;
+ private Operation operation;
+
+ /**
+ * @param method
+ * @param component
+ * @param scopeContainer
+ * @param passByValue
+ */
+ public PassByValueInvoker(DataBindingRegistry registry, Operation operation, Method method, AtomicComponent component, ScopeContainer scopeContainer) {
+ super(method, component, scopeContainer);
+ this.registry = registry;
+ this.operation = operation;
+ }
+
+
+ public Message invoke(Message msg) {
+ Object obj = msg.getBody();
+ msg.setBody(copy((Object[])obj));
+
+ Message result = super.invoke(msg);
+
+ if (!result.isFault()) {
+ String dataBindingId = operation.getOutputType().getDataBinding();
+ DataBinding dataBinding = registry.getDataBinding(dataBindingId);
+ result.setBody(copy(result.getBody(), dataBinding));
+ }
+ return result;
+ }
+
+ public Object[] copy(Object[] args) {
+ if (args == null) {
+ return null;
+ }
+ Object[] copiedArgs = new Object[args.length];
+ Map<Object, Object> map = new IdentityHashMap<Object, Object>();
+ for (int i = 0; i < args.length; i++) {
+ if (args[i] == null) {
+ copiedArgs[i] = null;
+ } else {
+ Object copiedArg = map.get(args[i]);
+ if (copiedArg != null) {
+ copiedArgs[i] = copiedArg;
+ } else {
+ String dataBindingId = operation.getInputType().getLogical().get(i).getDataBinding();
+ DataBinding dataBinding = registry.getDataBinding(dataBindingId);
+ copiedArg = copy(args[i], dataBinding);
+ map.put(args[i], copiedArg);
+ copiedArgs[i] = copiedArg;
+ }
+ }
+ }
+ return copiedArgs;
+ }
+
+ public Object copy(Object arg, DataBinding argDataBinding) {
+ if (arg == null) {
+ return null;
+ }
+ Object copiedArg;
+ if (argDataBinding != null) {
+ copiedArg = argDataBinding.copy(arg);
+ } else {
+ copiedArg = arg;
+ DataType<?> dataType = registry.introspectType(arg);
+ if (dataType != null) {
+ DataBinding binding = registry.getDataBinding(dataType.getDataBinding());
+ if (binding != null) {
+ copiedArg = binding.copy(arg);
+ }
+ }
+ // FIXME: What to do if it's not recognized?
+ }
+ return copiedArg;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PassByValueInvoker.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=529142&r1=529141&r2=529142
==============================================================================
--- 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 Sun Apr 15 23:29:41 2007
@@ -50,9 +50,9 @@
import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.spi.bootstrap.ModuleActivator;
import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.component.WorkContextTunnel;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.wire.ProxyService;
@@ -77,21 +77,24 @@
JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = extensionPointRegistry
.getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
- JavaClassIntrospectorExtensionPoint classIntrospector = extensionPointRegistry.getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
- BaseJavaClassIntrospectorExtension[] extensions = new BaseJavaClassIntrospectorExtension[] {
- new ConstructorProcessor(),
- new AllowsPassByReferenceProcessor(),
- new ContextProcessor(),
- new ConversationProcessor(),
- new DestroyProcessor(),
- new EagerInitProcessor(),
- new InitProcessor(),
- new PropertyProcessor(),
- new ReferenceProcessor(interfaceIntrospector),
- new ResourceProcessor(),
- new ScopeProcessor(),
- new ServiceProcessor(interfaceIntrospector),
- new HeuristicPojoProcessor(interfaceIntrospector)
+ JavaClassIntrospectorExtensionPoint classIntrospector = extensionPointRegistry
+ .getExtensionPoint(JavaClassIntrospectorExtensionPoint.class);
+ BaseJavaClassIntrospectorExtension[] extensions = new BaseJavaClassIntrospectorExtension[] {new ConstructorProcessor(),
+ new AllowsPassByReferenceProcessor(),
+ new ContextProcessor(),
+ new ConversationProcessor(),
+ new DestroyProcessor(),
+ new EagerInitProcessor(),
+ new InitProcessor(),
+ new PropertyProcessor(),
+ new ReferenceProcessor(
+ interfaceIntrospector),
+ new ResourceProcessor(),
+ new ScopeProcessor(),
+ new ServiceProcessor(
+ interfaceIntrospector),
+ new HeuristicPojoProcessor(
+ interfaceIntrospector)
};
for (JavaClassIntrospectorExtension e : extensions) {
@@ -109,10 +112,13 @@
builder.setProxyService(extensionPointRegistry.getExtensionPoint(ProxyService.class));
builder.setWorkContext(extensionPointRegistry.getExtensionPoint(WorkContext.class));
builderRegistry.register(JavaImplementation.class, builder);
-
+
Mediator mediator = extensionPointRegistry.getExtensionPoint(Mediator.class);
JavaPropertyValueObjectFactory factory = new JavaPropertyValueObjectFactory(mediator);
builder.setPropertyValueObjectFactory(factory);
+
+ DataBindingRegistry dataBindingRegistry = extensionPointRegistry.getExtensionPoint(DataBindingRegistry.class);
+ builder.setDataBindingRegistry(dataBindingRegistry);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org