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 ba...@apache.org on 2007/04/10 21:11:49 UTC
svn commit: r527251 - in /webservices/axis2/trunk/java/modules/metadata:
src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
test/org/apache/axis2/jaxws/description/DocLitBareResolveOperationTests.java
Author: barrettj
Date: Tue Apr 10 12:11:48 2007
New Revision: 527251
URL: http://svn.apache.org/viewvc?view=rev&rev=527251
Log:
AXIS2-2500
Fix contributed by Dustin Amrhein. Use WebParam.name instead of WebParam.partName for element mapping
Modified:
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitBareResolveOperationTests.java
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?view=diff&rev=527251&r1=527250&r2=527251
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java Tue Apr 10 12:11:48 2007
@@ -37,6 +37,7 @@
import org.apache.axis2.jaxws.description.builder.MethodDescriptionComposite;
import org.apache.axis2.jaxws.description.builder.OneWayAnnot;
import org.apache.axis2.jaxws.description.builder.ParameterDescriptionComposite;
+import org.apache.axis2.jaxws.description.builder.WebParamAnnot;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -62,6 +63,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
@@ -266,13 +268,13 @@
// QName based on this parameter then break out of the loop.
AxisMessage axisMessage =
newAxisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- String partLocalName = paramDesc.getPartName();
+ String elementName = paramDesc.getParameterName();
String partNamespace = paramDesc.getTargetNamespace();
if (log.isDebugEnabled()) {
log.debug("Setting up annotation based Doc/Lit/Bare operation: " +
newAxisOperation.getName()
- + "; axisMessage: " + axisMessage + "; partLocalName: "
- + partLocalName + "; partTNS: " + partNamespace);
+ + "; axisMessage: " + axisMessage + "; name: "
+ + elementName + "; partTNS: " + partNamespace);
}
if (axisMessage == null) {
// TODO: RAS & NLS
@@ -282,12 +284,16 @@
// TODO: RAS & NLS
throw ExceptionFactory.makeWebServiceException(
"Could not setup Doc/Lit/Bare operation because part namespace is empty");
- } else if (DescriptionUtils.isEmpty(partLocalName)) {
+ } else if (DescriptionUtils.isEmpty(elementName)) {
// TODO: RAS & NLS
throw ExceptionFactory.makeWebServiceException(
- "Could not setup Doc/Lit/Bare operation because part local name is empty");
+ "Could not setup Doc/Lit/Bare operation because name is empty");
} else {
- QName partQName = new QName(partNamespace, partLocalName);
+ QName partQName = new QName(partNamespace, elementName);
+ if(log.isDebugEnabled()) {
+ log.debug("Setting AxisMessage element QName for bare mapping: " +
+ partQName);
+ }
axisMessage.setElementQName(partQName);
}
break;
Modified: webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitBareResolveOperationTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitBareResolveOperationTests.java?view=diff&rev=527251&r1=527250&r2=527251
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitBareResolveOperationTests.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitBareResolveOperationTests.java Tue Apr 10 12:11:48 2007
@@ -221,14 +221,14 @@
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void op1(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op1param1PartName") int param1) {
+ name = "op1param1PartName") int param1) {
}
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL,
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void op2(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op2param1PartName",
+ name = "op2param1PartName",
mode = WebParam.Mode.INOUT) Holder<Integer> param1) {
}
@@ -236,10 +236,10 @@
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void op3(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op3param1PartName",
+ name = "op3param1PartName",
mode = WebParam.Mode.INOUT) Holder<Integer> param1,
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op3param2PartName",
+ name = "op3param2PartName",
mode = WebParam.Mode.IN) int param2) {
}
@@ -247,7 +247,7 @@
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void op4(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op4param1PartName",
+ name = "op4param1PartName",
mode = WebParam.Mode.OUT) Holder<Integer> param1) {
}
@@ -255,10 +255,10 @@
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void op5(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op5param1PartName",
+ name = "op5param1PartName",
mode = WebParam.Mode.OUT) Holder<Integer> param1,
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op5param2PartName",
+ name = "op5param2PartName",
mode = WebParam.Mode.IN) int param2) {
}
@@ -277,11 +277,11 @@
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void op8(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op8param1PartName",
+ name = "op8param1PartName",
mode = WebParam.Mode.IN,
header = true) Integer param1,
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op8param2PartName",
+ name = "op8param2PartName",
mode = WebParam.Mode.IN) int param2) {
}
@@ -289,7 +289,7 @@
parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
public void op10(
@WebParam(targetNamespace = "org.apache.axis2.jaxws.description.DLBResolveOperation",
- partName = "op10param1PartName") int param1) {
+ name = "op10param1PartName") int param1) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org