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/09/15 00:53:44 UTC
svn commit: r575812 - in /incubator/tuscany/branches/sca-java-1.0:
itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/
modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
modules/assembly/src/main/ja...
Author: rfeng
Date: Fri Sep 14 15:52:17 2007
New Revision: 575812
URL: http://svn.apache.org/viewvc?rev=575812&view=rev
Log:
Merge the fix from trunk:
Rename WireableBinding to OptimizableBinding
Bring up the cross-databinding exception itest
Fix the interface contract for java proxy
Added:
incubator/tuscany/branches/sca-java-1.0/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
- copied unchanged from r575774, incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
- copied unchanged from r575774, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
Removed:
incubator/tuscany/branches/sca-java-1.0/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireableBinding.java
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
incubator/tuscany/branches/sca-java-1.0/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
incubator/tuscany/branches/sca-java-1.0/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java Fri Sep 14 15:52:17 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -38,7 +38,7 @@
*
* @version $Rev$ $Date$
*/
-public class TestSCABindingImpl implements SCABinding, WireableBinding, PolicySetAttachPoint {
+public class TestSCABindingImpl implements SCABinding, OptimizableBinding, PolicySetAttachPoint {
private String name;
private String uri;
private List<Object> extensions = new ArrayList<Object>();
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java Fri Sep 14 15:52:17 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
@@ -58,11 +58,11 @@
hasCompatiblePolicySets(binding, serviceBinding)) {
Binding cloned = binding;
- if (binding instanceof WireableBinding) {
+ if (binding instanceof OptimizableBinding) {
// TODO: We need to clone the reference binding
try {
- cloned = (Binding)((WireableBinding)binding).clone();
- WireableBinding endpoint = ((WireableBinding)cloned);
+ cloned = (Binding)((OptimizableBinding)binding).clone();
+ OptimizableBinding endpoint = ((OptimizableBinding)cloned);
endpoint.setTargetComponent(component);
endpoint.setTargetComponentService(service);
endpoint.setTargetBinding(serviceBinding);
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java Fri Sep 14 15:52:17 2007
@@ -44,7 +44,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.Wire;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderMonitor;
import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
@@ -765,7 +765,7 @@
bindings.addAll(reference.getBindings());
promotedReference.getBindings().clear();
for (Binding binding : bindings) {
- if ((!(binding instanceof WireableBinding)) || binding.getURI() != null) {
+ if ((!(binding instanceof OptimizableBinding)) || binding.getURI() != null) {
promotedReference.getBindings().add(binding);
}
}
@@ -784,7 +784,7 @@
}
promotedReference.setCallback(assemblyFactory.createCallback());
for (Binding binding : callbackBindings) {
- if ((!(binding instanceof WireableBinding)) || binding.getURI() != null) {
+ if ((!(binding instanceof OptimizableBinding)) || binding.getURI() != null) {
promotedReference.getCallback().getBindings().add(binding);
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java Fri Sep 14 15:52:17 2007
@@ -22,7 +22,7 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
/**
* This class encapsulates utility methods to deal with reference definitions
@@ -68,7 +68,7 @@
if (count != 1) {
if (count == 0) {
for (Binding binding: bindings) {
- if (!(binding instanceof WireableBinding) || binding.getURI()!=null) {
+ if (!(binding instanceof OptimizableBinding) || binding.getURI()!=null) {
return true;
}
}
@@ -80,7 +80,7 @@
if (count < 1) {
if (count == 0) {
for (Binding binding: bindings) {
- if (!(binding instanceof WireableBinding) || binding.getURI()!=null) {
+ if (!(binding instanceof OptimizableBinding) || binding.getURI()!=null) {
return true;
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java Fri Sep 14 15:52:17 2007
@@ -20,7 +20,7 @@
package org.apache.tuscany.sca.binding.sca.impl;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.domain.Domain;
@@ -89,8 +89,8 @@
boolean targetIsRemote = false;
// first look at the target service and see if this has been resolved
- if (((WireableBinding)binding).getTargetComponentService() != null) {
- if (((WireableBinding)binding).getTargetComponentService().isUnresolved() == true) {
+ if (((OptimizableBinding)binding).getTargetComponentService() != null) {
+ if (((OptimizableBinding)binding).getTargetComponentService().isUnresolved() == true) {
targetIsRemote = true;
} else {
targetIsRemote = false;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Fri Sep 14 15:52:17 2007
@@ -20,7 +20,7 @@
package org.apache.tuscany.sca.binding.sca.impl;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.domain.Domain;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java Fri Sep 14 15:52:17 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Extensible;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -37,7 +37,7 @@
*
* @version $Rev$ $Date$
*/
-public class SCABindingImpl implements SCABinding, Extensible, PolicySetAttachPoint, WireableBinding {
+public class SCABindingImpl implements SCABinding, Extensible, PolicySetAttachPoint, OptimizableBinding {
private String name;
private String uri;
private List<Object> extensions = new ArrayList<Object>();
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java Fri Sep 14 15:52:17 2007
@@ -160,7 +160,7 @@
// Assumes JavaBeans DB is default
if (dataBinding != null && !dataBinding.equals(JavaBeansDataBinding.NAME)) {
if (nonDefaultDataBindingName != null) {
- if (nonDefaultDataBindingName != dataBinding) {
+ if (!nonDefaultDataBindingName.equals(dataBinding)) {
// We've seen two different non-default DBs, e.g. SDO and JAXB
// so unset the string and break out of the loop
nonDefaultDataBindingName = null;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java Fri Sep 14 15:52:17 2007
@@ -33,7 +33,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.context.RequestContextFactory;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.context.ComponentContextHelper;
@@ -204,19 +204,19 @@
// TODO - we should look at all the bindings now associated with the
// unresolved target but we assume the SCA binding here as
// its currently the only wireable one
- if (binding instanceof WireableBinding) {
- WireableBinding scaBinding = (WireableBinding)binding;
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding scaBinding = (OptimizableBinding)binding;
// clone the SCA binding and fill in service details
// its cloned as each target
SCABinding clonedSCABinding = null;
try {
- clonedSCABinding = (SCABinding)((WireableBinding)scaBinding).clone();
+ clonedSCABinding = (SCABinding)((OptimizableBinding)scaBinding).clone();
clonedSCABinding.setURI(service.getName());
// wireable binding stuff needs to go. SCA binding uses it
// currently to get to the service to work out if the service
// is resolved.
- WireableBinding endpoint = ((WireableBinding)clonedSCABinding);
+ OptimizableBinding endpoint = ((OptimizableBinding)clonedSCABinding);
endpoint.setTargetComponentService(service);
//endpoint.setTargetComponent(component); - not known for unresolved target
//endpoint.setTargetBinding(serviceBinding); - not known for unresolved target
@@ -256,8 +256,8 @@
Component targetComponent = null;
ComponentService targetComponentService = null;
Binding targetBinding = null;
- if (binding instanceof WireableBinding) {
- WireableBinding endpoint = (WireableBinding)binding;
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding endpoint = (OptimizableBinding)binding;
targetComponent = endpoint.getTargetComponent();
targetComponentService = endpoint.getTargetComponentService();
targetBinding = endpoint.getTargetBinding();
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java Fri Sep 14 15:52:17 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
import org.apache.tuscany.sca.core.assembly.CompositeActivatorImpl;
import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
@@ -219,7 +219,7 @@
}
for (Binding binding : reference.getBindings()) {
- if (binding instanceof WireableBinding) {
+ if (binding instanceof OptimizableBinding) {
String targetURI = binding.getURI();
int index = targetURI.lastIndexOf('/');
String serviceName = "";
@@ -241,13 +241,13 @@
}
}
}
- WireableBinding wireableBinding = (WireableBinding)binding;
- wireableBinding.setTargetComponent(targetComponet);
- wireableBinding.setTargetComponentService(targetService);
+ OptimizableBinding optimizableBinding = (OptimizableBinding)binding;
+ optimizableBinding.setTargetComponent(targetComponet);
+ optimizableBinding.setTargetComponentService(targetService);
if (targetService != null) {
for (Binding serviceBinding : targetService.getBindings()) {
if (serviceBinding.getClass() == binding.getClass()) {
- wireableBinding.setTargetBinding(serviceBinding);
+ optimizableBinding.setTargetBinding(serviceBinding);
break;
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java Fri Sep 14 15:52:17 2007
@@ -42,7 +42,7 @@
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
@@ -96,12 +96,12 @@
ComponentReference componentReference = assemblyFactory.createComponentReference();
componentReference.setName("$self$." + service.getName());
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding = (WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- componentReference.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ componentReference.getBindings().add(optimizableBinding);
} else {
componentReference.getBindings().add(binding);
}
@@ -134,14 +134,19 @@
private InterfaceContract getInterfaceContract(InterfaceContract interfaceContract, Class<?> businessInterface)
throws CloneNotSupportedException, InvalidInterfaceException {
Interface interfaze = interfaceContract.getInterface();
+ boolean compatible = false;
if (interfaze instanceof JavaInterface) {
Class<?> cls = ((JavaInterface)interfaze).getJavaClass();
- if (!businessInterface.isAssignableFrom(cls)) {
- // The interface is not assignable from the interface contract
- interfaceContract = (InterfaceContract)interfaceContract.clone();
- interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
+ if (businessInterface.isAssignableFrom(cls)) {
+ compatible = true;
}
}
+ if (!compatible) {
+ // The interface is not assignable from the interface contract
+ interfaceContract = (InterfaceContract)interfaceContract.clone();
+ interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
+ }
+
return interfaceContract;
}
@@ -175,12 +180,12 @@
ref.getTargets().add(service);
ref.getBindings().clear();
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding = (WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- ref.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ ref.getBindings().add(optimizableBinding);
} else {
ref.getBindings().add(binding);
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java Fri Sep 14 15:52:17 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.context.RequestContextFactory;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
import org.apache.tuscany.sca.core.invocation.ProxyFactory;
@@ -222,12 +222,12 @@
ref.getTargets().add(service);
ref.getBindings().clear();
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding = (WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- ref.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ ref.getBindings().add(optimizableBinding);
} else {
ref.getBindings().add(binding);
}
@@ -270,12 +270,12 @@
ComponentReference componentReference = assemblyFactory.createComponentReference();
componentReference.setName("$self$." + service.getName());
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding = (WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- componentReference.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ componentReference.getBindings().add(optimizableBinding);
} else {
componentReference.getBindings().add(binding);
}
@@ -308,14 +308,19 @@
private InterfaceContract getInterfaceContract(InterfaceContract interfaceContract, Class<?> businessInterface)
throws CloneNotSupportedException, InvalidInterfaceException {
Interface interfaze = interfaceContract.getInterface();
+ boolean compatible = false;
if (interfaze instanceof JavaInterface) {
Class<?> cls = ((JavaInterface)interfaze).getJavaClass();
- if (!businessInterface.isAssignableFrom(cls)) {
- // The interface is not assignable from the interface contract
- interfaceContract = (InterfaceContract)interfaceContract.clone();
- interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
+ if (businessInterface.isAssignableFrom(cls)) {
+ compatible = true;
}
}
+ if (!compatible) {
+ // The interface is not assignable from the interface contract
+ interfaceContract = (InterfaceContract)interfaceContract.clone();
+ interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
+ }
+
return interfaceContract;
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java Fri Sep 14 15:52:17 2007
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
import org.apache.tuscany.sca.core.factory.ObjectCreationException;
import org.apache.tuscany.sca.invocation.Message;
@@ -167,12 +167,12 @@
ref.getTargets().add(service);
ref.getBindings().clear();
for (Binding binding : service.getBindings()) {
- if (binding instanceof WireableBinding) {
- WireableBinding wireableBinding = (WireableBinding)((WireableBinding)binding).clone();
- wireableBinding.setTargetBinding(binding);
- wireableBinding.setTargetComponent(component);
- wireableBinding.setTargetComponentService(service);
- ref.getBindings().add(wireableBinding);
+ if (binding instanceof OptimizableBinding) {
+ OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
+ optimizableBinding.setTargetBinding(binding);
+ optimizableBinding.setTargetComponent(component);
+ optimizableBinding.setTargetComponentService(service);
+ ref.getBindings().add(optimizableBinding);
} else {
ref.getBindings().add(binding);
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java Fri Sep 14 15:52:17 2007
@@ -25,16 +25,11 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
-import javax.xml.namespace.QName;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
/**
* The databinding annotation processor for java interfaces
@@ -72,6 +67,7 @@
return;
}
+ /*
String operationName = getValue(webMethod.operationName(), operation.getName());
RequestWrapper requestWrapper = method.getAnnotation(RequestWrapper.class);
@@ -80,7 +76,6 @@
return;
}
-
String ns = getValue(requestWrapper.targetNamespace(), tns);
String name = getValue(requestWrapper.localName(), operationName);
QName inputWrapper = new QName(ns, name);
@@ -90,10 +85,28 @@
QName outputWrapper = new QName(ns, name);
- WrapperInfo wrapperInfo = new WrapperInfo(JAXBDataBinding.NAME, new ElementInfo(inputWrapper, null),
- new ElementInfo(outputWrapper, null), null, null);
- operation.setWrapperStyle(true);
+ List<ElementInfo> inputElements = new ArrayList<ElementInfo>();
+ for (Annotation[] annotations : method.getParameterAnnotations()) {
+ for (Annotation annotation : annotations) {
+ if (annotation.annotationType() == WebParam.class) {
+ WebParam param = (WebParam)annotation;
+ inputElements.add(new ElementInfo(new QName(param.targetNamespace(), param.name()), null));
+ break;
+ }
+ }
+ }
+
+ List<ElementInfo> outputElements = new ArrayList<ElementInfo>();
+ WebResult result = method.getAnnotation(WebResult.class);
+ outputElements.add(new ElementInfo(new QName(result.targetNamespace(), result.name()), null));
+
+ WrapperInfo wrapperInfo =
+ new WrapperInfo(JAXBDataBinding.NAME, new ElementInfo(inputWrapper, null),
+ new ElementInfo(outputWrapper, null), inputElements, outputElements);
operation.setWrapper(wrapperInfo);
+ */
+ operation.setWrapperStyle(false);
+ operation.setDataBinding(JAXBDataBinding.NAME);
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java Fri Sep 14 15:52:17 2007
@@ -104,7 +104,7 @@
} catch (NoSuchFieldException e) {
// Fall back to type inspection
Type type = helperContext.getTypeHelper().getType(faultBeanClass);
- if (type != null) {
+ if (type != null && !type.isDataType()) {
String ns = type.getURI();
String name = helperContext.getXSDHelper().getLocalName(type);
faultElement = new QName(ns, name);
Modified: incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Fri Sep 14 15:52:17 2007
@@ -39,6 +39,7 @@
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.xml.Constants;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java?rev=575812&r1=575811&r2=575812&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java Fri Sep 14 15:52:17 2007
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.WireableBinding;
+import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org