axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r464811 - in /webservices/axis2/branches/java/1_1/modules: integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/jms/ integration/test/org/apache/axis2/mail/ jibx/test-resources/repo/conf/ kernel/src/org/apache/axis2/d...
Date Tue, 17 Oct 2006 05:09:12 GMT
Author: chinthaka
Date: Mon Oct 16 22:09:11 2006
New Revision: 464811

URL: http://svn.apache.org/viewvc?view=rev&rev=464811
Log:
- removing all the traces about enableREST params from axis2.xml (Oh god, how many axis2.xml
files we have within all the modules :( ).
enableRESTparam within axis2.xml is not required any more as we support REST by default now.
But enableREST property will be used by the client within the code to twist between REST and
SOAP calls.

Modified:
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
    webservices/axis2/branches/java/1_1/modules/jibx/test-resources/repo/conf/axis2.xml
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
    webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
    webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
    webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
    webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
    webservices/axis2/branches/java/1_1/modules/samples/resources/security/client.axis2.xml
    webservices/axis2/branches/java/1_1/modules/samples/resources/security/service.axis2.xml

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
Mon Oct 16 22:09:11 2006
@@ -5,9 +5,6 @@
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
     <parameter name="enableMTOM" locked="false">false</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
Mon Oct 16 22:09:11 2006
@@ -7,10 +7,6 @@
     <parameter name="enableMTOM" locked="false">false</parameter>
     <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
 
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
-
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
Mon Oct 16 22:09:11 2006
@@ -7,10 +7,6 @@
     <parameter name="enableMTOM" locked="false">false</parameter>
     <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
 
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
-
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
Mon Oct 16 22:09:11 2006
@@ -7,10 +7,6 @@
     <parameter name="enableMTOM" locked="false">false</parameter>
     <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
 
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
-
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
Mon Oct 16 22:09:11 2006
@@ -7,10 +7,6 @@
     <parameter name="enableMTOM" locked="false">false</parameter>
     <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
 
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
-
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
 

Modified: webservices/axis2/branches/java/1_1/modules/jibx/test-resources/repo/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/jibx/test-resources/repo/conf/axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/jibx/test-resources/repo/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/jibx/test-resources/repo/conf/axis2.xml Mon
Oct 16 22:09:11 2006
@@ -7,10 +7,6 @@
     <parameter name="enableMTOM" locked="false">false</parameter>
     <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
 
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
-
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
 

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Mon Oct 16 22:09:11 2006
@@ -1,23 +1,19 @@
 package org.apache.axis2.deployment;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.deployment.repository.util.ArchiveReader;
-import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.deployment.repository.util.ArchiveReader;
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisConfigurator;
+import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.servlet.ServletConfig;
 import javax.xml.stream.XMLStreamException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileNotFoundException;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
@@ -86,11 +82,11 @@
      * <li> When none of the above could be found, the axis2.xml is loaded from the
classpath resource, the value of DeploymenConstants.AXIS2_CONFIGURATION_RESOURCE.
      * </ul>
      *
-     * @param svconfig the ServletConfig object from the AxisServlet. This method is called
from the init() of the AxisServlet.
+     * @param servletConfig the ServletConfig object from the AxisServlet. This method is
called from the init() of the AxisServlet.
      */
-    public WarBasedAxisConfigurator(ServletConfig svconfig) {
+    public WarBasedAxisConfigurator(ServletConfig servletConfig) {
         try {
-            this.config = svconfig;
+            this.config = servletConfig;
             InputStream axis2Stream = null;
 
             try {

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
Mon Oct 16 22:09:11 2006
@@ -702,7 +702,7 @@
             if (wsld4jdefinition != null) {
                 try {
                     String error = "<error>" +
-                            "<description>Unable to show WSDL for this service</description>"
+
+                            "<description>Unable to showtwo will WSDL for this service</description>"
+
                             "<reason>WSDL 2.0 document is to be shown. But we do not
support WSDL 2.0" +
                             "serialization yet.</reason>" +
                             "</error>";

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Mon Oct 16 22:09:11 2006
@@ -23,10 +23,10 @@
 import org.apache.axiom.om.impl.builder.StAXBuilder;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.soap.*;
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
 import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
-import org.apache.axiom.soap.*;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
@@ -345,9 +345,9 @@
             return true;
         }
 
-        if (msgContext.getProperty(Constants.Configuration.ENABLE_REST) != null) {
-            enableREST = JavaUtils.isTrueExplicitly(
-                    msgContext.getProperty(Constants.Configuration.ENABLE_REST));
+        Object enableRESTProperty = msgContext.getProperty(Constants.Configuration.ENABLE_REST);
+        if (enableRESTProperty != null) {
+            enableREST = JavaUtils.isTrueExplicitly(enableRESTProperty);
         }
 
         msgContext.setDoingREST(enableREST);

Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
Mon Oct 16 22:09:11 2006
@@ -5,9 +5,6 @@
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
     <parameter name="enableMTOM" locked="false">true</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>

Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
Mon Oct 16 22:09:11 2006
@@ -4,9 +4,6 @@
     <!-- ================================================= -->
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>

Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
Mon Oct 16 22:09:11 2006
@@ -5,9 +5,6 @@
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
     <parameter name="enableMTOM" locked="false">true</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>

Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
Mon Oct 16 22:09:11 2006
@@ -5,9 +5,6 @@
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
     <parameter name="enableMTOM" locked="false">true</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>

Modified: webservices/axis2/branches/java/1_1/modules/samples/resources/security/client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/resources/security/client.axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/resources/security/client.axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/samples/resources/security/client.axis2.xml
Mon Oct 16 22:09:11 2006
@@ -39,9 +39,6 @@
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
     <parameter name="enableMTOM" locked="false">true</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>

Modified: webservices/axis2/branches/java/1_1/modules/samples/resources/security/service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/resources/security/service.axis2.xml?view=diff&rev=464811&r1=464810&r2=464811
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/resources/security/service.axis2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/samples/resources/security/service.axis2.xml
Mon Oct 16 22:09:11 2006
@@ -13,9 +13,6 @@
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
     <parameter name="enableMTOM" locked="false">true</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>



---------------------------------------------------------------------
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