axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r367874 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: engine/AxisConfiguration.java transport/http/ListingAgent.java
Date Wed, 11 Jan 2006 02:02:43 GMT
Author: chinthaka
Date: Tue Jan 10 18:02:37 2006
New Revision: 367874

URL: http://svn.apache.org/viewcvs?rev=367874&view=rev
Log:
Fixing the build break. 

PLEASE DO NOT BREAK THE BUILD, AT LEAST DURING THE RELEASE TIME. THANKS :(

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=367874&r1=367873&r2=367874&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Tue Jan 10 18:02:37 2006
@@ -23,7 +23,18 @@
 import org.apache.axis2.deployment.DeploymentEngine;
 import org.apache.axis2.deployment.repository.util.ArchiveReader;
 import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.ModuleConfiguration;
+import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.ParameterIncludeImpl;
+import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
@@ -34,7 +45,12 @@
 
 import javax.xml.namespace.QName;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Class AxisConfigurationImpl
@@ -291,7 +307,7 @@
 
     /**
      * Engages the default module version corresponding to given module name , or if the
module
-     * name contains version number in it then it will engage the correct module.
+     * name contains version number in it then it will engage the correct module. 
      * Both of the below two cases are valid
      * 1. engageModule("addressing");
      * 2. engageModule("addressing-1.23");
@@ -666,7 +682,7 @@
 
     /**
      * Adds a dafault module version , which can be done either programatically or by using
-     * axis2.xml . The default module version is important if user asks to engage
+     * axis2.xml . The default module version is important if user asks to engage 
      * a module without given version ID, in which case, we will engage the default version.
      *
      * @param moduleName

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=367874&r1=367873&r2=367874&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
Tue Jan 10 18:02:37 2006
@@ -176,9 +176,7 @@
                 req.getSession().setAttribute(Constants.ENGAGE_STATUS,
                         moduleName + " module engaged globally Successfully");
             } catch (AxisFault axisFault) {
-                if (axisFault.getMessage() != null) {
-                    req.getSession().setAttribute(Constants.ENGAGE_STATUS, axisFault.getMessage());
-                }
+                req.getSession().setAttribute(Constants.ENGAGE_STATUS, axisFault.getMessage());
             }
         }
 
@@ -197,7 +195,7 @@
         req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
         req.getSession().setAttribute("modules", null);
 
-        String serviceName = req.getParameter("axisService");
+        String serviceName = req.getParameter("service");
 
         if (serviceName != null) {
             req.getSession().setAttribute("service", serviceName);



Mime
View raw message