Author: jboynes
Date: Wed Apr 26 01:23:30 2006
New Revision: 397143
URL: http://svn.apache.org/viewcvs?rev=397143&view=rev
Log:
remove model context from composite model object
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/WebServiceBinding.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/impl/WebServiceBindingImpl.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Composite.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/CompositeImpl.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/WebServiceBinding.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/WebServiceBinding.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/WebServiceBinding.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/WebServiceBinding.java
Wed Apr 26 01:23:30 2006
@@ -20,6 +20,8 @@
import javax.wsdl.Port;
import org.apache.tuscany.model.assembly.Binding;
+import org.apache.tuscany.common.resource.ResourceLoader;
+import commonj.sdo.helper.TypeHelper;
/**
* Represents a Web service binding.
@@ -37,7 +39,7 @@
* Returns the WSDL port defining this binding.
*/
Port getWSDLPort();
-
+
/**
* Returns the WSDL definition containing the WSDL port.
* @return the WSDL definition containing the WSDL port
@@ -54,4 +56,12 @@
* @param definition
*/
void setWSDLDefinition(Definition definition);
+
+ TypeHelper getTypeHelper();
+
+ void setTypeHelper(TypeHelper typeHelper);
+
+ ResourceLoader getResourceLoader();
+
+ void setResourceLoader(ResourceLoader resourceLoader);
}
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/impl/WebServiceBindingImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/impl/WebServiceBindingImpl.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/impl/WebServiceBindingImpl.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/assembly/impl/WebServiceBindingImpl.java
Wed Apr 26 01:23:30 2006
@@ -26,29 +26,49 @@
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.impl.BindingImpl;
+import org.apache.tuscany.common.resource.ResourceLoader;
+import commonj.sdo.helper.TypeHelper;
/**
* An implementation of WebServiceBinding.
*/
public class WebServiceBindingImpl extends BindingImpl implements
WebServiceBinding {
-
+
private Definition definition;
private Port port;
private String portURI;
+ private TypeHelper typeHelper;
+ private ResourceLoader resourceLoader;
/**
* Constructor
*/
protected WebServiceBindingImpl() {
}
-
+
+ public TypeHelper getTypeHelper() {
+ return typeHelper;
+ }
+
+ public void setTypeHelper(TypeHelper typeHelper) {
+ this.typeHelper = typeHelper;
+ }
+
+ public ResourceLoader getResourceLoader() {
+ return resourceLoader;
+ }
+
+ public void setResourceLoader(ResourceLoader resourceLoader) {
+ this.resourceLoader = resourceLoader;
+ }
+
/**
* @see
org.apache.tuscany.binding.axis2.assembly.WebServiceBinding#getWSDLPort()
*/
public Port getWSDLPort() {
return port;
}
-
+
/**
* @see
org.apache.tuscany.binding.axis2.assembly.WebServiceBinding#setWSDLPort(javax.wsdl.Port)
*/
@@ -56,28 +76,28 @@
checkNotFrozen();
this.port = value;
}
-
+
/**
* @see
org.apache.tuscany.binding.axis2.assembly.WebServiceBinding#getWSDLDefinition()
*/
public Definition getWSDLDefinition() {
return definition;
}
-
+
/**
*/
public void setWSDLDefinition(Definition pdefinition) {
checkNotFrozen();
this.definition = pdefinition;
}
-
+
/**
* @param portURI The portURI to set.
*/
public void setPortURI(String portURI) {
this.portURI = portURI;
}
-
+
/**
*/
@SuppressWarnings("unchecked")
@@ -86,13 +106,13 @@
return;
}
super.initialize(modelContext);
-
+
// Get the WSDL port namespace and name
if (port == null && portURI != null) {
int h = portURI.indexOf('#');
String portNamespace = portURI.substring(0, h);
String portName = portURI.substring(h + 1);
-
+
// Load the WSDL definitions for the given namespace
List<Definition> definitions = modelContext.getAssemblyLoader()
.loadDefinitions(portNamespace);
@@ -100,7 +120,7 @@
throw new IllegalArgumentException("Cannot find WSDL
definition for " + portNamespace);
}
for (Definition def : definitions) {
-
+
// Find the port with the given name
for (Service service :
(Collection<Service>)def.getServices().values()) {
Port prt = service.getPort(portName);
@@ -114,5 +134,5 @@
throw new IllegalArgumentException("Cannot find WSDL port " +
portURI);
}
}
-
+
}
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
Wed Apr 26 01:23:30 2006
@@ -86,7 +86,7 @@
throw bce;
}
- TypeHelper typeHelper =
externalService.getComposite().getAssemblyContext().getTypeHelper();
+ TypeHelper typeHelper = wsBinding.getTypeHelper();
return new ExternalWebServiceClient(configurationContext, axisService,
wsPortMetaData, typeHelper);
}
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
Wed Apr 26 01:23:30 2006
@@ -60,15 +60,16 @@
@SuppressWarnings("unchecked")
public WebServiceEntryPointInOutSyncMessageReceiver(EntryPoint entryPoint,
EntryPointContext
context,
- WebServicePortMetaData
wsdlPortInfo) {
+ WebServicePortMetaData
wsdlPortInfo,
+ TypeHelper typeHelper,
+ ClassLoader
classLoader) {
this.entryPointContext = context;
Class<?> serviceInterface = entryPoint.getConfiguredService().getPort()
.getServiceContract().getInterface();
Method[] methods = serviceInterface.getMethods();
Map<String, Method> map = new HashMap<String, Method>(methods.length);
- for (int i = 0; i < methods.length; i++) {
- Method method = methods[i];
+ for (Method method : methods) {
map.put(method.getName(), method);
}
@@ -85,9 +86,8 @@
methodMap.put(opName, method);
}
- typeHelper =
entryPoint.getComposite().getAssemblyContext().getTypeHelper();
- classLoader = entryPoint.getComposite().getAssemblyContext()
- .getApplicationResourceLoader().getClassLoader();
+ this.typeHelper = typeHelper;
+ this.classLoader = classLoader;
}
public void invokeBusinessLogic(MessageContext msgContext,
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
Wed Apr 26 01:23:30 2006
@@ -125,7 +125,9 @@
= new WebServiceEntryPointInOutSyncMessageReceiver(
entryPoint,
(EntryPointContext) entryPointContext,
- wsdlPortInfo);
+ wsdlPortInfo,
+ wsBinding.getTypeHelper(),
+ wsBinding.getResourceLoader().getClassLoader());
AxisServiceGroup serviceGroup = new
AxisServiceGroup(axisConfig);
axisConfig.addMessageReceiver(WebServiceEntryPointInOutSyncMessageReceiver.MEP_URL,
msgrec);
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
Wed Apr 26 01:23:30 2006
@@ -24,11 +24,10 @@
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import
org.apache.tuscany.binding.axis2.assembly.impl.WebServiceAssemblyFactoryImpl;
import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
-import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.system.annotation.Autowire;
-
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
@@ -67,6 +66,8 @@
WebServiceBinding binding = WS_FACTORY.createWebServiceBinding();
binding.setURI(reader.getAttributeValue(null, "uri"));
binding.setPortURI(reader.getAttributeValue(null, "port"));
+ binding.setTypeHelper(registry.getContext().getTypeHelper());
+ binding.setResourceLoader(loaderContext.getResourceLoader());
return binding;
}
}
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/JavaScriptImplementation.java
Wed Apr 26 01:23:30 2006
@@ -19,6 +19,7 @@
import org.apache.tuscany.model.assembly.AtomicImplementation;
import org.apache.tuscany.model.assembly.Implementation;
import org.apache.tuscany.common.resource.ResourceLoader;
+import commonj.sdo.helper.TypeHelper;
/**
* A representation of a JavaScript component implementation type
@@ -42,4 +43,8 @@
void setResourceLoader(ResourceLoader resourceLoader);
ResourceLoader getResourceLoader();
+
+ TypeHelper getTypeHelper();
+
+ void setTypeHelper(TypeHelper typeHelper);
}
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationImpl.java
Wed Apr 26 01:23:30 2006
@@ -19,6 +19,7 @@
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.container.js.assembly.JavaScriptImplementation;
import org.apache.tuscany.model.assembly.impl.AtomicImplementationImpl;
+import commonj.sdo.helper.TypeHelper;
/**
* Default implementation of a JavScript component implementation type
@@ -35,6 +36,8 @@
private ResourceLoader resourceLoader;
+ private TypeHelper typeHelper;
+
public JavaScriptImplementationImpl() {
super();
}
@@ -45,6 +48,14 @@
public ResourceLoader getResourceLoader() {
return resourceLoader;
+ }
+
+ public TypeHelper getTypeHelper() {
+ return typeHelper;
+ }
+
+ public void setTypeHelper(TypeHelper typeHelper) {
+ this.typeHelper = typeHelper;
}
public String getScriptFile() {
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
Wed Apr 26 01:23:30 2006
@@ -110,7 +110,7 @@
RhinoScript invoker;
if ("e4x".equalsIgnoreCase(impl.getStyle())) { // TODO is constant
"e4x" somewhere?
- TypeHelper typeHelper =
component.getComposite().getAssemblyContext().getTypeHelper();
+ TypeHelper typeHelper = impl.getTypeHelper();
invoker = new RhinoE4XScript(component.getName(), script,
defaultProperties, cl, typeHelper);
} else {
invoker = new RhinoScript(component.getName(), script,
defaultProperties, cl);
Modified:
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java
(original)
+++
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java
Wed Apr 26 01:23:30 2006
@@ -88,6 +88,7 @@
jsImpl.setStyle(style);
jsImpl.setScript(script);
jsImpl.setResourceLoader(loaderContext.getResourceLoader());
+ jsImpl.setTypeHelper(registry.getContext().getTypeHelper());
return jsImpl;
}
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Composite.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Composite.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Composite.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Composite.java
Wed Apr 26 01:23:30 2006
@@ -85,11 +85,4 @@
* @return
*/
ConfiguredService getConfiguredService(ServiceURI address);
-
- /**
- * Returns the assembly model context used by this composite.
- * @return
- */
- AssemblyContext getAssemblyContext();
-
}
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/CompositeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/CompositeImpl.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/CompositeImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/CompositeImpl.java
Wed Apr 26 01:23:30 2006
@@ -100,8 +100,6 @@
private List<ImportWSDL> wsdlImports = new ImportWSDLList();
- private AssemblyContext modelContext;
-
protected CompositeImpl() {
}
@@ -151,11 +149,6 @@
this.componentInfo=componentType;
}
- public AssemblyContext getAssemblyContext() {
- checkInitialized();
- return modelContext;
- }
-
public ConfiguredService getConfiguredService(ServiceURI address) {
String partName = address.getPartName();
String serviceName = address.getServiceName();
@@ -183,9 +176,6 @@
if (isInitialized())
return;
super.initialize(modelContext);
-
- // Save the model context
- this.modelContext = modelContext;
// Initialize WSDL imports
for (ImportWSDL importWSDL : wsdlImports) {
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
Wed Apr 26 01:23:30 2006
@@ -20,6 +20,7 @@
import javax.wsdl.Port;
import javax.wsdl.Service;
+import commonj.sdo.helper.TypeHelper;
import org.apache.tuscany.model.assembly.Binding;
/**
@@ -62,4 +63,8 @@
* @param definition
*/
void setWSDLDefinition(Definition definition);
+
+ TypeHelper getTypeHelper();
+
+ void setTypeHelper(TypeHelper typeHelper);
}
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
Wed Apr 26 01:23:30 2006
@@ -22,6 +22,7 @@
import javax.wsdl.Port;
import javax.wsdl.Service;
+import commonj.sdo.helper.TypeHelper;
import org.apache.tuscany.binding.celtix.assembly.WebServiceBinding;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.impl.BindingImpl;
@@ -35,6 +36,7 @@
private Port port;
private Service service;
private String portURI;
+ private TypeHelper typeHelper;
/**
* Constructor
@@ -77,10 +79,18 @@
}
/**
- * @param portURI The portURI to set.
+ * @param uri The portURI to set.
*/
public void setPortURI(String uri) {
portURI = uri;
+ }
+
+ public TypeHelper getTypeHelper() {
+ return typeHelper;
+ }
+
+ public void setTypeHelper(TypeHelper pTypeHelper) {
+ this.typeHelper = pTypeHelper;
}
/**
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
Wed Apr 26 01:23:30 2006
@@ -61,7 +61,7 @@
public ExternalWebServiceClient(Bus b, ExternalService externalService)
throws BuilderException {
bus = b;
WebServiceBinding wsBinding = (WebServiceBinding)
externalService.getBindings().get(0);
- typeHelper =
externalService.getComposite().getAssemblyContext().getTypeHelper();
+ typeHelper = wsBinding.getTypeHelper();
Definition wsdlDef = wsBinding.getWSDLDefinition();
wsdlCache = new WSDLMetaDataCache(wsdlDef, wsBinding.getWSDLPort());
@@ -162,7 +162,7 @@
/*
if (isValidException(objMsgContext)) {
throw (Exception)objMsgContext.getException();
- } else {
+ } else {
throw new ProtocolException(objMsgContext.getException());
}
*/
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java?rev=397143&r1=397142&r2=397143&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
Wed Apr 26 01:23:30 2006
@@ -65,6 +65,7 @@
WebServiceBinding binding = WS_FACTORY.createWebServiceBinding();
binding.setURI(reader.getAttributeValue(null, "uri"));
binding.setPortURI(reader.getAttributeValue(null, "port"));
+ binding.setTypeHelper(registry.getContext().getTypeHelper());
return binding;
}
}
