You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2006/11/11 18:41:11 UTC
svn commit: r473762 - in
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws:
client/proxy/ marshaller/factory/ marshaller/impl/ marshaller/impl/alt/
registry/ server/dispatcher/
Author: scheu
Date: Sat Nov 11 09:41:10 2006
New Revision: 473762
URL: http://svn.apache.org/viewvc?view=rev&rev=473762
Log:
AXIS2-1603
Contributor: Rich Scheuerle
Foundation Work for RPC Lit Method Marshaller...Added alternative implementation package and stubbed out classes. MethodMarshallers are now created using
both style and param style
Added:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java?view=diff&rev=473762&r1=473761&r2=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java Sat Nov 11 09:41:10 2006
@@ -408,11 +408,13 @@
}
//FIXME: The protocol should actually come from the binding information included in
// either the WSDL or an annotation.
- return cf.createDocLitMethodMarshaller(parameterStyle, serviceDesc, endpointDesc, operationDesc, Protocol.soap11);
+ return cf.createMethodMarshaller(SOAPBinding.Style.DOCUMENT, parameterStyle,
+ serviceDesc, endpointDesc, operationDesc, Protocol.soap11);
}
private MethodMarshaller createRPCLitMethodMarshaller(MethodMarshallerFactory cf){
- return cf.createDocLitMethodMarshaller(null, serviceDesc, endpointDesc, operationDesc, Protocol.soap11);
+ return cf.createMethodMarshaller(SOAPBinding.Style.DOCUMENT, SOAPBinding.ParameterStyle.WRAPPED,
+ serviceDesc, endpointDesc, operationDesc, Protocol.soap11);
}
protected boolean isDocLitBare(){
SOAPBinding.ParameterStyle methodParamStyle = operationDesc.getSoapBindingParameterStyle();
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java?view=diff&rev=473762&r1=473761&r2=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java Sat Nov 11 09:41:10 2006
@@ -24,27 +24,62 @@
import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
import org.apache.axis2.jaxws.marshaller.impl.DocLitBareMethodMarshallerImpl;
import org.apache.axis2.jaxws.marshaller.impl.DocLitWrappedMethodMarshallerImpl;
+import org.apache.axis2.jaxws.marshaller.impl.RPCLitMethodMarshallerImpl;
+import org.apache.axis2.jaxws.marshaller.impl.alt.DocLitBareMethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.impl.alt.DocLitWrappedMethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.impl.alt.RPCLitMethodMarshaller;
import org.apache.axis2.jaxws.message.Protocol;
+/**
+ * The MethodMarshallerFactory creates a Doc/Lit Wrapped, Doc/Lit Bare or RPC Marshaller using SOAPBinding information
+ */
public class MethodMarshallerFactory {
- public MethodMarshallerFactory() {
- super();
-
- }
-
- public MethodMarshaller createDocLitMethodMarshaller(SOAPBinding.ParameterStyle style, ServiceDescription serviceDesc, EndpointDescription endpointDesc, OperationDescription operationDesc, Protocol protocol){
- if(style == SOAPBinding.ParameterStyle.WRAPPED){
- return new DocLitWrappedMethodMarshallerImpl(serviceDesc, endpointDesc, operationDesc, protocol);
- }
- if(style == SOAPBinding.ParameterStyle.BARE){
- return new DocLitBareMethodMarshallerImpl(serviceDesc, endpointDesc, operationDesc, protocol);
+ private static final boolean ALT_RPCLIT = false;
+ private static final boolean ALT_DOCLIT_WRAPPED = false;
+ private static final boolean ALT_DOCLIT_BARE = false;
+
+ /**
+ * Intentionally private
+ */
+ private MethodMarshallerFactory() {
+ }
+
+ /**
+ * Create Marshaller usining the Binding information
+ * @param binding
+ * @param serviceDesc
+ * @param endpointDesc
+ * @param operationDesc
+ * @param protocol
+ * @return
+ */
+ public static MethodMarshaller createMethodMarshaller(SOAPBinding.Style style,
+ SOAPBinding.ParameterStyle paramStyle,
+ ServiceDescription serviceDesc,
+ EndpointDescription endpointDesc,
+ OperationDescription operationDesc,
+ Protocol protocol){
+ if (style == SOAPBinding.Style.RPC) {
+ if (ALT_RPCLIT) {
+ return new RPCLitMethodMarshaller(serviceDesc, endpointDesc, operationDesc, protocol);
+ } else {
+ return new RPCLitMethodMarshallerImpl(serviceDesc, endpointDesc, operationDesc, protocol);
+ }
+ } else if (paramStyle == SOAPBinding.ParameterStyle.WRAPPED){
+ if (ALT_DOCLIT_WRAPPED) {
+ return new DocLitWrappedMethodMarshaller(serviceDesc, endpointDesc, operationDesc, protocol);
+ } else {
+ return new DocLitWrappedMethodMarshallerImpl(serviceDesc, endpointDesc, operationDesc, protocol);
+ }
+ } else if (paramStyle == SOAPBinding.ParameterStyle.BARE){
+ if (ALT_DOCLIT_BARE) {
+ return new DocLitBareMethodMarshaller(serviceDesc, endpointDesc, operationDesc, protocol);
+ } else {
+ return new DocLitBareMethodMarshallerImpl(serviceDesc, endpointDesc, operationDesc, protocol);
+ }
}
return null;
- }
-
- public MethodMarshaller createRPCLitMethodMarshaller(SOAPBinding.ParameterStyle style, ServiceDescription serviceDesc, EndpointDescription endpointDesc, OperationDescription operationDesc, Protocol protocol){
- throw new UnsupportedOperationException("RPC/LIT not supported");
}
}
Added: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java?view=auto&rev=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java (added)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/RPCLitMethodMarshallerImpl.java Sat Nov 11 09:41:10 2006
@@ -0,0 +1,66 @@
+package org.apache.axis2.jaxws.marshaller.impl;
+
+import javax.xml.ws.WebServiceException;
+
+import org.apache.axis2.jaxws.description.EndpointDescription;
+import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.Protocol;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+public class RPCLitMethodMarshallerImpl extends MethodMarshallerImpl {
+
+
+ public RPCLitMethodMarshallerImpl(ServiceDescription serviceDesc,
+ EndpointDescription endpointDesc, OperationDescription operationDesc, Protocol protocol) {
+ super(serviceDesc, endpointDesc, operationDesc, protocol);
+ // TODO Unsupported
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Object demarshalResponse(Message message, Object[] inputArgs)
+ throws WebServiceException {
+ // TODO Unsupported
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Object[] demarshalRequest(Message message)
+ throws WebServiceException {
+ // TODO Unsupported
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Message marshalResponse(Object returnObject, Object[] holderObjects)
+ throws WebServiceException {
+ // TODO Unsupported
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Message marshalRequest(Object[] object) throws WebServiceException {
+ // TODO Unsupported
+ throw new UnsupportedOperationException();
+ }
+
+}
Added: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java?view=auto&rev=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java (added)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java Sat Nov 11 09:41:10 2006
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis2.jaxws.marshaller.impl.alt;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+
+import org.apache.axis2.jaxws.ExceptionFactory;
+import org.apache.axis2.jaxws.description.EndpointDescription;
+import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.impl.MethodMarshallerImpl;
+import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.Protocol;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class DocLitBareMethodMarshaller implements MethodMarshaller {
+
+ private static Log log = LogFactory.getLog(DocLitBareMethodMarshaller.class);
+ protected ServiceDescription serviceDesc = null;
+ protected EndpointDescription endpointDesc = null;
+ protected OperationDescription operationDesc = null;
+ protected Protocol protocol = Protocol.soap11;
+
+
+ public DocLitBareMethodMarshaller(ServiceDescription serviceDesc, EndpointDescription endpointDesc, OperationDescription operationDesc, Protocol protocol) {
+ super();
+ this.serviceDesc = serviceDesc;
+ this.endpointDesc = endpointDesc;
+ this.operationDesc = operationDesc;
+ this.protocol = protocol;
+ }
+
+ public Object demarshalResponse(Message message, Object[] inputArgs)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Object[] demarshalRequest(Message message)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalResponse(Object returnObject, Object[] holderObjects)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalRequest(Object[] object) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalFaultResponse(Throwable throwable) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Object demarshalFaultResponse(Message message) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+}
Added: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java?view=auto&rev=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java (added)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java Sat Nov 11 09:41:10 2006
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis2.jaxws.marshaller.impl.alt;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+
+import org.apache.axis2.jaxws.ExceptionFactory;
+import org.apache.axis2.jaxws.description.EndpointDescription;
+import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.impl.MethodMarshallerImpl;
+import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.Protocol;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class DocLitWrappedMethodMarshaller implements MethodMarshaller {
+
+ private static Log log = LogFactory.getLog(DocLitWrappedMethodMarshaller.class);
+ protected ServiceDescription serviceDesc = null;
+ protected EndpointDescription endpointDesc = null;
+ protected OperationDescription operationDesc = null;
+ protected Protocol protocol = Protocol.soap11;
+
+
+ public DocLitWrappedMethodMarshaller(ServiceDescription serviceDesc, EndpointDescription endpointDesc, OperationDescription operationDesc, Protocol protocol) {
+ super();
+ this.serviceDesc = serviceDesc;
+ this.endpointDesc = endpointDesc;
+ this.operationDesc = operationDesc;
+ this.protocol = protocol;
+ }
+
+ public Object demarshalResponse(Message message, Object[] inputArgs)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Object[] demarshalRequest(Message message)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalResponse(Object returnObject, Object[] holderObjects)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalRequest(Object[] object) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalFaultResponse(Throwable throwable) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Object demarshalFaultResponse(Message message) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+}
Added: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java?view=auto&rev=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java (added)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java Sat Nov 11 09:41:10 2006
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis2.jaxws.marshaller.impl.alt;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+
+import org.apache.axis2.jaxws.description.EndpointDescription;
+import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.impl.MethodMarshallerImpl;
+import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.Protocol;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * Static Utilty Classes used by the MethodMarshaller implementations in the alt package.
+ */
+class MethodMarshallerUtils {
+
+ private static Log log = LogFactory.getLog(MethodMarshallerUtils.class);
+
+ /**
+ * Intentionally Private. This is a static utility class
+ */
+ private MethodMarshallerUtils() {
+ }
+
+
+
+}
Added: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java?view=auto&rev=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java (added)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java Sat Nov 11 09:41:10 2006
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis2.jaxws.marshaller.impl.alt;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+
+import org.apache.axis2.jaxws.ExceptionFactory;
+import org.apache.axis2.jaxws.description.EndpointDescription;
+import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.impl.MethodMarshallerImpl;
+import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.Protocol;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class RPCLitMethodMarshaller implements MethodMarshaller {
+
+ private static Log log = LogFactory.getLog(RPCLitMethodMarshaller.class);
+ protected ServiceDescription serviceDesc = null;
+ protected EndpointDescription endpointDesc = null;
+ protected OperationDescription operationDesc = null;
+ protected Protocol protocol = Protocol.soap11;
+
+
+ public RPCLitMethodMarshaller(ServiceDescription serviceDesc, EndpointDescription endpointDesc, OperationDescription operationDesc, Protocol protocol) {
+ super();
+ this.serviceDesc = serviceDesc;
+ this.endpointDesc = endpointDesc;
+ this.operationDesc = operationDesc;
+ this.protocol = protocol;
+ }
+
+ public Object demarshalResponse(Message message, Object[] inputArgs)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Object[] demarshalRequest(Message message)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalResponse(Object returnObject, Object[] holderObjects)
+ throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalRequest(Object[] object) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Message marshalFaultResponse(Throwable throwable) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+ public Object demarshalFaultResponse(Message message) throws WebServiceException {
+ // Note all exceptions are caught and rethrown with a WebServiceException
+ try {
+ // TODO Add Real Code
+ throw new UnsupportedOperationException();
+ } catch(Exception e) {
+ throw ExceptionFactory.makeWebServiceException(e);
+ }
+ }
+
+}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java?view=diff&rev=473762&r1=473761&r2=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java Sat Nov 11 09:41:10 2006
@@ -56,8 +56,7 @@
table.put(MessageFactory.class, new MessageFactoryImpl());
table.put(XMLPartFactory.class, new XMLPartFactoryImpl());
table.put(SAAJConverterFactory.class, new SAAJConverterFactoryImpl());
- table.put(MethodMarshallerFactory.class, new MethodMarshallerFactory());
- table.put(EndpointLifecycleManagerFactory.class, new EndpointLifecycleManagerFactory());
+ table.put(EndpointLifecycleManagerFactory.class, new EndpointLifecycleManagerFactory());
}
/**
* FactoryRegistry is currently a static singleton
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?view=diff&rev=473762&r1=473761&r2=473762
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java Sat Nov 11 09:41:10 2006
@@ -19,6 +19,7 @@
import java.lang.reflect.Method;
import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.jws.soap.SOAPBinding.Style;
import javax.xml.namespace.QName;
import javax.xml.ws.soap.SOAPBinding;
@@ -201,11 +202,13 @@
if(isDocLitWrapped(endpointDesc, operationDesc)){
parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED;
}
- return cf.createDocLitMethodMarshaller(parameterStyle, serviceDesc, endpointDesc, operationDesc, protocol);
+ return cf.createMethodMarshaller(Style.DOCUMENT, parameterStyle,
+ serviceDesc, endpointDesc, operationDesc, protocol);
}
private MethodMarshaller createRPCLitMessageConvertor(MethodMarshallerFactory cf, Protocol protocol){
- return cf.createDocLitMethodMarshaller(null, serviceDesc, endpointDesc, operationDesc, protocol);
+ return cf.createMethodMarshaller(Style.RPC, ParameterStyle.WRAPPED,
+ serviceDesc, endpointDesc, operationDesc, protocol);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org