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 ch...@apache.org on 2006/11/29 13:14:31 UTC
svn commit: r480547 - in /webservices/axis2/branches/java/WSDL_2_0/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
kernel/src/org/apache/axis2/context/ kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/deployment/util/ ker...
Author: chinthaka
Date: Wed Nov 29 04:14:28 2006
New Revision: 480547
URL: http://svn.apache.org/viewvc?view=rev&rev=480547
Log:
Removing all the un-necessary 2004 MEP constants and make all the references to 2006.
Modified:
webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Wed Nov 29 04:14:28 2006
@@ -19,8 +19,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAP11Constants;
//import org.apache.woden.internal.util.dom.DOM2Writer;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -118,20 +116,14 @@
//populate the MEP -> class map
mepToClassMap = new HashMap();
- mepToClassMap.put(WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY, "org.apache.axis2.receivers.AbstractInMessageReceiver");
mepToClassMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY, "org.apache.axis2.receivers.AbstractInMessageReceiver");
- mepToClassMap.put(WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY, "org.apache.axis2.receivers.AbstractRobustInMessageReceiver");
mepToClassMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY, "org.apache.axis2.receivers.AbstractRobustInMessageReceiver");
- mepToClassMap.put(WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT, "org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver");
mepToClassMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT, "org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver");
//populate the MEP -> suffix map
mepToSuffixMap = new HashMap();
- mepToSuffixMap.put(WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY, MESSAGE_RECEIVER_SUFFIX + "InOnly");
mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY, MESSAGE_RECEIVER_SUFFIX + "InOnly");
- mepToSuffixMap.put(WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY, MESSAGE_RECEIVER_SUFFIX + "InOnly");
mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY, MESSAGE_RECEIVER_SUFFIX + "InOnly");
- mepToSuffixMap.put(WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT, MESSAGE_RECEIVER_SUFFIX + "InOut");
mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT, MESSAGE_RECEIVER_SUFFIX + "InOut");
//register the other types as necessary
}
@@ -1662,7 +1654,7 @@
*/
protected boolean loadOperations(Document doc, Element rootElement, String mep) {
Element methodElement;
- String portTypeName = makeJavaClassName(axisService.getName());
+ String serviceName = makeJavaClassName(axisService.getName());
Iterator operations = axisService.getOperations();
boolean opsFound = false;
@@ -1675,6 +1667,7 @@
// populate info holder with mep information. This will used in determining which
// message receiver to use, etc.,
+
String messageExchangePattern = axisOperation.getMessageExchangePattern();
if (infoHolder.get(messageExchangePattern) == null) {
infoHolder.put(messageExchangePattern, Boolean.TRUE);
@@ -1683,7 +1676,11 @@
if (mep == null) {
opsFound = true;
+<<<<<<< .mine
+ methodElement = generateMethodElement(doc, serviceName, axisOperation);
+=======
methodElement = generateMethodElement(doc, portTypeName, axisOperation, axisBindingOperation);
+>>>>>>> .r480545
rootElement.appendChild(methodElement);
} else {
@@ -1692,8 +1689,7 @@
if (mep.equals(axisOperation.getMessageExchangePattern())) {
//at this point we know it's true
opsFound = true;
- methodElement = generateMethodElement(doc, portTypeName, axisOperation,axisBindingOperation);
-
+ methodElement = generateMethodElement(doc, serviceName, axisOperation, axisBindingOperation);
rootElement.appendChild(methodElement);
//////////////////////
}
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java Wed Nov 29 04:14:28 2006
@@ -37,11 +37,11 @@
*/
public static OperationContext createOperationContext(int mepURI, AxisOperation axisOp)
throws AxisFault {
- if ((WSDL20_2004Constants.MEP_CONSTANT_IN_OUT == mepURI) || (WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_OUT_IN == mepURI) || (WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
+ if ((WSDLConstants.MEP_CONSTANT_IN_OUT == mepURI) || (WSDLConstants.MEP_CONSTANT_IN_ONLY == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_ONLY == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_OUT_IN == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
return new OperationContext(axisOp);
} else {
throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
@@ -51,11 +51,11 @@
public static OperationContext createOperationContext(int mepURI, AxisOperation axisOp,
ServiceContext serviceContext)
throws AxisFault {
- if ((WSDL20_2004Constants.MEP_CONSTANT_IN_OUT == mepURI) || (WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_OUT_IN == mepURI) || (WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
- || (WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
+ if ((WSDLConstants.MEP_CONSTANT_IN_OUT == mepURI) || (WSDLConstants.MEP_CONSTANT_IN_ONLY == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_ONLY == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_OUT_IN == mepURI) || (WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
+ || (WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
return new OperationContext(axisOp, serviceContext);
} else {
throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Wed Nov 29 04:14:28 2006
@@ -306,7 +306,7 @@
protected MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
MessageReceiver messageReceiver;
if (mepURL == null) {
- mepURL = WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
+ mepURL = WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
}
if (service != null) {
messageReceiver = service.getMessageReceiver(mepURL);
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Wed Nov 29 04:14:28 2006
@@ -110,7 +110,7 @@
AxisService service) {
MessageReceiver messageReceiver;
if (mepURL == null) {
- mepURL = WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
+ mepURL = WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
}
if (service != null) {
messageReceiver = service.getMessageReceiver(mepURL);
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Wed Nov 29 04:14:28 2006
@@ -554,12 +554,12 @@
}
op_descrip.setName(new QName(opname));
String MEP = op_descrip.getMessageExchangePattern();
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP)) {
AxisMessage inaxisMessage = op_descrip
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inaxisMessage != null) {
@@ -567,11 +567,11 @@
}
}
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP)) {
AxisMessage outAxisMessage = op_descrip
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Wed Nov 29 04:14:28 2006
@@ -354,9 +354,9 @@
AxisOperation operation;
String opName = jmethod.getSimpleName();
if (jmethod.getReturnType().isVoidType()) {
- operation = AxisOperationFactory.getAxisOperation(WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY);
+ operation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_ONLY);
} else {
- operation = AxisOperationFactory.getAxisOperation(WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_OUT);
+ operation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_OUT);
AxisMessage outMessage = operation.getMessage(
WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
outMessage.setElementQName(table.getQNamefortheType(jmethod.getSimpleName() +
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Wed Nov 29 04:14:28 2006
@@ -42,7 +42,7 @@
public static final String STYLE_MSG = "msg";
public static final String STYLE_DOC = "doc";
private static final Log log = LogFactory.getLog(AxisOperation.class);
- private int mep = WSDL20_2004Constants.MEP_CONSTANT_INVALID;
+ private int mep = WSDLConstants.MEP_CONSTANT_INVALID;
public static final String SOAP_ACTION = "soapaction";
@@ -73,7 +73,7 @@
private String soapAction;
public AxisOperation() {
- mepURI = WSDL20_2004Constants.MEP_URI_IN_OUT;
+ mepURI = WSDL20_2006Constants.MEP_URI_IN_OUT;
modulerefs = new ArrayList();
moduleConfigmap = new HashMap();
faultMessages = new ArrayList();
@@ -387,31 +387,31 @@
* up value so that the subsequent method calls are extremely efficient.
*/
public int getAxisSpecifMEPConstant() {
- if (this.mep != WSDL20_2004Constants.MEP_CONSTANT_INVALID) {
+ if (this.mep != WSDLConstants.MEP_CONSTANT_INVALID) {
return this.mep;
}
- int temp = WSDL20_2004Constants.MEP_CONSTANT_INVALID;
+ int temp = WSDLConstants.MEP_CONSTANT_INVALID;
- if (WSDL20_2004Constants.MEP_URI_IN_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_IN_OUT;
- } else if (WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY;
- } else if (WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT;
- } else if (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_IN;
- } else if (WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY;
- } else if (WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN;
- } else if (WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY;
- } else if (WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
- temp = WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY;
+ if (WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_IN_OUT;
+ } else if (WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_IN_ONLY;
+ } else if (WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT;
+ } else if (WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_OUT_IN;
+ } else if (WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_OUT_ONLY;
+ } else if (WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN;
+ } else if (WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY;
+ } else if (WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
+ temp = WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY;
}
- if (temp == WSDL20_2004Constants.MEP_CONSTANT_INVALID) {
+ if (temp == WSDLConstants.MEP_CONSTANT_INVALID) {
throw new AxisError(Messages.getMessage("mepmappingerror"));
}
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java Wed Nov 29 04:14:28 2006
@@ -28,44 +28,44 @@
AxisOperation abOpdesc;
switch (mepURI) {
- case WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY : {
+ case WSDLConstants.MEP_CONSTANT_IN_ONLY : {
abOpdesc = new InOnlyAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_IN_ONLY);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY : {
+ case WSDLConstants.MEP_CONSTANT_OUT_ONLY : {
abOpdesc = new OutOnlyAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_ONLY);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_ONLY);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_IN_OUT : {
+ case WSDLConstants.MEP_CONSTANT_IN_OUT : {
abOpdesc = new InOutAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_OUT);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_IN_OUT);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT : {
+ case WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT : {
abOpdesc = new InOutAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY : {
+ case WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY : {
abOpdesc = new InOutAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_OUT_IN : {
+ case WSDLConstants.MEP_CONSTANT_OUT_IN : {
abOpdesc = new OutInAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_IN);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_IN);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN : {
+ case WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN : {
abOpdesc = new OutInAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN);
break;
}
- case WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY : {
+ case WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY : {
abOpdesc = new RobustOutOnlyAxisOperation();
- abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY);
+ abOpdesc.setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY);
break;
}
default : {
@@ -78,21 +78,21 @@
//FIXME add in the latest MEP URIs
public static AxisOperation getOperationDescription(String mepURI) throws AxisFault {
AxisOperation abOpdesc;
- if (WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
+ if (WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
abOpdesc = new InOnlyAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
abOpdesc = new OutOnlyAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_IN_OUT.equals(mepURI) || WSDL20_2004Constants.MEP_URI_IN_OUT_03.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mepURI)) {
abOpdesc = new InOutAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
abOpdesc = new InOutAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI)) {
abOpdesc = new OutInAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
abOpdesc = new OutInAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
abOpdesc = new OutInAxisOperation();
- } else if (WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
+ } else if (WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
abOpdesc = new InOnlyAxisOperation();
}else {
throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService.java Wed Nov 29 04:14:28 2006
@@ -454,7 +454,7 @@
private MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
MessageReceiver messageReceiver;
if (mepURL == null) {
- mepURL = WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
+ mepURL = WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
}
if (service != null) {
messageReceiver = service.getMessageReceiver(mepURL);
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java Wed Nov 29 04:14:28 2006
@@ -241,16 +241,16 @@
continue;
}
String MEP = axisOperation.getMessageExchangePattern();
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage inaxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -260,14 +260,14 @@
}
}
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage outAxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -367,16 +367,16 @@
.getPolicyInclude(), operation, fac);
String MEP = axisOperation.getMessageExchangePattern();
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage inaxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -393,14 +393,14 @@
}
}
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage outAxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -605,16 +605,16 @@
String MEP = axisOperation.getMessageExchangePattern();
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage inaxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -631,14 +631,14 @@
}
}
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage outAxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -739,16 +739,16 @@
String MEP = axisOperation.getMessageExchangePattern();
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage inaxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -765,14 +765,14 @@
}
}
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage outAxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -840,16 +840,16 @@
String MEP = axisOperation.getMessageExchangePattern();
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage inaxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -865,14 +865,14 @@
}
}
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY
.equals(MEP)
- || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT
+ || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT
.equals(MEP)) {
AxisMessage outAxisMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java Wed Nov 29 04:14:28 2006
@@ -35,13 +35,13 @@
public InOnlyAxisOperation() {
super();
createMessage();
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_IN_ONLY);
}
public InOnlyAxisOperation(QName name) {
super(name);
createMessage();
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_IN_ONLY);
}
public void addMessage(AxisMessage message, String label) {
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Wed Nov 29 04:14:28 2006
@@ -45,12 +45,12 @@
public class OutInAxisOperation extends InOutAxisOperation {
public OutInAxisOperation() {
super();
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_IN);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_IN);
}
public OutInAxisOperation(QName name) {
super(name);
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_IN);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_IN);
}
public void addMessageContext(MessageContext msgContext,
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java Wed Nov 29 04:14:28 2006
@@ -50,13 +50,13 @@
public OutOnlyAxisOperation() {
super();
createMessage();
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_ONLY);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_ONLY);
}
public OutOnlyAxisOperation(QName name) {
super(name);
createMessage();
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_ONLY);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_ONLY);
}
public void addMessage(AxisMessage message, String label) {
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Wed Nov 29 04:14:28 2006
@@ -33,12 +33,12 @@
public class RobustOutOnlyAxisOperation extends OutInAxisOperation {
public RobustOutOnlyAxisOperation() {
super();
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY);
}
public RobustOutOnlyAxisOperation(QName name) {
super(name);
- setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY);
+ setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY);
}
public OperationClient createClient(ServiceContext sc, Options options) {
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Wed Nov 29 04:14:28 2006
@@ -2054,35 +2054,35 @@
if (isServerSide) {
if (null != operationType) {
if (operationType.equals(OperationType.REQUEST_RESPONSE))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
if (operationType.equals(OperationType.ONE_WAY)) {
if (operation.getFaults().size() > 0) {
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY;
}
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY;
}
if (operationType.equals(OperationType.NOTIFICATION))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY;
if (operationType.equals(OperationType.SOLICIT_RESPONSE))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_IN;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN;
throw new Exception("Cannot Determine the MEP");
}
} else {
if (null != operationType) {
if (operationType.equals(OperationType.REQUEST_RESPONSE))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_IN;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN;
if (operationType.equals(OperationType.ONE_WAY))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY;
if (operationType.equals(OperationType.NOTIFICATION))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY;
if (operationType.equals(OperationType.SOLICIT_RESPONSE))
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
throw new Exception("Cannot Determine the MEP");
}
}
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/util/Utils.java Wed Nov 29 04:14:28 2006
@@ -319,27 +319,27 @@
public static int getAxisSpecifMEPConstant(String messageExchangePattern) {
- int mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_INVALID;
+ int mepConstant = WSDLConstants.MEP_CONSTANT_INVALID;
- if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_OUT;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_IN.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_OUT_IN;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY;
- } else if (WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern) || WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern)) {
- mepConstant = WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY;
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_IN_OUT;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_IN_ONLY;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_OUT_IN;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_OUT_ONLY;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY;
+ } else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern)) {
+ mepConstant = WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY;
}
- if (mepConstant == WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_INVALID) {
+ if (mepConstant == WSDLConstants.MEP_CONSTANT_INVALID) {
throw new AxisError(Messages.getMessage("mepmappingerror"));
}
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java Wed Nov 29 04:14:28 2006
@@ -27,8 +27,8 @@
String STYLE_DOC = "document";
String STYLE_MSG = "msg";
- String WSDL_4_J_DEFINITION = "wsdl4jDefinition";
- String WSDL_20_DESCRIPTION = "WSDL20Description";
+ String WSDL_4_J_DEFINITION = "wsdl4jDefinition";
+ String WSDL_20_DESCRIPTION = "WSDL20Description";
/**
* Field WSDL2_0_NAMESPACE
*/
@@ -86,7 +86,7 @@
String INPUT_PART_QNAME_SUFFIX = "_input";
- public static interface WSDL11Constants{
+ public static interface WSDL11Constants {
/**
* The Type name for the SOAP Address defined in the Port/Endpoint
@@ -94,77 +94,43 @@
QName SOAP_11_ADDRESS = new QName(
Constants.URI_WSDL11_SOAP, "address");
QName SOAP_12_ADDRESS = new QName(
- Constants.URI_WSDL12_SOAP, "address");
+ Constants.URI_WSDL12_SOAP, "address");
QName SOAP_11_OPERATION = new QName(
- Constants.URI_WSDL11_SOAP, "operation");
+ Constants.URI_WSDL11_SOAP, "operation");
QName SOAP_12_OPERATION = new QName(
- Constants.URI_WSDL12_SOAP, "operation");
+ Constants.URI_WSDL12_SOAP, "operation");
QName SCHEMA = new QName(
- Constants.URI_2001_SCHEMA_XSD, "schema");
+ Constants.URI_2001_SCHEMA_XSD, "schema");
QName SOAP_11_BODY = new QName(
- Constants.URI_WSDL11_SOAP, "body");
+ Constants.URI_WSDL11_SOAP, "body");
QName SOAP_12_BODY = new QName(
- Constants.URI_WSDL12_SOAP, "body");
+ Constants.URI_WSDL12_SOAP, "body");
QName SOAP_11_HEADER = new QName(
- Constants.URI_WSDL11_SOAP, "header");
+ Constants.URI_WSDL11_SOAP, "header");
QName SOAP_12_HEADER = new QName(
- Constants.URI_WSDL12_SOAP, "header");
+ Constants.URI_WSDL12_SOAP, "header");
QName SOAP_11_BINDING = new QName(
- Constants.URI_WSDL11_SOAP, "binding");
+ Constants.URI_WSDL11_SOAP, "binding");
QName SOAP_12_BINDING = new QName(
- Constants.URI_WSDL12_SOAP, "binding");
+ Constants.URI_WSDL12_SOAP, "binding");
QName POLICY = new QName(
- Constants.URI_POLICY, "Policy");
+ Constants.URI_POLICY, "Policy");
QName POLICY_REFERENCE = new QName(
- Constants.URI_POLICY, "PolicyReference");
+ Constants.URI_POLICY, "PolicyReference");
}
- public static interface WSDL20_2004Constants {
+ public static final int MEP_CONSTANT_OUT_IN = 16;
+ public static final int MEP_CONSTANT_OUT_ONLY = 14;
+ public static final int MEP_CONSTANT_IN_ONLY = 10;
+ public static final int MEP_CONSTANT_ROBUST_IN_ONLY = 11;
+ public static final int MEP_CONSTANT_IN_OUT = 12;
+ public static final int MEP_CONSTANT_IN_OPTIONAL_OUT = 13;
+ int MEP_CONSTANT_OUT_OPTIONAL_IN = 17;
+ int MEP_CONSTANT_INVALID = -1;
+ int MEP_CONSTANT_ROBUST_OUT_ONLY = 15;
+
- /**
- * Field MEP_URI_IN_ONLY
- */
- String MEP_URI_IN_ONLY = "http://www.w3.org/2004/08/wsdl/in-only";
- int MEP_CONSTANT_IN_ONLY = 10;
- /**
- * Field MEP_URI_ROBUST_IN_ONLY
- */
- String MEP_URI_ROBUST_IN_ONLY = "http://www.w3.org/2004/08/wsdl/robust-in-only";
- int MEP_CONSTANT_ROBUST_IN_ONLY = 11;
- /**
- * Field MEP_URI_IN_OUT
- */
- String MEP_URI_IN_OUT = "http://www.w3.org/2004/08/wsdl/in-out";
- String MEP_URI_IN_OUT_03 = "http://www.w3.org/2004/03/wsdl/in-out";
- int MEP_CONSTANT_IN_OUT = 12;
- /**
- * Field MEP_URI_IN_OPTIONAL_OUT
- */
- String MEP_URI_IN_OPTIONAL_OUT = "http://www.w3.org/2004/08/wsdl/in-opt-out";
- int MEP_CONSTANT_IN_OPTIONAL_OUT = 13;
- /**
- * Field MEP_URI_OUT_ONLY
- */
- String MEP_URI_OUT_ONLY = "http://www.w3.org/2004/08/wsdl/out-only";
- int MEP_CONSTANT_OUT_ONLY = 14;
- /**
- * Field MEP_URI_ROBUST_OUT_ONLY
- */
- String MEP_URI_ROBUST_OUT_ONLY = "http://www.w3.org/2004/08/wsdl/robust-out-only";
- int MEP_CONSTANT_ROBUST_OUT_ONLY = 15;
- /**
- * Field MEP_URI_OUT_IN
- */
- String MEP_URI_OUT_IN = "http://www.w3.org/2004/08/wsdl/out-in";
- int MEP_CONSTANT_OUT_IN = 16;
- /**
- * Field MEP_URI_OUT_OPTIONL_IN
- */
- String MEP_URI_OUT_OPTIONAL_IN = "http://www.w3.org/2004/08/wsdl/out-opt-in";
- int MEP_CONSTANT_OUT_OPTIONAL_IN = 17;
- int MEP_CONSTANT_INVALID = -1;
- }
public static interface WSDL20_2006Constants {
// http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#in-only
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java?view=diff&rev=480547&r1=480546&r2=480547
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java Wed Nov 29 04:14:28 2006
@@ -28,13 +28,7 @@
* @param mep
*/
public static boolean isInputPresentForMEP(String mep) {
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(mep) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep)||
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep)||
WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mep)||
WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mep)||
WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mep)||
@@ -47,12 +41,7 @@
* @param MEP
*/
public static boolean isOutputPresentForMEP(String MEP) {
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ return WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP) ||
WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(MEP) ||
WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org