Author: antelder
Date: Fri Jul 27 02:58:10 2007
New Revision: 560175
URL: http://svn.apache.org/viewvc?view=rev&rev=560175
Log:
Cosmetic changes, clean up old comments etc
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceClient.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
Fri Jul 27 02:58:10 2007
@@ -43,8 +43,7 @@
import org.osoa.sca.Constants;
/**
- * Axis2BindingInvoker uses an Axis2 OperationClient to invoke a remote web
- * service
+ * Axis2BindingInvoker uses an Axis2 OperationClient to invoke a remote web
service
*/
public class Axis2BindingInvoker implements Invoker {
@@ -67,18 +66,16 @@
public Message invoke(Message msg) {
try {
- // getCallbackUris() has been removed from the Message interface
- // LinkedList<URI> callbackRoutingChain = msg.getCallbackUris();
- // if (callbackRoutingChain != null) {
- // workContext.setCallbackUris(callbackRoutingChain);
- // }
+
Object resp = invokeTarget(msg.getBody(),
msg.getConversationSequence(), msg.getConversationID());
msg.setBody(resp);
+
} catch (InvocationTargetException e) {
msg.setFaultBody(e.getCause());
} catch (Throwable e) {
msg.setFaultBody(e);
}
+
return msg;
}
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/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/axis2/Axis2ReferenceBindingProvider.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
Fri Jul 27 02:58:10 2007
@@ -32,11 +32,8 @@
public class Axis2ReferenceBindingProvider implements
ReferenceBindingProvider2 {
- private RuntimeComponent component;
private RuntimeComponentReference reference;
private WebServiceBinding wsBinding;
- private ServletHost servletHost;
- private MessageFactory messageFactory;
private Axis2ServiceClient axisClient;
private Axis2ServiceProvider axisProvider;
private WebServiceBinding callbackBinding;
@@ -47,11 +44,8 @@
ServletHost servletHost,
MessageFactory messageFactory) {
- this.component = component;
this.reference = reference;
this.wsBinding = wsBinding;
- this.servletHost = servletHost;
- this.messageFactory = messageFactory;
InterfaceContract contract = wsBinding.getBindingInterfaceContract();
if (contract == null) {
@@ -67,18 +61,6 @@
contract.getCallbackInterface().setDefaultDataBinding(OMElement.class.getName());
}
- // ??? following line was in Axis2BindingBuilder before the SPI changes
- // and code reorg
- //
- // URI targetURI = wsBinding.getURI() != null ?
- // URI.create(wsBinding.getURI()) : URI.create("foo");
- //
- // targetURI was passed to the ReferenceBindingExtension constructor
and
- // apparently was unused
- // Do we still need a targetURI?
-
- // wsBinding.setURI(component.getURI() + "#" + reference.getName());
-
if (!wsBinding.isCallback()) {
// this is a forward binding, so look for a matching callback
binding
if (reference.getCallback() != null) {
@@ -91,7 +73,7 @@
}
}
} else {
- // this is a callback binding, so look for all matching forward
bindings
+ // this is a callback binding, so look for all matching forward
binding
for (Binding binding : reference.getBindings()) {
if (reference.getBindingProvider(binding) instanceof
Axis2ReferenceBindingProvider) {
// set all compatible forward binding providers for this
reference
@@ -105,9 +87,9 @@
axisClient =
new Axis2ServiceClient(component, reference, wsBinding,
servletHost, messageFactory, callbackBinding);
} else {
- //FIXME: need to support callbacks through self-references
+ // FIXME: need to support callbacks through self-references
// For now, don't create a callback service provider for a
self-reference
- // because this modifies the binding URI. This messes up the
service callback
+ // because this modifies the binding URI. This messes up the
service callback
// wires because the self-reference has the same binding object as
the service.
if (!reference.getName().startsWith("$self$.")) {
axisProvider = new Axis2ServiceProvider(component, reference,
wsBinding, servletHost, messageFactory);
@@ -125,7 +107,7 @@
if (!wsBinding.isCallback()) {
axisClient.start();
} else {
- //FIXME: need to support callbacks through self-references
+ // FIXME: need to support callbacks through self-references
if (!reference.getName().startsWith("$self$.")) {
axisProvider.start();
}
@@ -136,7 +118,7 @@
if (!wsBinding.isCallback()) {
axisClient.stop();
} else {
- //FIXME: need to support callbacks through self-references
+ // FIXME: need to support callbacks through self-references
if (!reference.getName().startsWith("$self$.")) {
axisProvider.stop();
}
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/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/axis2/Axis2ServiceBindingProvider.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
Fri Jul 27 02:58:10 2007
@@ -31,11 +31,7 @@
public class Axis2ServiceBindingProvider implements ServiceBindingProvider2 {
- private RuntimeComponent component;
- private RuntimeComponentService service;
private WebServiceBinding wsBinding;
- private ServletHost servletHost;
- private MessageFactory messageFactory;
private Axis2ServiceClient axisClient;
private Axis2ServiceProvider axisProvider;
@@ -45,11 +41,7 @@
ServletHost servletHost,
MessageFactory messageFactory) {
- this.component = component;
- this.service = service;
this.wsBinding = wsBinding;
- this.servletHost = servletHost;
- this.messageFactory = messageFactory;
InterfaceContract contract = wsBinding.getBindingInterfaceContract();
if (contract == null) {
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceClient.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceClient.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceClient.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceClient.java
Fri Jul 27 02:58:10 2007
@@ -50,11 +50,7 @@
public class Axis2ServiceClient {
- private RuntimeComponent component;
- private AbstractContract contract; // not used currently
private WebServiceBinding wsBinding;
- private ServletHost servletHost;
- private MessageFactory messageFactory;
private ServiceClient serviceClient;
private WebServiceBinding callbackBinding;
@@ -64,14 +60,10 @@
ServletHost servletHost,
MessageFactory messageFactory,
WebServiceBinding callbackBinding) {
- this.component = component;
- this.contract = contract;
+
this.wsBinding = wsBinding;
- this.servletHost = servletHost;
- this.messageFactory = messageFactory;
this.callbackBinding = callbackBinding;
-
- serviceClient = createServiceClient();
+ this.serviceClient = createServiceClient();
}
protected void start() {
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceProvider.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceProvider.java
Fri Jul 27 02:58:10 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.binding.axis2;
+import java.io.ByteArrayOutputStream;
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.util.Iterator;
@@ -36,8 +37,11 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.deployment.util.Utils;
+import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisService2OM;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
import org.apache.axis2.description.WSDL2Constants;
@@ -60,7 +64,6 @@
public class Axis2ServiceProvider {
- private RuntimeComponent component;
private AbstractContract contract;
private WebServiceBinding wsBinding;
private ServletHost servletHost;
@@ -81,7 +84,6 @@
ServletHost servletHost,
MessageFactory messageFactory) {
- this.component = component;
this.contract = contract;
this.wsBinding = wsBinding;
this.servletHost = servletHost;
@@ -146,8 +148,7 @@
URI wsdlURI = null;
if (wsBinding.getServiceName() != null && wsBinding.getBindingName()
== null) {
- // <binding.ws> explicitly points at a wsdl port, may be a relative
- // URI
+ // <binding.ws> explicitly points at a wsdl port, may be a
relative URI
wsdlURI = getEndpoint(wsBinding.getPort());
}
if (wsdlURI != null && wsdlURI.isAbsolute()) {
@@ -174,9 +175,8 @@
}
}
- // both the WSDL endpoint and binding uri are either unspecified or
- // relative so
- // the endpoint is based on the component name and service binding URI
+ // both the WSDL endpoint and binding uri are either unspecified or
relative
+ // so the endpoint is based on the component name and service binding
URI
URI componentURI = URI.create(component.getName());
@@ -237,8 +237,7 @@
}
/**
- * Create an AxisService from the interface class from the SCA service
- * interface
+ * Create an AxisService from the interface class from the SCA service
interface
*/
protected AxisService createJavaAxisService() throws AxisFault {
AxisService axisService = new AxisService();
@@ -254,6 +253,22 @@
Utils.fillAxisService(axisService,
configContext.getAxisConfiguration(), null, null);
} catch (Exception e) {
throw new RuntimeException(e);
+ }
+
+ AxisDescription parent = new AxisServiceGroup();
+ parent.setParent(configContext.getAxisConfiguration());
+ axisService.setParent(parent);
+
+ AxisService2OM axisService2WOM = new AxisService2OM(axisService,
+ new String[] {"foo"}, "document",
"literal",
+ "");
+ try {
+ OMElement wsdlElement = axisService2WOM.generateOM();
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ wsdlElement.serialize(os);
+ System.out.println(os.toString());
+ } catch (Exception e) {
+ e.printStackTrace();
}
return axisService;
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
Fri Jul 27 02:58:10 2007
@@ -112,6 +112,7 @@
return null;
}
+ @SuppressWarnings("unused") // it's on the servlet 2.5 api
so we need it
public String getContextPath() {
return null;
}
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java?view=diff&rev=560175&r1=560174&r2=560175
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
Fri Jul 27 02:58:10 2007
@@ -26,8 +26,7 @@
/**
* Helps configure Axis2 from a resource in binding.axis2 instead of Axis2.xml
- * <p/> TODO: Review: should there be a single global Axis
- * ConfigurationContext
+ * <p/> TODO: Review: should there be a single global Axis ConfigurationContext
*/
public class TuscanyAxisConfigurator extends URLBasedAxisConfigurator
implements AxisConfigurator {
@@ -36,8 +35,9 @@
}
public ConfigurationContext getConfigurationContext() throws AxisFault {
- if (configContext == null)
+ if (configContext == null) {
configContext =
ConfigurationContextFactory.createConfigurationContext(this);
+ }
return configContext;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
