Author: rfeng
Date: Tue Oct 9 09:32:09 2007
New Revision: 583215
URL: http://svn.apache.org/viewvc?rev=583215&view=rev
Log:
Rename Interface.setDefaultDataBinding to resetDataBinding
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
Tue Oct 9 09:32:09 2007
@@ -107,7 +107,7 @@
URI uri = URI.create(component.getURI() + "/" +
notificationBinding.getName());
notificationBinding.setURI(uri.toString());
Interface interfaze = reference.getInterfaceContract().getInterface();
- interfaze.setDefaultDataBinding(OMElement.class.getName());
+ interfaze.resetDataBinding(OMElement.class.getName());
for (Operation operation : interfaze.getOperations()) {
operation.setNonBlocking(false);
}
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
Tue Oct 9 09:32:09 2007
@@ -116,7 +116,7 @@
URI uri = URI.create(component.getURI() + "/" +
notificationBinding.getName());
notificationBinding.setURI(uri.toString());
Interface interfaze = service.getInterfaceContract().getInterface();
- interfaze.setDefaultDataBinding(OMElement.class.getName());
+ interfaze.resetDataBinding(OMElement.class.getName());
for (Operation operation : interfaze.getOperations()) {
operation.setNonBlocking(false);
}
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
Tue Oct 9 09:32:09 2007
@@ -79,7 +79,7 @@
}
// Set to use the Axiom data binding
-
contract.getInterface().setDefaultDataBinding(OMElement.class.getName());
+ contract.getInterface().resetDataBinding(OMElement.class.getName());
wsBinding.setBindingInterfaceContract(contract);
wsBinding.setName(this.binding.getName());
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
Tue Oct 9 09:32:09 2007
@@ -79,7 +79,7 @@
}
// Set to use the Axiom data binding
-
contract.getInterface().setDefaultDataBinding(OMElement.class.getName());
+ contract.getInterface().resetDataBinding(OMElement.class.getName());
wsBinding.setBindingInterfaceContract(contract);
wsBinding.setName(this.binding.getName());
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
Tue Oct 9 09:32:09 2007
@@ -53,7 +53,7 @@
}
// Set to use the Axiom data binding
-
contract.getInterface().setDefaultDataBinding(OMElement.class.getName());
+ contract.getInterface().resetDataBinding(OMElement.class.getName());
axisClient = new Axis2ServiceClient(component, reference, wsBinding,
servletHost, messageFactory);
}
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
Tue Oct 9 09:32:09 2007
@@ -51,7 +51,7 @@
}
// Set to use the Axiom data binding
-
contract.getInterface().setDefaultDataBinding(OMElement.class.getName());
+ contract.getInterface().resetDataBinding(OMElement.class.getName());
axisProvider = new Axis2ServiceProvider(component, service, wsBinding,
servletHost, messageFactory);
}
Modified:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
Tue Oct 9 09:32:09 2007
@@ -113,7 +113,7 @@
this.unresolved = undefined;
}
- public void setDefaultDataBinding(String dataBinding) {
+ public void resetDataBinding(String dataBinding) {
}
public boolean isDynamic() {
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
Tue Oct 9 09:32:09 2007
@@ -180,7 +180,7 @@
}
for (Service service : componentType.getServices()) {
//set default dataBinding to DOM
-
service.getInterfaceContract().getInterface().setDefaultDataBinding(DOMDataBinding.NAME);
+
service.getInterfaceContract().getInterface().resetDataBinding(DOMDataBinding.NAME);
serviceMap.put(service.getName(), service);
}
Modified:
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
Tue Oct 9 09:32:09 2007
@@ -55,7 +55,7 @@
if (service.getService() != null) {
InterfaceContract interfaceContract =
service.getService().getInterfaceContract();
if (interfaceContract instanceof WSDLInterfaceContract) {
-
interfaceContract.getInterface().setDefaultDataBinding("org.apache.axiom.om.OMElement");
+
interfaceContract.getInterface().resetDataBinding("org.apache.axiom.om.OMElement");
}
}
}
Modified:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
Tue Oct 9 09:32:09 2007
@@ -113,7 +113,7 @@
InterfaceContract ic = service.getInterfaceContract();
if (ic instanceof WSDLInterfaceContract) {
// Set to use the Axiom data binding
-
ic.getInterface().setDefaultDataBinding(OMElement.class.getName());
+ ic.getInterface().resetDataBinding(OMElement.class.getName());
xmlHelper = XMLHelper.getArgHelper(scriptEngine);
}
}
Modified:
incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
Tue Oct 9 09:32:09 2007
@@ -128,7 +128,7 @@
}
private void setDataBinding(Interface interfaze, boolean isReference) {
- interfaze.setDefaultDataBinding(SaxonNodeDataBinding.NAME);
+ // interfaze.resetDataBinding(SaxonNodeDataBinding.NAME);
List<Operation> operations = interfaze.getOperations();
for (Operation operation : operations) {
operation.setDataBinding(SaxonNodeDataBinding.NAME);
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
Tue Oct 9 09:32:09 2007
@@ -62,12 +62,19 @@
*/
List<Operation> getOperations();
- // TODO: [rfeng] We might need to have a better way
/**
* Set the databinding for the interface
* @param dataBinding
+ * @deprecated Please use resetDataBinding
*/
+ @Deprecated
void setDefaultDataBinding(String dataBinding);
+
+ /**
+ * Reset the databinding for the interface
+ * @param dataBinding
+ */
+ void resetDataBinding(String dataBinding);
/**
* Returns true if the Interface is dynamic.
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java?rev=583215&r1=583214&r2=583215&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
Tue Oct 9 09:32:09 2007
@@ -112,6 +112,7 @@
}
+ @Deprecated
public void setDefaultDataBinding(String dataBinding) {
for (Operation op : getOperations()) {
if (op.getDataBinding() == null) {
@@ -157,16 +158,53 @@
}
}
+ public void resetDataBinding(String dataBinding) {
+ for (Operation op : getOperations()) {
+ op.setDataBinding(dataBinding);
+ DataType<List<DataType>> inputType = op.getInputType();
+ if (inputType != null) {
+ for (DataType d : inputType.getLogical()) {
+ d.setDataBinding(dataBinding);
+ }
+ }
+ DataType outputType = op.getOutputType();
+ if (outputType != null) {
+ outputType.setDataBinding(dataBinding);
+ }
+ List<DataType> faultTypes = op.getFaultTypes();
+ if (faultTypes != null) {
+ for (DataType d : faultTypes) {
+ d.setDataBinding(dataBinding);
+ }
+ }
+ if (op.isWrapperStyle()) {
+ WrapperInfo wrapper = op.getWrapper();
+ if (wrapper != null) {
+ DataType<List<DataType>> unwrappedInputType =
wrapper.getUnwrappedInputType();
+ if (unwrappedInputType != null) {
+ for (DataType d : unwrappedInputType.getLogical()) {
+ d.setDataBinding(dataBinding);
+ }
+ }
+ DataType unwrappedOutputType =
wrapper.getUnwrappedOutputType();
+ if (unwrappedOutputType != null) {
+ unwrappedOutputType.setDataBinding(dataBinding);
+ }
+ }
+ }
+ }
+ }
+
public boolean isDynamic() {
return false;
}
@Override
public InterfaceImpl clone() throws CloneNotSupportedException {
- InterfaceImpl copy = (InterfaceImpl) super.clone();
+ InterfaceImpl copy = (InterfaceImpl)super.clone();
copy.operations = new OperationList();
for (Operation operation : this.operations) {
- Operation clonedOperation = (Operation) operation.clone();
+ Operation clonedOperation = (Operation)operation.clone();
copy.operations.add(clonedOperation);
}
return copy;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
