axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r415621 [1/2] - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/wsdl/codegen/emitter/ codegen/src/org/apache/axis2/wsdl/codegen/extension/ common/src/org/apache/axis2/wsdl/ common/src/org/apache/axis2/wsdl/codegen/wri...
Date Tue, 20 Jun 2006 12:04:07 GMT
Author: ajith
Date: Tue Jun 20 05:04:06 2006
New Revision: 415621

URL: http://svn.apache.org/viewvc?rev=415621&view=rev
Log:
1. Refactored the WSDL constants to make things clear and streamlined
2. Moved two methods that determine whether a given mep has inputs(outputs) to a util class in commons


Added:
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLUtil.java
Removed:
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDL20Constants.java
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/codegen/writer/
Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WSDL2.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Tue Jun 20 05:04:06 2006
@@ -10,8 +10,8 @@
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.util.XSLTUtils;
 import org.apache.axis2.wsdl.SOAPHeaderMessage;
-import org.apache.axis2.wsdl.WSDL20Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.WSDLUtil;
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.codegen.CodeGenerationException;
 import org.apache.axis2.wsdl.codegen.writer.AntBuildWriter;
@@ -134,17 +134,17 @@
 
         //populate the MEP -> class map
         mepToClassMap = new HashMap();
-        mepToClassMap.put(WSDLConstants.MEP_URI_IN_ONLY, "org.apache.axis2.receivers.AbstractInMessageReceiver");
-        mepToClassMap.put(WSDL20Constants.MEP_URI_IN_ONLY, "org.apache.axis2.receivers.AbstractInMessageReceiver");
-        mepToClassMap.put(WSDLConstants.MEP_URI_IN_OUT, "org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver");
-        mepToClassMap.put(WSDL20Constants.MEP_URI_IN_OUT, "org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver");
+        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_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.MEP_URI_IN_ONLY, MESSAGE_RECEIVER_SUFFIX + "InOnly");
-        mepToSuffixMap.put(WSDL20Constants.MEP_URI_IN_ONLY, MESSAGE_RECEIVER_SUFFIX + "InOnly");
-        mepToSuffixMap.put(WSDLConstants.MEP_URI_IN_OUT, MESSAGE_RECEIVER_SUFFIX + "InOut");
-        mepToSuffixMap.put(WSDL20Constants.MEP_URI_IN_OUT, MESSAGE_RECEIVER_SUFFIX + "InOut");
+        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_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
     }
 
@@ -952,14 +952,14 @@
 
             // process the input parameters
             String MEP = axisOperation.getMessageExchangePattern();
-            if (isInputPresentForMEP(MEP)) {
+            if (WSDLUtil.isInputPresentForMEP(MEP)) {
                 Element inputParamElement = getInputParamElement(doc, axisOperation);
                 if (inputParamElement != null) {
                     parameterMap.put(inputParamElement.getAttribute("type"), inputParamElement);
                 }
             }
             // process output parameters
-            if (isOutputPresentForMEP(MEP)) {
+            if (WSDLUtil.isOutputPresentForMEP(MEP)) {
                 Element outputParamElement = getOutputParamElement(doc, axisOperation);
                 if (outputParamElement != null) {
                     parameterMap.put(outputParamElement.getAttribute("type"), outputParamElement);
@@ -1015,20 +1015,7 @@
         return rootElement;
     }
 
-    protected boolean isInputPresentForMEP(String mep) {
-        return WSDLConstants.MEP_URI_IN_ONLY.equals(mep) ||
-                WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(mep) ||
-                WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(mep) ||
-                WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(mep) ||
-                WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(mep) ||
-                WSDLConstants.MEP_URI_IN_OUT.equals(mep) ||
-                WSDL20Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep)||
-                WSDL20Constants.MEP_URI_IN_ONLY.equals(mep)||
-                WSDL20Constants.MEP_URI_IN_OUT.equals(mep)||
-                WSDL20Constants.MEP_URI_OUT_IN.equals(mep)||
-                WSDL20Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep)||
-                WSDL20Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep);
-    }
+
 
     /**
      * Gets the base64 types. If not available this will be empty!!!
@@ -1483,7 +1470,7 @@
         ArrayList headerparamList = new ArrayList();
         String MEP = axisOperation.getMessageExchangePattern();
         if (input) {
-            if (isInputPresentForMEP(MEP)) {
+            if (WSDLUtil.isInputPresentForMEP(MEP)) {
                 AxisMessage inaxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                 if (inaxisMessage != null) {
@@ -1492,7 +1479,7 @@
                 }
             }
         } else {
-            if (isOutputPresentForMEP(MEP)) {
+            if (WSDLUtil.isOutputPresentForMEP(MEP)) {
                 AxisMessage outAxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                 if (outAxisMessage != null) {
@@ -1507,25 +1494,12 @@
         }
     }
 
-    protected boolean isOutputPresentForMEP(String MEP) {
-        return WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_IN_OUT.equals(MEP) ||
-                WSDL20Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                WSDL20Constants.MEP_URI_IN_OUT.equals(MEP) ||
-                WSDL20Constants.MEP_URI_OUT_IN.equals(MEP) ||
-                WSDL20Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
-                WSDL20Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                WSDL20Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP);
-    }
+
 
     protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
         Element inputElt = doc.createElement("input");
         String MEP = operation.getMessageExchangePattern();
-        if (isInputPresentForMEP(MEP)) {
+        if (WSDLUtil.isInputPresentForMEP(MEP)) {
             Element param = getInputParamElement(doc, operation);
 
             if (param != null) {
@@ -1568,7 +1542,7 @@
     protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
         Element outputElt = doc.createElement("output");
         String MEP = operation.getMessageExchangePattern();
-        if (isOutputPresentForMEP(MEP)) {
+        if (WSDLUtil.isOutputPresentForMEP(MEP)) {
             Element param = getOutputParamElement(doc, operation);
 
             if (param != null) {

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java Tue Jun 20 05:04:06 2006
@@ -124,12 +124,12 @@
      */
     private void accumulateElements(AxisOperation op, HashSet elements) {
         String MEP = op.getMessageExchangePattern();
-        if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+        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)) {
             AxisMessage inaxisMessage = op
                     .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
             if (inaxisMessage != null) {
@@ -137,12 +137,12 @@
             }
         }
 
-        if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+        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_ROBUST_IN_ONLY.equals(MEP) ||
+                WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
             AxisMessage outAxisMessage = op
                     .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
             if (outAxisMessage != null) {

Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLConstants.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLConstants.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLConstants.java Tue Jun 20 05:04:06 2006
@@ -51,70 +51,6 @@
      */
     public static final String WSDL_MESSAGE_DIRECTION_OUT = "out";
 
-    // ////////////////////////////////////////////////////////////////
-    // /////////////Message Exchange Pattern Constants/////////////////
-    // ////////////////////////////////////////////////////////////////
-
-    /**
-     * Field MEP_URI_IN_ONLY
-     */
-    public static final String MEP_URI_IN_ONLY = "http://www.w3.org/2004/08/wsdl/in-only";
-
-    public static final int MEP_CONSTANT_IN_ONLY = 10;
-
-    /**
-     * Field MEP_URI_ROBUST_IN_ONLY
-     */
-    public static final String MEP_URI_ROBUST_IN_ONLY = "http://www.w3.org/2004/08/wsdl/robust-in-only";
-
-    public static final int MEP_CONSTANT_ROBUST_IN_ONLY = 11;
-
-    /**
-     * Field MEP_URI_IN_OUT
-     */
-    public static final String MEP_URI_IN_OUT = "http://www.w3.org/2004/08/wsdl/in-out";
-    public static final String MEP_URI_IN_OUT_03 = "http://www.w3.org/2004/03/wsdl/in-out";
-
-    public static final int MEP_CONSTANT_IN_OUT = 12;
-
-    /**
-     * Field MEP_URI_IN_OPTIONAL_OUT
-     */
-    public static final String MEP_URI_IN_OPTIONAL_OUT = "http://www.w3.org/2004/08/wsdl/in-opt-out";
-
-    public static final int MEP_CONSTANT_IN_OPTIONAL_OUT = 13;
-
-    /**
-     * Field MEP_URI_OUT_ONLY
-     */
-    public static final String MEP_URI_OUT_ONLY = "http://www.w3.org/2004/08/wsdl/out-only";
-
-    public static final int MEP_CONSTANT_OUT_ONLY = 14;
-
-    /**
-     * Field MEP_URI_ROBUST_OUT_ONLY
-     */
-    public static final String MEP_URI_ROBUST_OUT_ONLY = "http://www.w3.org/2004/08/wsdl/robust-out-only";
-
-    public static final int MEP_CONSTANT_ROBUST_OUT_ONLY = 15;
-
-    /**
-     * Field MEP_URI_OUT_IN
-     */
-    public static final String MEP_URI_OUT_IN = "http://www.w3.org/2004/08/wsdl/out-in";
-
-    public static final int MEP_CONSTANT_OUT_IN = 16;
-
-    /**
-     * Field MEP_URI_OUT_OPTIONL_IN
-     */
-    public static final String MEP_URI_OUT_OPTIONAL_IN = "http://www.w3.org/2004/08/wsdl/out-opt-in";
-
-    public static final int MEP_CONSTANT_OUT_OPTIONAL_IN = 17;
-
-
-    public static final int MEP_CONSTANT_INVALID = -1;
-
     //////////////////////////////////////////////////
     //////////////// Message Labels///////////////////
     //////////////////////////////////////////////////
@@ -148,40 +84,104 @@
     int WSDL_1_1 = 1;
     int WSDL_2_0 = 2;
 
-    /**
-     * The Type name for the SOAP Address defined in the Port/Endpoint
-     */
-    public static final QName SOAP_11_ADDRESS = new QName(
-            Constants.URI_WSDL11_SOAP, "address");
-    public static final QName SOAP_12_ADDRESS = new QName(
-            Constants.URI_WSDL12_SOAP, "address");
-
-
-    public static final QName SOAP_11_OPERATION = new QName(
-            Constants.URI_WSDL11_SOAP, "operation");
-    public static final QName SOAP_12_OPERATION = new QName(
-            Constants.URI_WSDL12_SOAP, "operation");
-
-    public static final QName SCHEMA = new QName(
-            Constants.URI_2001_SCHEMA_XSD, "schema");
-
-    public static final QName SOAP_11_BODY = new QName(
-            Constants.URI_WSDL11_SOAP, "body");
-    public static final QName SOAP_12_BODY = new QName(
-            Constants.URI_WSDL12_SOAP, "body");
-
-    public static final QName SOAP_11_HEADER = new QName(
-            Constants.URI_WSDL11_SOAP, "header");
-    public static final QName SOAP_12_HEADER = new QName(
-            Constants.URI_WSDL12_SOAP, "header");
-
-    public static final QName SOAP_11_BINDING = new QName(
-            Constants.URI_WSDL11_SOAP, "binding");
-    public static final QName SOAP_12_BINDING = new QName(
-            Constants.URI_WSDL12_SOAP, "binding");
-
-    public static final QName POLICY = new QName(
-            Constants.URI_POLICY, "Policy");
-    public static final QName POLICY_REFERENCE = new QName(
-            Constants.URI_POLICY, "PolicyReference");
+
+    public static interface WSDL11Constants{
+
+        /**
+         * The Type name for the SOAP Address defined in the Port/Endpoint
+         */
+        QName SOAP_11_ADDRESS = new QName(
+                Constants.URI_WSDL11_SOAP, "address");
+        QName SOAP_12_ADDRESS = new QName(
+               Constants.URI_WSDL12_SOAP, "address");
+        QName SOAP_11_OPERATION = new QName(
+               Constants.URI_WSDL11_SOAP, "operation");
+        QName SOAP_12_OPERATION = new QName(
+               Constants.URI_WSDL12_SOAP, "operation");
+        QName SCHEMA = new QName(
+               Constants.URI_2001_SCHEMA_XSD, "schema");
+        QName SOAP_11_BODY = new QName(
+               Constants.URI_WSDL11_SOAP, "body");
+        QName SOAP_12_BODY = new QName(
+               Constants.URI_WSDL12_SOAP, "body");
+        QName SOAP_11_HEADER = new QName(
+               Constants.URI_WSDL11_SOAP, "header");
+        QName SOAP_12_HEADER = new QName(
+               Constants.URI_WSDL12_SOAP, "header");
+        QName SOAP_11_BINDING = new QName(
+               Constants.URI_WSDL11_SOAP, "binding");
+        QName SOAP_12_BINDING = new QName(
+               Constants.URI_WSDL12_SOAP, "binding");
+        QName POLICY = new QName(
+               Constants.URI_POLICY, "Policy");
+        QName POLICY_REFERENCE = new QName(
+               Constants.URI_POLICY, "PolicyReference");
+    }
+
+   public static interface WSDL20_2004Constants {
+
+
+       /**
+        * 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
+        String MEP_URI_IN_ONLY = "http://www.w3.org/2006/01/wsdl/in-only";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#robust-in-only
+        String MEP_URI_ROBUST_IN_ONLY = "http://www.w3.org/2006/01/wsdl/robust-in-only";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#in-out
+        String MEP_URI_IN_OUT = "http://www.w3.org/2006/01/wsdl/in-out";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#in-opt-out
+        String MEP_URI_IN_OPTIONAL_OUT = "http://www.w3.org/2006/01/wsdl/in-opt-out";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#out-only
+        String MEP_URI_OUT_ONLY = "http://www.w3.org/2006/01/wsdl/out-only";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#robust-out-only
+        String MEP_URI_ROBUST_OUT_ONLY = "http://www.w3.org/2006/01/wsdl/robust-out-only";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#out-in
+        String MEP_URI_OUT_IN = "http://www.w3.org/2006/01/wsdl/out-in";
+        // http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#out-opt-in
+        String MEP_URI_OUT_OPTIONAL_IN = "http://www.w3.org/2006/01/wsdl/out-opt-in";
+        String DEFAULT_NAMESPACE_URI = "http://www.w3.org/2006/01/wsdl";
+    }
 }

Added: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLUtil.java?rev=415621&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLUtil.java (added)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/WSDLUtil.java Tue Jun 20 05:04:06 2006
@@ -0,0 +1,63 @@
+package org.apache.axis2.wsdl;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+/**
+ * Some utility methods for the WSDL users
+ */
+public class WSDLUtil {
+
+    /**
+     * returns whether the given mep uri is one of the
+     * input meps
+     * @param mep
+     * @return
+     */
+    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)||
+                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)||
+                WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep)||
+                WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep);
+    }
+
+    /**
+     * returns whether the given mep URI is one of the output meps
+     * @param MEP
+     * @return
+     */
+    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_ROBUST_IN_ONLY.equals(MEP) ||
+                WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP) ||
+                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) ||
+                WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+                WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP);
+    }
+}

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContextFactory.java Tue Jun 20 05:04:06 2006
@@ -37,11 +37,11 @@
      */
     public static OperationContext createOperationContext(int mepURI, AxisOperation axisOp)
             throws AxisFault {
-        if ((MEP_CONSTANT_IN_OUT == mepURI) || (MEP_CONSTANT_IN_ONLY == mepURI)
-                || (MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
-                || (MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (MEP_CONSTANT_OUT_ONLY == mepURI)
-                || (MEP_CONSTANT_OUT_IN == mepURI) || (MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
-                || (MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
+        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)) {
             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 ((MEP_CONSTANT_IN_OUT == mepURI) || (MEP_CONSTANT_IN_ONLY == mepURI)
-                || (MEP_CONSTANT_IN_OPTIONAL_OUT == mepURI)
-                || (MEP_CONSTANT_ROBUST_IN_ONLY == mepURI) || (MEP_CONSTANT_OUT_ONLY == mepURI)
-                || (MEP_CONSTANT_OUT_IN == mepURI) || (MEP_CONSTANT_OUT_OPTIONAL_IN == mepURI)
-                || (MEP_CONSTANT_ROBUST_OUT_ONLY == mepURI)) {
+        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)) {
             return new OperationContext(axisOp, serviceContext);
         } else {
             throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Jun 20 05:04:06 2006
@@ -300,7 +300,7 @@
     protected MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
         MessageReceiver messageReceiver;
         if (mepURL == null) {
-            mepURL = WSDLConstants.MEP_URI_IN_OUT;
+            mepURL = WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
         }
         if (service != null) {
             messageReceiver = service.getMessageReceiver(mepURL);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Tue Jun 20 05:04:06 2006
@@ -43,7 +43,6 @@
 import org.apache.ws.policy.util.PolicyFactory;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.InputStream;
@@ -99,7 +98,7 @@
     protected MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
         MessageReceiver messageReceiver;
         if (mepURL == null) {
-            mepURL = WSDLConstants.MEP_URI_IN_OUT;
+            mepURL = WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
         }
         if (service != null) {
             messageReceiver = service.getMessageReceiver(mepURL);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Tue Jun 20 05:04:06 2006
@@ -396,12 +396,12 @@
                 }
                 op_descrip.setName(new QName(opname));
                 String MEP = op_descrip.getMessageExchangePattern();
-                if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP) ||
-                        WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                        WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                        WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                        WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                        WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+                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)) {
                     AxisMessage inaxisMessage = op_descrip
                             .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                     if (inaxisMessage != null) {
@@ -409,12 +409,12 @@
                     }
                 }
 
-                if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP) ||
-                        WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
-                        WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
-                        WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
-                        WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
-                        WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+                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_ROBUST_IN_ONLY.equals(MEP) ||
+                        WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                     AxisMessage outAxisMessage = op_descrip
                             .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                     if (outAxisMessage != null) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Tue Jun 20 05:04:06 2006
@@ -22,7 +22,7 @@
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.namespace.Constants;
-import org.apache.axis2.wsdl.WSDL20Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.deployment.DeploymentConstants;
 import org.apache.axis2.deployment.DeploymentEngine;
 import org.apache.axis2.deployment.DeploymentErrorMsgs;
@@ -250,7 +250,7 @@
                         OMNamespace documentElementNS = new StAXOMBuilder(in).getDocumentElement().getNamespace();
                         if (documentElementNS != null) {
                             WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
-                            if (WSDL20Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getName()))
+                            if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getName()))
                             {
                                 // we have a WSDL 2.0 document here.
                                 wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(new FileInputStream(file1), null, null);
@@ -309,7 +309,7 @@
                         OMNamespace documentElementNS = new StAXOMBuilder(in).getDocumentElement().getNamespace();
                         if (documentElementNS != null) {
                             WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
-                            if (WSDL20Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getName()))
+                            if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getName()))
                             {
                                 // we have a WSDL 2.0 document here.
                                 wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(new ByteArrayInputStream(out.toByteArray()), null, null);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Tue Jun 20 05:04:06 2006
@@ -290,9 +290,9 @@
             return null;
         }
         if (jmethod.getReturnType().isVoidType()) {
-            operation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_ONLY);
+            operation = AxisOperationFactory.getAxisOperation(WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY);
         } else {
-            operation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_OUT);
+            operation = AxisOperationFactory.getAxisOperation(WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_OUT);
             AxisMessage outMessage = operation.getMessage(
                     WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
             outMessage.setElementQName(table.getQNamefortheType(jmethod.getSimpleName() +

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Tue Jun 20 05:04:06 2006
@@ -29,7 +29,6 @@
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.modules.Module;
 import org.apache.axis2.phaseresolver.PhaseResolver;
-import org.apache.axis2.wsdl.WSDL20Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -46,7 +45,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 = MEP_CONSTANT_INVALID;
+    private int mep = WSDL20_2004Constants.MEP_CONSTANT_INVALID;
 
     public static final String SOAP_ACTION = "soapaction";
 
@@ -75,7 +74,7 @@
     private String soapAction;
 
     public AxisOperation() {
-        mepURI = MEP_URI_IN_OUT;
+        mepURI = WSDL20_2004Constants.MEP_URI_IN_OUT;
         modulerefs = new ArrayList();
         moduleConfigmap = new HashMap();
         faultMessages = new ArrayList();
@@ -379,32 +378,32 @@
      * up value so that the subsequent method calls are extremely efficient.
      */
     public int getAxisSpecifMEPConstant() {
-        if (this.mep != MEP_CONSTANT_INVALID) {
+        if (this.mep != WSDL20_2004Constants.MEP_CONSTANT_INVALID) {
             return this.mep;
         }
 
-        int temp = MEP_CONSTANT_INVALID;
+        int temp = WSDL20_2004Constants.MEP_CONSTANT_INVALID;
 
         String messageExchangePattern = getMessageExchangePattern();
-        if (MEP_URI_IN_OUT.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_IN_OUT.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_IN_OUT;
-        } else if (MEP_URI_IN_ONLY.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_IN_ONLY.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_IN_ONLY;
-        } else if (MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_IN_OPTIONAL_OUT;
-        } else if (MEP_URI_OUT_IN.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_OUT_IN.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_OUT_IN;
-        } else if (MEP_URI_OUT_ONLY.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_OUT_ONLY.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_OUT_ONLY;
-        } else if (MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_OUT_OPTIONAL_IN;
-        } else if (MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_ROBUST_IN_ONLY;
-        } else if (MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern) || WSDL20Constants.MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern)) {
-            temp = MEP_CONSTANT_ROBUST_OUT_ONLY;
+        if (WSDL20_2004Constants.MEP_URI_IN_OUT.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_IN_OUT.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_IN_OUT;
+        } else if (WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY;
+        } else if (WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT;
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_OUT_IN.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_IN;
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY;
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN;
+        } else if (WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY;
+        } else if (WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern) || WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(messageExchangePattern)) {
+            temp = WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY;
         }
 
-        if (temp == MEP_CONSTANT_INVALID) {
+        if (temp == WSDL20_2004Constants.MEP_CONSTANT_INVALID) {
             throw new AxisError(Messages.getMessage("mepmappingerror"));
         }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java Tue Jun 20 05:04:06 2006
@@ -2,7 +2,6 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.wsdl.WSDL20Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
 
 /*
@@ -29,44 +28,44 @@
         AxisOperation abOpdesc;
 
         switch (mepURI) {
-            case MEP_CONSTANT_IN_ONLY : {
+            case WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY : {
                 abOpdesc = new InOnlyAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_IN_ONLY);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
                 break;
             }
-            case MEP_CONSTANT_OUT_ONLY : {
+            case WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY : {
                 abOpdesc = new OutOnlyAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_OUT_ONLY);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_ONLY);
                 break;
             }
-            case MEP_CONSTANT_IN_OUT : {
+            case WSDL20_2004Constants.MEP_CONSTANT_IN_OUT : {
                 abOpdesc = new InOutAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_IN_OUT);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_OUT);
                 break;
             }
-            case MEP_CONSTANT_IN_OPTIONAL_OUT : {
+            case WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT : {
                 abOpdesc = new InOutAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_IN_OPTIONAL_OUT);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT);
                 break;
             }
-            case MEP_CONSTANT_ROBUST_IN_ONLY : {
+            case WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY : {
                 abOpdesc = new InOutAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_ROBUST_IN_ONLY);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY);
                 break;
             }
-            case MEP_CONSTANT_OUT_IN : {
+            case WSDL20_2004Constants.MEP_CONSTANT_OUT_IN : {
                 abOpdesc = new OutInAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_OUT_IN);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_IN);
                 break;
             }
-            case MEP_CONSTANT_OUT_OPTIONAL_IN : {
+            case WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN : {
                 abOpdesc = new OutInAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_OUT_OPTIONAL_IN);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN);
                 break;
             }
-            case MEP_CONSTANT_ROBUST_OUT_ONLY : {
+            case WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY : {
                 abOpdesc = new RobustOutOnlyAxisOperation();
-                abOpdesc.setMessageExchangePattern(MEP_URI_ROBUST_OUT_ONLY);
+                abOpdesc.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY);
                 break;
             }
             default : {
@@ -79,21 +78,21 @@
     //FIXME add in the latest MEP uris
     public static AxisOperation getOperationDescription(String mepURI) throws AxisFault {
         AxisOperation abOpdesc;
-        if (MEP_URI_IN_ONLY.equals(mepURI) || WSDL20Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
+        if (WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
             abOpdesc = new InOnlyAxisOperation();
-        } else if (MEP_URI_OUT_ONLY.equals(mepURI) || WSDL20Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
             abOpdesc = new OutOnlyAxisOperation();
-        } else if (MEP_URI_IN_OUT.equals(mepURI) ||MEP_URI_IN_OUT_03.equals(mepURI) || WSDL20Constants.MEP_URI_IN_OUT.equals(mepURI)) {
+        } 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)) {
             abOpdesc = new InOutAxisOperation();
-        } else if (MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) || WSDL20Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
+        } else if (WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
             abOpdesc = new InOutAxisOperation();
-        } else if (MEP_URI_OUT_IN.equals(mepURI) || WSDL20Constants.MEP_URI_OUT_IN.equals(mepURI)) {
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI)) {
             abOpdesc = new OutInAxisOperation();
-        } else if (MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) || WSDL20Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
             abOpdesc = new OutInAxisOperation();
-        } else if (MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) || WSDL20Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
+        } else if (WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
             abOpdesc = new OutInAxisOperation();
-        } else if (MEP_URI_ROBUST_IN_ONLY.equals(mepURI) || WSDL20Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
+        } else if (WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
             abOpdesc = new InOutAxisOperation();
         }else {
             throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Tue Jun 20 05:04:06 2006
@@ -365,7 +365,7 @@
     private MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
         MessageReceiver messageReceiver;
         if (mepURL == null) {
-            mepURL = WSDLConstants.MEP_URI_IN_OUT;
+            mepURL = WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
         }
         if (service != null) {
             messageReceiver = service.getMessageReceiver(mepURL);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java Tue Jun 20 05:04:06 2006
@@ -196,12 +196,12 @@
                 continue;
             }
             String MEP = axisOperation.getMessageExchangePattern();
-            if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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)) {
                 AxisMessage inaxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                 if (inaxisMessage != null) {
@@ -210,12 +210,12 @@
                 }
             }
 
-            if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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_ROBUST_IN_ONLY.equals(MEP)
+                    || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                 AxisMessage outAxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                 if (outAxisMessage != null) {
@@ -309,12 +309,12 @@
                     .getPolicyInclude(), operation, fac);
 
             String MEP = axisOperation.getMessageExchangePattern();
-            if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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)) {
                 AxisMessage inaxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                 if (inaxisMessage != null) {
@@ -328,12 +328,12 @@
                 }
             }
 
-            if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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_ROBUST_IN_ONLY.equals(MEP)
+                    || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                 AxisMessage outAxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                 if (outAxisMessage != null) {
@@ -516,12 +516,12 @@
 
             String MEP = axisOperation.getMessageExchangePattern();
 
-            if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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)) {
                 AxisMessage inaxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                 if (inaxisMessage != null) {
@@ -537,12 +537,12 @@
                 }
             }
 
-            if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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_ROBUST_IN_ONLY.equals(MEP)
+                    || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                 AxisMessage outAxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                 if (outAxisMessage != null) {
@@ -643,12 +643,12 @@
 
             String MEP = axisOperation.getMessageExchangePattern();
 
-            if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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)) {
                 AxisMessage inaxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                 if (inaxisMessage != null) {
@@ -664,12 +664,12 @@
                 }
             }
 
-            if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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_ROBUST_IN_ONLY.equals(MEP)
+                    || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                 AxisMessage outAxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                 if (outAxisMessage != null) {
@@ -736,12 +736,12 @@
 
             String MEP = axisOperation.getMessageExchangePattern();
 
-            if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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)) {
                 AxisMessage inaxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                 if (inaxisMessage != null) {
@@ -756,12 +756,12 @@
                 }
             }
 
-            if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                    || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+            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_ROBUST_IN_ONLY.equals(MEP)
+                    || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                 AxisMessage outAxisMessage = axisOperation
                         .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                 if (outAxisMessage != null) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WSDL2.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WSDL2.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WSDL2.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WSDL2.java Tue Jun 20 05:04:06 2006
@@ -7,7 +7,6 @@
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axis2.namespace.Constants;
-import org.apache.axis2.wsdl.WSDL20Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.woden.wsdl20.enumeration.MessageLabel;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -157,12 +156,12 @@
                 operation.addAttribute(ATTRIBUTE_NAME_PATTERN, getUpdatedMEP(MEP), null);
                 //TODO need to add : style="http://www.w3.org/2006/01/wsdl/style/iri"
                 //TODO need to add : swsdlx:safe = "true"
-                if (WSDL20Constants.MEP_URI_IN_ONLY.equals(MEP)
-                        || WSDL20Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                        || WSDL20Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                        || WSDL20Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                        || WSDL20Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                        || WSDL20Constants.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 = axisOperation
                             .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                     if (inaxisMessage != null) {
@@ -174,12 +173,12 @@
                     }
                 }
 
-                if (WSDL20Constants.MEP_URI_OUT_ONLY.equals(MEP)
-                        || WSDL20Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
-                        || WSDL20Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
-                        || WSDL20Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-                        || WSDL20Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                        || WSDL20Constants.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_ROBUST_IN_ONLY.equals(MEP)
+                        || WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP)) {
                     AxisMessage outAxisMessage = axisOperation
                             .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                     if (outAxisMessage != null) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java Tue Jun 20 05:04:06 2006
@@ -35,13 +35,13 @@
     public InOnlyAxisOperation() {
         super();
         createMessage();
-        setMessageExchangePattern(WSDLConstants.MEP_URI_IN_ONLY);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
     }
 
     public InOnlyAxisOperation(QName name) {
         super(name);
         createMessage();
-        setMessageExchangePattern(WSDLConstants.MEP_URI_IN_ONLY);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
     }
 
     public void addMessage(AxisMessage message, String label) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Tue Jun 20 05:04:06 2006
@@ -44,12 +44,12 @@
 public class OutInAxisOperation extends InOutAxisOperation {
     public OutInAxisOperation() {
         super();
-        setMessageExchangePattern(WSDLConstants.MEP_URI_OUT_IN);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_IN);
     }
 
     public OutInAxisOperation(QName name) {
         super(name);
-        setMessageExchangePattern(WSDLConstants.MEP_URI_OUT_IN);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_IN);
     }
 
     public void addMessageContext(MessageContext msgContext,

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java Tue Jun 20 05:04:06 2006
@@ -50,13 +50,13 @@
     public OutOnlyAxisOperation() {
         super();
         createMessage();
-        setMessageExchangePattern(WSDLConstants.MEP_URI_OUT_ONLY);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_ONLY);
     }
 
     public OutOnlyAxisOperation(QName name) {
         super(name);
         createMessage();
-        setMessageExchangePattern(WSDLConstants.MEP_URI_OUT_ONLY);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_OUT_ONLY);
     }
 
     public void addMessage(AxisMessage message, String label) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Tue Jun 20 05:04:06 2006
@@ -16,18 +16,16 @@
 
 package org.apache.axis2.description;
 
-import org.apache.axis2.wsdl.WSDLConstants;
-
 import javax.xml.namespace.QName;
 
 public class RobustOutOnlyAxisOperation extends OutInAxisOperation {
     public RobustOutOnlyAxisOperation() {
         super();
-        setMessageExchangePattern(WSDLConstants.MEP_URI_ROBUST_OUT_ONLY);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY);
     }
 
     public RobustOutOnlyAxisOperation(QName name) {
         super(name);
-        setMessageExchangePattern(WSDLConstants.MEP_URI_ROBUST_OUT_ONLY);
+        setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY);
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Tue Jun 20 05:04:06 2006
@@ -298,15 +298,15 @@
                         .getBindingOutput();
                 String MEP = operation.getMessageExchangePattern();
                 if (bindingInput != null) {
-                    if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP)
-                            || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT
+                    if (WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(MEP)
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
                             .equals(MEP)
-                            || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
                             .equals(MEP)
-                            || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
                             .equals(MEP)
-                            || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                            || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                         AxisMessage inMessage = operation
                                 .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
                         copyExtensibleElements(bindingInput
@@ -316,15 +316,15 @@
                     }
                 }
                 if (bindingOutput != null) {
-                    if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP)
-                            || WSDLConstants.MEP_URI_OUT_OPTIONAL_IN
+                    if (WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP)
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN
                             .equals(MEP)
-                            || WSDLConstants.MEP_URI_IN_OPTIONAL_OUT
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT
                             .equals(MEP)
-                            || WSDLConstants.MEP_URI_ROBUST_OUT_ONLY
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY
                             .equals(MEP)
-                            || WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
-                            || WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
+                            || WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP)) {
                         AxisMessage outAxisMessage = operation
                                 .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
                         copyExtensibleElements(bindingOutput
@@ -977,7 +977,7 @@
 
                 //look for the SOAP 1.2 stuff here. WSDL4j does not understand
                 // SOAP 1.2 things
-                if (WSDLConstants.SOAP_12_OPERATION.equals(unknown
+                if (WSDLConstants.WSDL11Constants.SOAP_12_OPERATION.equals(unknown
                         .getElementType())) {
                     Element element = unknown.getElement();
                     if (description instanceof AxisOperation) {
@@ -989,19 +989,19 @@
                         axisOperation.setSoapAction(element
                                 .getAttribute("soapAction"));
                     }
-                } else if (WSDLConstants.SOAP_12_HEADER.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.SOAP_12_HEADER.equals(unknown
                         .getElementType())) {
                     //TODO : implement thid
-                } else if (WSDLConstants.SOAP_12_BINDING.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.SOAP_12_BINDING.equals(unknown
                         .getElementType())) {
                     style = unknown.getElement().getAttribute("style");
                     axisService.setSoapNsUri(wsdl4jElement.getElementType()
                             .getNamespaceURI());
-                } else if (WSDLConstants.SOAP_12_ADDRESS.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.SOAP_12_ADDRESS.equals(unknown
                         .getElementType())) {
                     axisService.setEndpoint(unknown.getElement().getAttribute(
                             "location"));
-                } else if (WSDLConstants.POLICY
+                } else if (WSDLConstants.WSDL11Constants.POLICY
                         .equals(unknown.getElementType())) {
 
                     DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory
@@ -1012,7 +1012,7 @@
                     addPolicy(description, originOfExtensibilityElements,
                             policy);
 
-                } else if (WSDLConstants.POLICY_REFERENCE.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.POLICY_REFERENCE.equals(unknown
                         .getElementType())) {
 
                     DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory
@@ -1275,31 +1275,31 @@
         if (isServerSide) {
             if (null != operationType) {
                 if (operationType.equals(OperationType.REQUEST_RESPONSE))
-                    return WSDLConstants.MEP_URI_IN_OUT;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
 
                 if (operationType.equals(OperationType.ONE_WAY))
-                    return WSDLConstants.MEP_URI_IN_ONLY;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY;
 
                 if (operationType.equals(OperationType.NOTIFICATION))
-                    return WSDLConstants.MEP_URI_OUT_ONLY;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY;
 
                 if (operationType.equals(OperationType.SOLICIT_RESPONSE))
-                    return WSDLConstants.MEP_URI_OUT_IN;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_IN;
                 throw new Exception("Cannot Determine the MEP");
             }
         } else {
             if (null != operationType) {
                 if (operationType.equals(OperationType.REQUEST_RESPONSE))
-                    return WSDLConstants.MEP_URI_OUT_IN;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_IN;
 
                 if (operationType.equals(OperationType.ONE_WAY))
-                    return WSDLConstants.MEP_URI_OUT_ONLY;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY;
 
                 if (operationType.equals(OperationType.NOTIFICATION))
-                    return WSDLConstants.MEP_URI_IN_ONLY;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY;
 
                 if (operationType.equals(OperationType.SOLICIT_RESPONSE))
-                    return WSDLConstants.MEP_URI_IN_OUT;
+                    return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
                 throw new Exception("Cannot Determine the MEP");
             }
         }
@@ -1351,7 +1351,7 @@
 
             if (extElement instanceof UnknownExtensibilityElement) {
                 UnknownExtensibilityElement unknown = (UnknownExtensibilityElement) extElement;
-                if (WSDLConstants.POLICY.equals(unknown.getElementType())) {
+                if (WSDLConstants.WSDL11Constants.POLICY.equals(unknown.getElementType())) {
 
                     DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory
                             .getPolicyReader(PolicyFactory.DOM_POLICY_READER);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=415621&r1=415620&r2=415621&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Tue Jun 20 05:04:06 2006
@@ -333,7 +333,7 @@
                 // look for the SOAP 1.2 stuff here. WSDL4j does not understand
                 // SOAP 1.2 things
                 // TODO this is wrong. Compare this with WSDL 2.0 QName
-                if (WSDLConstants.SOAP_12_OPERATION.equals(unknown
+                if (WSDLConstants.WSDL11Constants.SOAP_12_OPERATION.equals(unknown
                         .getExtensionType())) {
                     Element unknownElement = unknown.getElement();
                     if (description instanceof AxisOperation) {
@@ -345,19 +345,19 @@
                         axisOperation.setSoapAction(unknownElement
                                 .getAttribute("soapAction"));
                     }
-                } else if (WSDLConstants.SOAP_12_HEADER.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.SOAP_12_HEADER.equals(unknown
                         .getExtensionType())) {
                     // TODO : implement thid
-                } else if (WSDLConstants.SOAP_12_BINDING.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.SOAP_12_BINDING.equals(unknown
                         .getExtensionType())) {
                     style = unknown.getElement().getAttribute("style");
                     axisService.setSoapNsUri(element.getExtensionType()
                             .getNamespaceURI());
-                } else if (WSDLConstants.SOAP_12_ADDRESS.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.SOAP_12_ADDRESS.equals(unknown
                         .getExtensionType())) {
                     axisService.setEndpoint(unknown.getElement().getAttribute(
                             "location"));
-                } else if (WSDLConstants.POLICY.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.POLICY.equals(unknown
                         .getExtensionType())) {
 
                     DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory
@@ -368,7 +368,7 @@
                     // addPolicy(description, originOfExtensibilityElements,
                     // policy);
 
-                } else if (WSDLConstants.POLICY_REFERENCE.equals(unknown
+                } else if (WSDLConstants.WSDL11Constants.POLICY_REFERENCE.equals(unknown
                         .getExtensionType())) {
 
                     DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message