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 di...@apache.org on 2006/11/15 17:04:21 UTC

svn commit: r475282 - in /webservices/axis2/branches/java/new-trunk/modules/kernel: conf/axis2.xml src/org/apache/axis2/engine/RequestURIBasedDispatcher.java

Author: dims
Date: Wed Nov 15 08:04:20 2006
New Revision: 475282

URL: http://svn.apache.org/viewvc?view=rev&rev=475282
Log:
port changes in axis2.xml

Modified:
    webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml
    webservices/axis2/branches/java/new-trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java

Modified: webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml?view=diff&rev=475282&r1=475281&r2=475282
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/kernel/conf/axis2.xml Wed Nov 15 08:04:20 2006
@@ -237,6 +237,10 @@
                      class="org.apache.axis2.engine.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
                      class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
@@ -277,6 +281,10 @@
 
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 

Modified: webservices/axis2/branches/java/new-trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?view=diff&rev=475282&r1=475281&r2=475282
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis2/branches/java/new-trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Wed Nov 15 08:04:20 2006
@@ -27,8 +27,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.QName;
-
 /**
  * Dispatches the service based on the information from the target endpoint URL.
  */
@@ -43,25 +41,9 @@
      */
     public AxisOperation findOperation(AxisService service, MessageContext messageContext)
             throws AxisFault {
-
-        EndpointReference toEPR = messageContext.getTo();
-        if (toEPR != null) {
-            String filePart = toEPR.getAddress();
-            String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
-                    messageContext.getConfigurationContext().getServiceContextPath());
-
-            if ((values.length >= 2) && (values[1] != null)) {
-                QName operationName = new QName(values[1]);
-                log.debug("Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
-                return service.getOperation(operationName);
-            } else {
-                log.debug("Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
+        // This Dispatcher does not need to resolve the operation, as that is handled
+    	// by the RequestURIOperationDispatcher.
                 return null;
-            }
-        } else {
-            log.debug("Attempted to check for Operation using null target endpoint URI");
-            return null;
-        }
     }
 
     /*



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