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 gd...@apache.org on 2007/03/20 19:07:48 UTC

svn commit: r520500 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/ addressing/test/org/apache/axis2/handlers/addressing/ kernel/src/org/apache/axis2/addressing/

Author: gdaniels
Date: Tue Mar 20 11:07:47 2007
New Revision: 520500

URL: http://svn.apache.org/viewvc?view=rev&rev=520500
Log:
* Introduce a context property "addressing.validateAction" to control whether the validation handler checks that the service/operation are completely resolved.  If this property is set to false, we won't, otherwise (true or missing) we will.

* Test for the above, and cleanup/simplify AddressingValidationHandlerTest

* General cleanup

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
    webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?view=diff&rev=520500&r1=520499&r2=520500
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Tue Mar 20 11:07:47 2007
@@ -56,7 +56,7 @@
         }
 
         // check whether someone has explicitly set which addressing handler should run.
-        String namespace = (String) msgContext.getProperty(WS_ADDRESSING_VERSION);
+        String namespace = (String)msgContext.getProperty(WS_ADDRESSING_VERSION);
         if (namespace == null) {
             namespace = addressingNamespace;
         } else if (!namespace.equals(addressingNamespace)) {
@@ -114,15 +114,17 @@
         ArrayList duplicateHeaderNames =
                 new ArrayList(1); // Normally will not be used for more than 1 header
 
-        // Per the SOAP Binding spec "headers with an incorrect cardinality MUST NOT be used" So these variables
-        // are used to keep track of invalid cardinality headers so they are not deserialised.
+        // Per the SOAP Binding spec "headers with an incorrect cardinality MUST NOT be used" So
+        // these variables are used to keep track of invalid cardinality headers so they are not
+        // deserialised.
         boolean ignoreTo = false, ignoreFrom = false, ignoreReplyTo = false, ignoreFaultTo =
                 false, ignoreMessageID = false, ignoreAction = false;
 
         // First pass just check for duplicates
         Iterator addressingHeadersIt = addressingHeaders.iterator();
         while (addressingHeadersIt.hasNext()) {
-            SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) addressingHeadersIt.next();
+            SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock)addressingHeadersIt.next();
+            // TODO - Don't do role processing here!
             if (!SOAP12Constants.SOAP_ROLE_NONE.equals(soapHeaderBlock.getRole())) {
                 if (WSA_ACTION.equals(soapHeaderBlock.getLocalName())) {
                     ignoreAction = checkDuplicateHeaders(WSA_ACTION, checkedHeaderNames,
@@ -149,7 +151,7 @@
         // Now extract information
         Iterator addressingHeadersIt2 = addressingHeaders.iterator();
         while (addressingHeadersIt2.hasNext()) {
-            SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) addressingHeadersIt2.next();
+            SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock)addressingHeadersIt2.next();
             if (!SOAP12Constants.SOAP_ROLE_NONE.equals(soapHeaderBlock.getRole())) {
                 if (WSA_ACTION.equals(soapHeaderBlock.getLocalName()) && !ignoreAction) {
                     extractActionInformation(soapHeaderBlock, namespace, messageContext);
@@ -176,7 +178,7 @@
         if (!duplicateHeaderNames.isEmpty()) {
             // Simply choose the first problem header we came across as we can only fault for one of them.
             AddressingFaultsHelper.triggerInvalidCardinalityFault(messageContext,
-                                                                  (String) duplicateHeaderNames
+                                                                  (String)duplicateHeaderNames
                                                                           .get(0));
         }
 
@@ -313,7 +315,7 @@
         if (addressAttributes != null && addressAttributes.hasNext()) {
             ArrayList attributes = new ArrayList();
             while (addressAttributes.hasNext()) {
-                OMAttribute attr = (OMAttribute) addressAttributes.next();
+                OMAttribute attr = (OMAttribute)addressAttributes.next();
                 attributes.add(attr);
             }
             epr.setAddressAttributes(attributes);
@@ -411,7 +413,7 @@
         if (actionAttributes != null && actionAttributes.hasNext()) {
             ArrayList attributes = new ArrayList();
             while (actionAttributes.hasNext()) {
-                OMAttribute attr = (OMAttribute) actionAttributes.next();
+                OMAttribute attr = (OMAttribute)actionAttributes.next();
                 attributes.add(attr);
             }
             return attributes;

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java?view=diff&rev=520500&r1=520499&r2=520500
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java Tue Mar 20 11:07:47 2007
@@ -44,10 +44,15 @@
 
         if (JavaUtils.isTrueExplicitly(flag)) {
             // If no AxisOperation has been found at the end of the dispatch phase and addressing
-            // is in use we should throw an ActionNotSupported Fault
-            checkAction(msgContext);
-            // Check if the wsa:MessageID is required or not.
-            checkMessageIDHeader(msgContext);
+            // is in use we should throw an ActionNotSupported Fault, unless we've been told
+            // not to do this check (by Synapse, for instance)
+            if (JavaUtils.isTrue(msgContext.getProperty(ADDR_VALIDATE_ACTION), true)) {
+                checkAction(msgContext);
+
+                // Check if the wsa:MessageID is required or not.
+                checkMessageIDHeader(msgContext);
+            }
+
             // Check that if anonymous flag is in effect that the replyto and faultto are valid
             //checkAnonymous(msgContext);
         }

Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java?view=diff&rev=520500&r1=520499&r2=520500
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java Tue Mar 20 11:07:47 2007
@@ -17,8 +17,6 @@
 package org.apache.axis2.handlers.addressing;
 
 import junit.framework.TestCase;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingConstants;
@@ -28,151 +26,112 @@
 import org.apache.axis2.description.InOnlyAxisOperation;
 import org.apache.axis2.description.InOutAxisOperation;
 import org.apache.axis2.handlers.util.TestUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
-import java.util.ArrayList;
+import javax.xml.namespace.QName;
 
-public class AddressingValidationHandlerTest extends TestCase {
-    private Log log = LogFactory.getLog(getClass());
+public class AddressingValidationHandlerTest extends TestCase implements AddressingConstants {
     AddressingInHandler inHandler = new AddressingFinalInHandler();
     AddressingValidationHandler validationHandler = new AddressingValidationHandler();
     String addressingNamespace = AddressingConstants.Final.WSA_NAMESPACE;
     String versionDirectory = "final";
     TestUtil testUtil = new TestUtil();
 
-    protected void basicExtractAddressingInformationFromHeaders(String testMessagePath,
-                                                                MessageContext mc)
-            throws Exception {
-        StAXSOAPModelBuilder omBuilder = testUtil.getOMBuilder(testMessagePath);
-        SOAPHeader header = ((SOAPEnvelope) omBuilder.getDocumentElement()).getHeader();
-        ArrayList addressingHeaderBlocks = header.getHeaderBlocksWithNSURI(addressingNamespace);
-        inHandler.extractAddressingInformation(header, mc, addressingHeaderBlocks,
-                                               addressingNamespace);
+    protected MessageContext testMessageWithOmittedHeaders(String testName) throws Exception {
+        return testAddressingMessage("omitted-header-messages", testName + "Message.xml");
     }
 
-    protected MessageContext testMessageWithOmittedHeaders(String testName) throws Exception {
-        String testfile =
-                "omitted-header-messages/" + versionDirectory + "/" + testName + "Message.xml";
+    protected MessageContext testAddressingMessage(String directory, String testName)
+            throws Exception {
+        String testfile = directory + "/" + versionDirectory + "/" + testName;
 
         MessageContext mc = new MessageContext();
-        basicExtractAddressingInformationFromHeaders(testfile, mc);
+
+        StAXSOAPModelBuilder omBuilder = testUtil.getOMBuilder(testfile);
+        mc.setEnvelope(omBuilder.getSOAPEnvelope());
+
+        inHandler.invoke(mc);
 
         return mc;
     }
 
-    public void testMessageWithOmittedMessageIDInOutMEP() {
-        try {
-            MessageContext messageContext = testMessageWithOmittedHeaders("noMessageID");
-            String messageID = messageContext.getOptions().getMessageId();
-
-            assertNull("The message id is not null.", messageID);
+    public void testMessageWithOmittedMessageIDInOutMEP() throws Exception {
+        MessageContext messageContext = testMessageWithOmittedHeaders("noMessageID");
+        String messageID = messageContext.getOptions().getMessageId();
+
+        assertNull("The message id is not null.", messageID);
+
+        AxisOperation axisOperation = new InOutAxisOperation();
+        messageContext.setAxisOperation(axisOperation);
+        AxisService axisService = new AxisService();
+        messageContext.setAxisService(axisService);
 
-            messageContext.setProperty(AddressingConstants.IS_ADDR_INFO_ALREADY_PROCESSED,
-                                       Boolean.TRUE);
-            messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
-                                       AddressingConstants.Final.WSA_NAMESPACE);
-            AxisOperation axisOperation = new InOutAxisOperation();
-            messageContext.setAxisOperation(axisOperation);
-            AxisService axisService = new AxisService();
-            messageContext.setAxisService(axisService);
+        try {
             validationHandler.invoke(messageContext);
             fail("An AxisFault should have been thrown due to the absence of a message id.");
         }
         catch (AxisFault af) {
             //Test passed.
         }
-        catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-            fail(" An Exception has occured " + e.getMessage());
-        }
     }
 
-    public void testMessageWithOmittedMessageIDInOnlyMEP() {
-        try {
-            MessageContext messageContext = testMessageWithOmittedHeaders("noMessageID");
-            String messageID = messageContext.getOptions().getMessageId();
+    public void testValidateActionFlag() throws Exception {
+        MessageContext mc = testAddressingMessage("valid-messages", "soapmessage.xml");
 
-            assertNull("The message id is not null.", messageID);
+        // Tell validation handler NOT to check action dispatch
+        mc.setProperty(AddressingConstants.ADDR_VALIDATE_ACTION, Boolean.FALSE);
 
-            messageContext.setProperty(AddressingConstants.IS_ADDR_INFO_ALREADY_PROCESSED,
-                                       Boolean.TRUE);
-            messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
-                                       AddressingConstants.Final.WSA_NAMESPACE);
-            AxisOperation axisOperation = new InOnlyAxisOperation();
-            messageContext.setAxisOperation(axisOperation);
-            AxisService axisService = new AxisService();
-            messageContext.setAxisService(axisService);
-            validationHandler.invoke(messageContext);
-        }
-        catch (AxisFault af) {
-            af.printStackTrace();
-            log.error(af.getMessage());
-            fail("An unexpected AxisFault was thrown due to a missing MessageID header.");
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-            fail(" An Exception has occured " + e.getMessage());
-        }
+        // Even though this message has an action that will not dispatch to an
+        // AxisOperation, this shouldn't throw a fault.
+        validationHandler.invoke(mc);
     }
 
-    public void testMessageWithMessageIDInOutMEP() {
-        try {
-            MessageContext messageContext = testMessageWithOmittedHeaders("noFrom");
-            String messageID = messageContext.getOptions().getMessageId();
-
-            assertNotNull("The message id is null.", messageID);
-
-            messageContext.setProperty(AddressingConstants.IS_ADDR_INFO_ALREADY_PROCESSED,
-                                       Boolean.TRUE);
-            messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
-                                       AddressingConstants.Final.WSA_NAMESPACE);
-            AxisOperation axisOperation = new InOutAxisOperation();
-            messageContext.setAxisOperation(axisOperation);
-            AxisService axisService = new AxisService();
-            messageContext.setAxisService(axisService);
-            validationHandler.invoke(messageContext);
-        }
-        catch (AxisFault af) {
-            af.printStackTrace();
-            log.error(af.getMessage());
-            fail("An unexpected AxisFault was thrown.");
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-            fail(" An Exception has occured " + e.getMessage());
-        }
+    public void testMessageWithOmittedMessageIDInOnlyMEP() throws Exception {
+        MessageContext messageContext = testMessageWithOmittedHeaders("noMessageID");
+        String messageID = messageContext.getOptions().getMessageId();
+
+        assertNull("The message id is not null.", messageID);
+
+        AxisOperation axisOperation = new InOnlyAxisOperation();
+        messageContext.setAxisOperation(axisOperation);
+        AxisService axisService = new AxisService();
+        messageContext.setAxisService(axisService);
+        validationHandler.invoke(messageContext);
     }
 
-    public void testMessageWithOmittedMessageID200408() {
-        try {
-            MessageContext messageContext = testMessageWithOmittedHeaders("noMessageID");
-            String messageID = messageContext.getOptions().getMessageId();
+    public void testMessageWithMessageIDInOutMEP() throws Exception {
+        MessageContext messageContext = testMessageWithOmittedHeaders("noFrom");
+        String messageID = messageContext.getOptions().getMessageId();
+
+        assertNotNull("The message id is null.", messageID);
+
+        AxisOperation axisOperation = new InOutAxisOperation();
+        messageContext.setAxisOperation(axisOperation);
+        AxisService axisService = new AxisService();
+        messageContext.setAxisService(axisService);
+        validationHandler.invoke(messageContext);
+    }
 
-            assertNull("The message id is not null.", messageID);
+    public void testInOutMessageWithOmittedMessageID() throws Exception {
+        MessageContext messageContext = testMessageWithOmittedHeaders("noMessageID");
+        String messageID = messageContext.getOptions().getMessageId();
+
+        assertNull("The message id is not null.", messageID);
+
+        AxisOperation axisOperation = new InOutAxisOperation();
+        messageContext.setAxisOperation(axisOperation);
+        AxisService axisService = new AxisService();
+        messageContext.setAxisService(axisService);
 
-            messageContext.setProperty(AddressingConstants.IS_ADDR_INFO_ALREADY_PROCESSED,
-                                       Boolean.TRUE);
-            messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
-                                       AddressingConstants.Submission.WSA_NAMESPACE);
-            AxisOperation axisOperation = new InOutAxisOperation();
-            messageContext.setAxisOperation(axisOperation);
-            AxisService axisService = new AxisService();
-            messageContext.setAxisService(axisService);
+        try {
             validationHandler.invoke(messageContext);
+        } catch (AxisFault axisFault) {
+            // Confirm this is the correct fault
+            assertEquals("Wrong fault code",
+                         new QName(Final.WSA_NAMESPACE, 
+                                   Final.FAULT_ADDRESSING_HEADER_REQUIRED),
+                         axisFault.getFaultCode());
+            return;
         }
-        catch (AxisFault af) {
-            af.printStackTrace();
-            log.error(af.getMessage());
-            fail("An unexpected AxisFault was thrown due to a missing MessageID header.");
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-            fail(" An Exception has occured " + e.getMessage());
-        }
+        fail("Validated message with missing message ID!");
     }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java?view=diff&rev=520500&r1=520499&r2=520500
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java Tue Mar 20 11:07:47 2007
@@ -25,70 +25,71 @@
 public interface AddressingConstants {
 
     // ====================== Common Message Addressing Properties ===================
-    public static final String WSA_MESSAGE_ID = "MessageID";
-    public static final String WSA_RELATES_TO = "RelatesTo";
-    public static final String WSA_RELATES_TO_RELATIONSHIP_TYPE = "RelationshipType";
-    public static final String WSA_TO = "To";
-    public static final String WSA_REPLY_TO = "ReplyTo";
-    public static final String WSA_FROM = "From";
-    public static final String WSA_FAULT_TO = "FaultTo";
-    public static final String WSA_ACTION = "Action";
-    public static final String EPR_SERVICE_NAME = "ServiceName";
-    public static final String EPR_REFERENCE_PARAMETERS = "ReferenceParameters";
+    static final String WSA_MESSAGE_ID = "MessageID";
+    static final String WSA_RELATES_TO = "RelatesTo";
+    static final String WSA_RELATES_TO_RELATIONSHIP_TYPE = "RelationshipType";
+    static final String WSA_TO = "To";
+    static final String WSA_REPLY_TO = "ReplyTo";
+    static final String WSA_FROM = "From";
+    static final String WSA_FAULT_TO = "FaultTo";
+    static final String WSA_ACTION = "Action";
+    static final String EPR_SERVICE_NAME = "ServiceName";
+    static final String EPR_REFERENCE_PARAMETERS = "ReferenceParameters";
 
     // ====================== Common EPR Elements ============================
-    public static final String EPR_ADDRESS = "Address";
-    public static final String WS_ADDRESSING_VERSION = "WSAddressingVersion";
-    public static final String WSA_DEFAULT_PREFIX = "wsa";
-    public static final String PARAM_SERVICE_GROUP_CONTEXT_ID =
+    static final String EPR_ADDRESS = "Address";
+    static final String WS_ADDRESSING_VERSION = "WSAddressingVersion";
+    static final String WSA_DEFAULT_PREFIX = "wsa";
+    static final String PARAM_SERVICE_GROUP_CONTEXT_ID =
             "ServiceGroupContextIdFromAddressing";
-    public static final String IS_ADDR_INFO_ALREADY_PROCESSED = "IsAddressingProcessed";
+    static final String IS_ADDR_INFO_ALREADY_PROCESSED = "IsAddressingProcessed";
+    static final String ADDR_VALIDATE_ACTION = "addressing.validateAction";
 
     // ====================== WSDL Binding Constants ========================
-    public static final String USING_ADDRESSING = "UsingAddressing";
-    public static final String ANONYMOUS = "Anonymous";
+    static final String USING_ADDRESSING = "UsingAddressing";
+    static final String ANONYMOUS = "Anonymous";
 
     // ====================== Addressing Requirement Levels ==================
     // These are used to represent the requirement level on WS-Addressing indicated
     // in a services.xml or a WSDL file.
     // ADDRESSING_UNSPECIFIED is the equivalent of no UsingAddressing flag in a
     // WSDL file and the default of the WSAddressingRequred attribute in service.xml
-    public static final String ADDRESSING_UNSPECIFIED = "unspecified";
+    static final String ADDRESSING_UNSPECIFIED = "unspecified";
     // ADDRESSING_OPTIONAL is the equivalent of <wsaw:UsingAddressing required="false" />
     // in a WSDL file
-    public static final String ADDRESSING_OPTIONAL = "optional";
+    static final String ADDRESSING_OPTIONAL = "optional";
     // ADDRESSING_REQUIRED is the equivalent of <wsaw:UsingAddressing required="true" />
     // in a WSDL file
-    public static final String ADDRESSING_REQUIRED = "required";
+    static final String ADDRESSING_REQUIRED = "required";
 
     // If this property is set, addressing headers will be replaced from the information in the
     // message context.  
-    public static final String REPLACE_ADDRESSING_HEADERS = "ReplaceAddressingHeaders";
+    static final String REPLACE_ADDRESSING_HEADERS = "ReplaceAddressingHeaders";
 
     // this property once set to Boolean.TRUE will make the messages to skip Addressing Handler.
     // So you will not see Addressing Headers in the OUT path.
-    public static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES =
+    static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES =
             "disableAddressingForOutMessages";
 
-    public static final String ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS =
+    static final String ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS =
             "addMustUnderstandToAddressingHeaders";
 
     /**
      * A property pointing to an ArrayList of OMAttribute objects representing any attributes
      * of the wsa:Action header.
      */
-    public static final String ACTION_ATTRIBUTES = "actionAttributes";
+    static final String ACTION_ATTRIBUTES = "actionAttributes";
     /**
      * A property pointing to an ArrayList of OMAttribute objects representing any attributes
      * of the wsa:MessageID header.
      */
-    public static final String MESSAGEID_ATTRIBUTES = "messageidAttributes";
+    static final String MESSAGEID_ATTRIBUTES = "messageidAttributes";
 
     /**
      * When set to Boolean.TRUE this will cause the addressing out handler to output all
      * populated addressing headers in a message, including any optional ones.
      */
-    public static final String INCLUDE_OPTIONAL_HEADERS = "includeOptionalHeaders";
+    static final String INCLUDE_OPTIONAL_HEADERS = "includeOptionalHeaders";
 
     /**
      * This property, if set to Boolean.TRUE, will mean that the addressing handler allows partially
@@ -97,105 +98,105 @@
      * It is not clear how necessary this property is and it may be removed before the next release if
      * it is not seen to be necessary - davidillsley@apache.org
      */
-    public static final String DISABLE_OUTBOUND_ADDRESSING_VALIDATION =
+    static final String DISABLE_OUTBOUND_ADDRESSING_VALIDATION =
             "disableAddressingOutboundValidation";
 
-    public static final String WSAW_ANONYMOUS_PARAMETER_NAME = "wsawAnonymous";
+    static final String WSAW_ANONYMOUS_PARAMETER_NAME = "wsawAnonymous";
 
     // ======================== Common Faults ==============================
-    public static final String FAULT_ACTION_NOT_SUPPORTED = "ActionNotSupported";
-    public static final String FAULT_ACTION_NOT_SUPPORTED_REASON =
+    static final String FAULT_ACTION_NOT_SUPPORTED = "ActionNotSupported";
+    static final String FAULT_ACTION_NOT_SUPPORTED_REASON =
             "The [action] cannot be processed at the receiver.";
-    public static final String FAULT_ADDRESSING_DESTINATION_UNREACHABLE =
+    static final String FAULT_ADDRESSING_DESTINATION_UNREACHABLE =
             "DestinationUnreachable";
     
-    public interface Final {
+    interface Final {
 
         // ====================== Addressing 1.0 Final Version Constants ====================
-        public static final String WSA_NAMESPACE =
+        static final String WSA_NAMESPACE =
                 "http://www.w3.org/2005/08/addressing";
-        public static final String WSAW_NAMESPACE =
+        static final String WSAW_NAMESPACE =
                 "http://www.w3.org/2006/05/addressing/wsdl";
         /**
          * @deprecated use {@link #WSA_DEFAULT_RELATIONSHIP_TYPE} instead.
          */
-        public static final String WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE =
+        static final String WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE =
                 "http://www.w3.org/2005/08/addressing/reply";
-        public static final String WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE = "IsReferenceParameter";
-        public static final String WSA_ANONYMOUS_URL =
+        static final String WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE = "IsReferenceParameter";
+        static final String WSA_ANONYMOUS_URL =
                 "http://www.w3.org/2005/08/addressing/anonymous";
-        public static final String WSA_NONE_URI =
+        static final String WSA_NONE_URI =
                 "http://www.w3.org/2005/08/addressing/none";
-        public static final String WSA_FAULT_ACTION =
+        static final String WSA_FAULT_ACTION =
                 "http://www.w3.org/2005/08/addressing/fault";
-        public static final String WSA_SOAP_FAULT_ACTION =
+        static final String WSA_SOAP_FAULT_ACTION =
                 "http://www.w3.org/2005/08/addressing/soap/fault";
-        public static final String WSA_TYPE_ATTRIBUTE_VALUE = "true";
-        public static final String WSA_SERVICE_NAME_ENDPOINT_NAME = "EndpointName";
-        public static final String WSA_POLICIES = "Policies";
-        public static final String WSA_METADATA = "Metadata";
+        static final String WSA_TYPE_ATTRIBUTE_VALUE = "true";
+        static final String WSA_SERVICE_NAME_ENDPOINT_NAME = "EndpointName";
+        static final String WSA_POLICIES = "Policies";
+        static final String WSA_METADATA = "Metadata";
 
-        public static final String WSA_INTERFACE_NAME = "InterfaceName";
+        static final String WSA_INTERFACE_NAME = "InterfaceName";
 
-        public static final String WSA_DEFAULT_RELATIONSHIP_TYPE =
+        static final String WSA_DEFAULT_RELATIONSHIP_TYPE =
                 "http://www.w3.org/2005/08/addressing/reply";
 
         // fault information
-        public static final String FAULT_HEADER_PROB_HEADER_QNAME = "ProblemHeaderQName";
-        public static final String FAULT_HEADER_PROB_HEADER = "ProblemHeader";
-        public static final String FAULT_HEADER_PROB_IRI = "ProblemIRI";
-        public static final String FAULT_HEADER_DETAIL = "FaultDetail";
-        public static final String FAULT_INVALID_HEADER = "InvalidAddressingHeader";
-        public static final String FAULT_INVALID_HEADER_REASON =
+        static final String FAULT_HEADER_PROB_HEADER_QNAME = "ProblemHeaderQName";
+        static final String FAULT_HEADER_PROB_HEADER = "ProblemHeader";
+        static final String FAULT_HEADER_PROB_IRI = "ProblemIRI";
+        static final String FAULT_HEADER_DETAIL = "FaultDetail";
+        static final String FAULT_INVALID_HEADER = "InvalidAddressingHeader";
+        static final String FAULT_INVALID_HEADER_REASON =
                 "A header representing a Message Addressing Property is not valid and the message cannot be processed";
-        public static final String FAULT_ADDRESSING_HEADER_REQUIRED =
+        static final String FAULT_ADDRESSING_HEADER_REQUIRED =
                 "MessageAddressingHeaderRequired";
-        public static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON =
+        static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON =
                 "A required header representing a Message Addressing Property is not present";
-        public static final String FAULT_ADDRESSING_DESTINATION_UNREACHABLE_REASON =
+        static final String FAULT_ADDRESSING_DESTINATION_UNREACHABLE_REASON =
                 "No route can be determined to reach [destination]";
-        public static final String FAULT_INVALID_CARDINALITY = "InvalidCardinality";
-        public static final String FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED =
+        static final String FAULT_INVALID_CARDINALITY = "InvalidCardinality";
+        static final String FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED =
                 "OnlyAnonymousAddressSupported";
-        public static final String FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED =
+        static final String FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED =
                 "OnlyNonAnonymousAddressSupported";
-        public static final String FAULT_PROBLEM_ACTION_NAME = "ProblemAction";
+        static final String FAULT_PROBLEM_ACTION_NAME = "ProblemAction";
 
-        public static final QName WSAW_USING_ADDRESSING =
+        static final QName WSAW_USING_ADDRESSING =
                 new QName(WSAW_NAMESPACE, USING_ADDRESSING);
-        public static final QName WSAW_ANONYMOUS = new QName(WSAW_NAMESPACE, USING_ADDRESSING);
+        static final QName WSAW_ANONYMOUS = new QName(WSAW_NAMESPACE, USING_ADDRESSING);
     }
 
 
-    public interface Submission {
+    interface Submission {
 
         // ====================== Addressing Submission Version Constants ===================
-        public static final String WSA_NAMESPACE =
+        static final String WSA_NAMESPACE =
                 "http://schemas.xmlsoap.org/ws/2004/08/addressing";
         /**
          * @deprecated use {@link #WSA_DEFAULT_RELATIONSHIP_TYPE} instead.
          */
-        public static final String WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE = "wsa:Reply";
-        public static final String WSA_DEFAULT_RELATIONSHIP_TYPE = "wsa:Reply";
-        public static final String WSA_ANONYMOUS_URL =
+        static final String WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE = "wsa:Reply";
+        static final String WSA_DEFAULT_RELATIONSHIP_TYPE = "wsa:Reply";
+        static final String WSA_ANONYMOUS_URL =
                 "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous";
 
-        public static final String EPR_REFERENCE_PROPERTIES = "ReferenceProperties";
-        public static final String WSA_FAULT_ACTION =
+        static final String EPR_REFERENCE_PROPERTIES = "ReferenceProperties";
+        static final String WSA_FAULT_ACTION =
                 "http://schemas.xmlsoap.org/ws/2004/08/addressing/fault";
 
         // fault information
-        public static final String FAULT_INVALID_HEADER = "InvalidMessageInformationHeader";
-        public static final String FAULT_INVALID_HEADER_REASON =
+        static final String FAULT_INVALID_HEADER = "InvalidMessageInformationHeader";
+        static final String FAULT_INVALID_HEADER_REASON =
                 "A message information header is not valid and the message cannot be processed. The validity failure can be either structural or semantic, e.g. a [destination] that is not a URI or a [relationship] to a [message id] that was never issued.";
-        public static final String FAULT_ADDRESSING_HEADER_REQUIRED =
+        static final String FAULT_ADDRESSING_HEADER_REQUIRED =
                 "MessageInformationHeaderRequired";
-        public static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON =
+        static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON =
                 "A required message information header, To, MessageID, or Action, is not present.";
-        public static final String FAULT_ADDRESSING_DESTINATION_UNREACHABLE_REASON =
+        static final String FAULT_ADDRESSING_DESTINATION_UNREACHABLE_REASON =
                 "No route can be determined to reach the destination role defined by the WS-Addressing To.";
 
-        public static final QName WSAW_USING_ADDRESSING =
+        static final QName WSAW_USING_ADDRESSING =
                 new QName(WSA_NAMESPACE, USING_ADDRESSING);
     }
 }



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