You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/08/15 15:37:35 UTC
svn commit: r431600 - in /incubator/tuscany/java:
samples/sca/helloworldwsclient/src/main/java/helloworld/
sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/
Author: rineholt
Date: Tue Aug 15 06:37:35 2006
New Revision: 431600
URL: http://svn.apache.org/viewvc?rev=431600&view=rev
Log:
remove swithing of TCCL bindings shouldn't need to do that.
Pass through pure OMElements for Axis2 Service and References in anticipation of it to be handle by databinding framework interceptors.
clean up
Modified:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointInOutSyncMessageReceiver.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointServlet.java
Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldServiceComponent.java Tue Aug 15 06:37:35 2006
@@ -18,19 +18,9 @@
*/
package helloworld;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.annotations.Scope;
-
-//import org.osoa.sca.CurrentModuleContext;
-//import org.osoa.sca.ModuleContext;
-//
-//import org.apache.tuscany.core.client.TuscanyRuntime;
-//import org.apache.tuscany.common.monitor.MonitorFactory;
-//import org.apache.tuscany.common.monitor.impl.JavaLoggingMonitorFactory;
-
/**
* This client program shows how to create an SCA runtime, start it,
* locate the HelloWorld service and invoke it.
@@ -43,7 +33,7 @@
HelloWorldService helloWorldService;
public String getGreetings(String name) {
- // TODO Auto-generated method stub
+
return helloWorldService.getGreetings(name);
}
@@ -54,4 +44,4 @@
public void setHelloWorldService(HelloWorldService helloWorldService) {
this.helloWorldService = helloWorldService;
}
-}
+}
\ No newline at end of file
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java Tue Aug 15 06:37:35 2006
@@ -67,7 +67,8 @@
new WebServicePortMetaData(wsdlDefinition, wsBinding.getWSDLPort(), wsBinding.getURI(), false);
serviceClient = createServiceClient(wsdlDefinition, wsPortMetaData);
} catch (AxisFault e) {
- //TODO
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
}
@@ -81,7 +82,8 @@
ClassLoader cl = null;
invoker = createOperationInvokers(serviceClient, operation, typeHelper, cl, wsPortMetaData);
} catch (AxisFault e) {
- //TODO
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
return invoker;
}
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java Tue Aug 15 06:37:35 2006
@@ -50,14 +50,9 @@
public void start() {
super.start();
- try {
//TODO This is a big hack ... need to replace with ServletHost api ASAP
currentAxis2Service= this;
- } catch (Exception e) {
-
- e.printStackTrace();
- }
}
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2TargetInvoker.java Tue Aug 15 06:37:35 2006
@@ -70,6 +70,8 @@
public Object invokeTarget(final Object payload) throws InvocationTargetException {
try {
operationClient.setOptions(options);
+ boolean pureOMelement =false;
+
SOAPEnvelope env = soapFactory.getDefaultEnvelope();
@@ -82,6 +84,8 @@
for(Object bc : ((Object [])payload)){
if(bc instanceof OMElement){
body.addChild((OMElement)bc);
+ }else{
+ throw new IllegalArgumentException("Can't handle mixed payloads betweem OMElements and other types.");
}
}
}else{
@@ -102,21 +106,21 @@
requestMC.setEnvelope(env);
operationClient.addMessageContext(requestMC);
-
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- ClassLoader scl = this.getClass().getClassLoader();
- try {
- if (tccl != scl) {
- Thread.currentThread().setContextClassLoader(scl);
- }
+//Class loader switching is taken out 8/15/06 .. we shouldn't require this any more
+// ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+// ClassLoader scl = this.getClass().getClassLoader();
+// try {
+// if (tccl != scl) {
+// Thread.currentThread().setContextClassLoader(scl);
+// }
operationClient.execute(true);
- } finally {
- if (tccl != scl) {
- Thread.currentThread().setContextClassLoader(tccl);
- }
- }
+// } finally {
+// if (tccl != scl) {
+// Thread.currentThread().setContextClassLoader(tccl);
+// }
+// }
MessageContext responseMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
OMElement responseOM = responseMC.getEnvelope().getBody().getFirstElement();
@@ -127,10 +131,14 @@
}
Object response;
- if (os == null || os.length < 1) {
- response = null;
- } else {
- response = os[0];
+ if(pureOMelement){
+ response= responseOM;
+ }else{
+ if (os == null || os.length < 1) {
+ response = null;
+ } else {
+ response = os[0];
+ }
}
return response;
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java Tue Aug 15 06:37:35 2006
@@ -43,7 +43,6 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.LoaderUtil;
-import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
import org.osoa.sca.annotations.Scope;
import org.xml.sax.InputSource;
@@ -56,18 +55,14 @@
public class WebServiceBindingLoader extends LoaderExtension<WebServiceBinding> {
public static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
- protected WSDLDefinitionRegistry wsdlRegistry;
-
private String wsdlLocation;
private String endpointAttribute;
public WebServiceBindingLoader(@Autowire
- LoaderRegistry registry, @Autowire
- WSDLDefinitionRegistry wsdlRegistry) {
+ LoaderRegistry registry) {
super(registry);
- this.wsdlRegistry = wsdlRegistry;
}
public QName getXMLType() {
@@ -163,4 +158,4 @@
}
-}
+}
\ No newline at end of file
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointInOutSyncMessageReceiver.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointInOutSyncMessageReceiver.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointInOutSyncMessageReceiver.java Tue Aug 15 06:37:35 2006
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -52,35 +53,36 @@
public void invokeBusinessLogic(MessageContext inMC, MessageContext outMC) throws AxisFault {
try {
OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
- Object[] request;
- if (requestOM != null) {
- request = dataBinding.fromOMElement(requestOM);
- } else {
- request = new Object[0];
- }
+// Object[] request;
+// if (requestOM != null) {
+// request = dataBinding.fromOMElement(requestOM);
+// } else {
+// request = new Object[0];
+// }
Object response;
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- try {
- if (tccl != classLoader) {
- Thread.currentThread().setContextClassLoader(classLoader);
- }
-
- response = operationMethod.invoke(entryPointProxy, request);
-
- } finally {
- if (tccl != classLoader) {
- Thread.currentThread().setContextClassLoader(tccl);
- }
- }
+// ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+// try {
+// if (tccl != classLoader) {
+// Thread.currentThread().setContextClassLoader(classLoader);
+// }
+
+ response = operationMethod.invoke(entryPointProxy, requestOM);
+
+// } finally {
+// if (tccl != classLoader) {
+// Thread.currentThread().setContextClassLoader(tccl);
+// }
+// }
SOAPEnvelope soapEnvelope = getSOAPFactory(inMC).getDefaultEnvelope();
- OMElement responseOM;
- if (response != null) {
- responseOM = dataBinding.toOMElement(new Object[]{response});
- soapEnvelope.getBody().addChild(responseOM);
- }
+// OMElement responseOM;
+// if (response != null) {
+// responseOM = dataBinding.toOMElement(new Object[]{response});
+// soapEnvelope.getBody().addChild(responseOM);
+// }
+ soapEnvelope.getBody().addChild((OMNode) response);
outMC.setEnvelope(soapEnvelope);
outMC.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointServlet.java?rev=431600&r1=431599&r2=431600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointServlet.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceEntryPointServlet.java Tue Aug 15 06:37:35 2006
@@ -58,7 +58,7 @@
public WebServiceEntryPointServlet() {
System.err.println("Default constructor");
- };
+ }
public WebServiceEntryPointServlet(AxisService axisService) {
this.axisService = axisService;
@@ -80,12 +80,12 @@
@Override
protected void doGet(final HttpServletRequest arg0, final HttpServletResponse arg1) throws ServletException, IOException {
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- ClassLoader scl = this.getClass().getClassLoader();
- try {
- if (tccl != scl) {
- Thread.currentThread().setContextClassLoader(scl);
- }
+// ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+// ClassLoader scl = this.getClass().getClassLoader();
+// try {
+// if (tccl != scl) {
+// Thread.currentThread().setContextClassLoader(scl);
+// }
try {
super.doGet(arg0, arg1);
@@ -94,21 +94,21 @@
throw new ServletException(e);
}
- } finally {
- if (tccl != scl) {
- Thread.currentThread().setContextClassLoader(tccl);
- }
- }
+// } finally {
+// if (tccl != scl) {
+// Thread.currentThread().setContextClassLoader(tccl);
+// }
+// }
}
@Override
protected void doPost(final HttpServletRequest arg0, final HttpServletResponse arg1) throws ServletException, IOException {
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- ClassLoader scl = this.getClass().getClassLoader();
- try {
- if (tccl != scl) {
- Thread.currentThread().setContextClassLoader(scl);
- }
+// ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+// ClassLoader scl = this.getClass().getClassLoader();
+// try {
+// if (tccl != scl) {
+// Thread.currentThread().setContextClassLoader(scl);
+// }
try {
super.doPost(arg0, arg1);
@@ -117,11 +117,11 @@
throw new ServletException(e);
}
- } finally {
- if (tccl != scl) {
- Thread.currentThread().setContextClassLoader(tccl);
- }
- }
+// } finally {
+// if (tccl != scl) {
+// Thread.currentThread().setContextClassLoader(tccl);
+// }
+// }
}
protected Method getMethod(Class<?> serviceInterface, String operationName) {
@@ -190,4 +190,4 @@
return axisService;
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org