axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r367666 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: engine/AxisConfiguration.java transport/http/ListingAgent.java
Date Tue, 10 Jan 2006 16:05:26 GMT
Author: deepal
Date: Tue Jan 10 08:05:14 2006
New Revision: 367666

URL: http://svn.apache.org/viewcvs?rev=367666&view=rev
Log:
- fixing jsp problems

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=367666&r1=367665&r2=367666&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 08:05:14 2006
@@ -23,18 +23,7 @@
 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.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.description.*;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
@@ -45,12 +34,7 @@
 
 import javax.xml.namespace.QName;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * Class AxisConfigurationImpl
@@ -307,7 +291,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");
@@ -682,7 +666,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=367666&r1=367665&r2=367666&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 08:05:14 2006
@@ -176,7 +176,9 @@
                 req.getSession().setAttribute(Constants.ENGAGE_STATUS,
                         moduleName + " module engaged globally Successfully");
             } catch (AxisFault axisFault) {
-                req.getSession().setAttribute(Constants.ENGAGE_STATUS, axisFault.getMessage());
+                if (axisFault.getMessage() != null) {
+                    req.getSession().setAttribute(Constants.ENGAGE_STATUS, axisFault.getMessage());
+                }
             }
         }
 
@@ -195,7 +197,7 @@
         req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
         req.getSession().setAttribute("modules", null);
 
-        String serviceName = req.getParameter("service");
+        String serviceName = req.getParameter("axisService");
 
         if (serviceName != null) {
             req.getSession().setAttribute("service", serviceName);



Mime
View raw message