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 de...@apache.org on 2006/04/08 19:13:22 UTC

svn commit: r392558 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: deployment/WarBasedAxisConfigurator.java description/AxisService2OM.java transport/http/HTTPTransportUtils.java

Author: deepal
Date: Sat Apr  8 10:13:20 2006
New Revision: 392558

URL: http://svn.apache.org/viewcvs?rev=392558&view=rev
Log:
-last min modification

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=392558&r1=392557&r2=392558&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Sat Apr  8 10:13:20 2006
@@ -89,7 +89,7 @@
             log.info(e.getMessage());
         } finally {
             try {
-                Parameter unableHttp = new Parameter("enableREST", "true");
+                Parameter unableHttp = new Parameter("enableHTTP", "true");
                 axisConfig.addParameter(unableHttp);
             } catch (AxisFault axisFault) {
                 log.info(axisFault.getMessage());

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java?rev=392558&r1=392557&r2=392558&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 Sat Apr  8 10:13:20 2006
@@ -125,7 +125,7 @@
         //generateHttp
         if (axisService.getParent() != null) {
             AxisDescription axisdesc = axisService.getParent().getParent();
-            Parameter parameter = axisdesc.getParameter("enableREST");
+            Parameter parameter = axisdesc.getParameter("enableHTTP");
             if (parameter != null) {
                 Object value = parameter.getValue();
                 if ("true".equals(value.toString())) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=392558&r1=392557&r2=392558&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Sat Apr  8 10:13:20 2006
@@ -241,8 +241,7 @@
                         Parameter enable =
                                 msgContext.getParameter(Constants.Configuration.ENABLE_REST);
 
-                        if (((soapActionHeader == null) || (soapActionHeader.length() == 0))
-                                && (enable != null)) {
+                       if ((soapActionHeader == null) && (enable != null)) {
                             if (Constants.VALUE_TRUE.equals(enable.getValue())) {
 
                                 // If the content Type is text/xml (BTW which is the SOAP 1.1 Content type ) and