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 2005/06/20 10:11:07 UTC

svn commit: r191419 - in /webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http: AxisServlet.java ListingAgent.java

Author: deepal
Date: Mon Jun 20 01:11:05 2005
New Revision: 191419

URL: http://svn.apache.org/viewcvs?rev=191419&view=rev
Log:
renaming some of old names in AxisServlet

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=191419&r1=191418&r2=191419&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Mon Jun 20 01:11:05 2005
@@ -62,7 +62,9 @@
      * Field engineRegistry
      */
 
-    private ConfigurationContext engineContext;
+    private ConfigurationContext configContext;
+
+    private ListingAgent lister ;
 
     /**
      * Method init
@@ -75,8 +77,9 @@
             ServletContext context = config.getServletContext();
             String repoDir = context.getRealPath("/WEB-INF");
             ConfigurationContextFactory erfac = new ConfigurationContextFactory();
-            engineContext = erfac.buildEngineContext(repoDir);
-            engineContext.setProperty(Constants.CONTAINER_MANAGED, Constants.VALUE_TRUE);
+            configContext = erfac.buildEngineContext(repoDir);
+            configContext.setProperty(Constants.CONTAINER_MANAGED, Constants.VALUE_TRUE);
+            lister = new ListingAgent(configContext);
         } catch (Exception e) {
             throw new ServletException(e);
         }
@@ -141,11 +144,11 @@
                 }
                 MessageContext msgContext =
                     new MessageContext(
-                        engineContext,
+                        configContext,
                         (SessionContext) sessionContext,
-                        engineContext.getAxisConfiguration().getTransportIn(
+                        configContext.getAxisConfiguration().getTransportIn(
                             new QName(Constants.TRANSPORT_HTTP)),
-                        engineContext.getAxisConfiguration().getTransportOut(
+                        configContext.getAxisConfiguration().getTransportOut(
                             new QName(Constants.TRANSPORT_HTTP)));
                 msgContext.setProperty(Constants.Configuration.DO_REST,Constants.VALUE_TRUE);
 
@@ -153,7 +156,6 @@
                 processSOAPMessage(msgContext, httpServletRequest, httpServletResponse);
 
             } else {
-                ListingAgent lister = new ListingAgent(engineContext);
                 lister.handle(httpServletRequest, httpServletResponse);
             }
         } catch (OMException e) {
@@ -192,11 +194,11 @@
             }
             MessageContext msgContext =
                 new MessageContext(
-                    engineContext,
+                    configContext,
                     (SessionContext) sessionContext,
-                    engineContext.getAxisConfiguration().getTransportIn(
+                    configContext.getAxisConfiguration().getTransportIn(
                         new QName(Constants.TRANSPORT_HTTP)),
-                    engineContext.getAxisConfiguration().getTransportOut(
+                    configContext.getAxisConfiguration().getTransportOut(
                         new QName(Constants.TRANSPORT_HTTP)));
 
             XMLStreamReader reader =
@@ -237,7 +239,7 @@
         throws AxisFault {
         try {
             res.setContentType("text/xml; charset=utf-8");
-            AxisEngine engine = new AxisEngine(engineContext);
+            AxisEngine engine = new AxisEngine(configContext);
             msgContext.setServerSide(true);
 
             String filePart = req.getRequestURL().toString();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java?rev=191419&r1=191418&r2=191419&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java Mon Jun 20 01:11:05 2005
@@ -65,11 +65,11 @@
 
     private static final String ENGAGE_TO_OPERATION_JSP_NAME = "enaggingtoanopeartion.jsp";
 
-    public ListingAgent(ConfigurationContext engineContext) {
-        this.engineContext = engineContext;
+    public ListingAgent(ConfigurationContext configContext) {
+        this.configContext = configContext;
     }
 
-    private ConfigurationContext engineContext;
+    private ConfigurationContext configContext;
     /**
        * Field allowListServices
        */
@@ -145,11 +145,11 @@
      * @throws IOException
      */
     private void listServices(HttpServletRequest req, HttpServletResponse res) throws IOException {
-        HashMap services = engineContext.getAxisConfiguration().getServices();
+        HashMap services = configContext.getAxisConfiguration().getServices();
         req.getSession().setAttribute(Constants.SERVICE_MAP, services);
         req.getSession().setAttribute(
             Constants.ERROR_SERVICE_MAP,
-            engineContext.getAxisConfiguration().getFaulytServices());
+            configContext.getAxisConfiguration().getFaulytServices());
         res.sendRedirect(LIST_MULTIPLE_SERVICE_JSP_NAME);
     }
 
@@ -161,17 +161,17 @@
      */
     private void listAdminServices(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
-        HashMap services = engineContext.getAxisConfiguration().getServices();
+        HashMap services = configContext.getAxisConfiguration().getServices();
         req.getSession().setAttribute(Constants.SERVICE_MAP, services);
         req.getSession().setAttribute(
             Constants.ERROR_SERVICE_MAP,
-            engineContext.getAxisConfiguration().getFaulytServices());
+            configContext.getAxisConfiguration().getFaulytServices());
         res.sendRedirect(LIST_SRVICES_JSP_NAME);
     }
 
     private void selectService(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
-        HashMap services = engineContext.getAxisConfiguration().getServices();
+        HashMap services = configContext.getAxisConfiguration().getServices();
         req.getSession().setAttribute(Constants.SERVICE_MAP, services);
         req.getSession().setAttribute(Constants.MODULE_ENGAMENT, null);
         res.sendRedirect(SELECT_SERVICE_JSP_NAME);
@@ -186,11 +186,11 @@
             throw new AxisFault("invalid user name");
         }
         String adminUserName =
-            (String) ((AxisConfigurationImpl) engineContext.getAxisConfiguration())
+            (String) ((AxisConfigurationImpl) configContext.getAxisConfiguration())
                 .getParameter(Constants.USER_NAME)
                 .getValue();
         String adminPassword =
-            (String) ((AxisConfigurationImpl) engineContext.getAxisConfiguration())
+            (String) ((AxisConfigurationImpl) configContext.getAxisConfiguration())
                 .getParameter(Constants.PASSWORD)
                 .getValue();
         if (username != null
@@ -206,24 +206,24 @@
 
     private void listModules(HttpServletRequest req, HttpServletResponse res) throws IOException {
         HashMap modules =
-            ((AxisConfigurationImpl) engineContext.getAxisConfiguration()).getModules();
+            ((AxisConfigurationImpl) configContext.getAxisConfiguration()).getModules();
         req.getSession().setAttribute(Constants.MODULE_MAP, modules);
         req.getSession().setAttribute(
             Constants.ERROR_MODULE_MAP,
-            engineContext.getAxisConfiguration().getFaulytModules());
+            configContext.getAxisConfiguration().getFaulytModules());
         res.sendRedirect(LIST_AVAILABLE_MODULES_JSP_NAME);
     }
 
     private void engageModulesGlobally(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
         HashMap modules =
-            ((AxisConfigurationImpl) engineContext.getAxisConfiguration()).getModules();
+            ((AxisConfigurationImpl) configContext.getAxisConfiguration()).getModules();
         req.getSession().setAttribute(Constants.MODULE_MAP, modules);
         String moduleName = (String) req.getParameter("modules");
         req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
         if (moduleName != null) {
             try {
-                engineContext.getAxisConfiguration().engageModule(new QName(moduleName));
+                configContext.getAxisConfiguration().engageModule(new QName(moduleName));
                 req.getSession().setAttribute(
                     Constants.ENGAGE_STATUS,
                     moduleName + " module engaged globally Successfully");
@@ -238,7 +238,7 @@
     private void engageModulesToOpeartion(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
         HashMap modules =
-            ((AxisConfigurationImpl) engineContext.getAxisConfiguration()).getModules();
+            ((AxisConfigurationImpl) configContext.getAxisConfiguration()).getModules();
         req.getSession().setAttribute(Constants.MODULE_MAP, modules);
         String moduleName = (String) req.getParameter("modules");
 
@@ -253,7 +253,7 @@
         }
         req.getSession().setAttribute(
             Constants.OPEARTION_MAP,
-            engineContext
+            configContext
                 .getAxisConfiguration()
                 .getService(new QName(serviceName))
                 .getOperations());
@@ -262,11 +262,11 @@
         if (serviceName != null && moduleName != null && operationName != null) {
             try {
                 OperationDescription od =
-                    engineContext.getAxisConfiguration().getService(
+                    configContext.getAxisConfiguration().getService(
                         new QName(serviceName)).getOperation(
                         new QName(operationName));
                 od.engageModule(
-                    engineContext.getAxisConfiguration().getModule(new QName(moduleName)));
+                    configContext.getAxisConfiguration().getModule(new QName(moduleName)));
                 req.getSession().setAttribute(
                     Constants.ENGAGE_STATUS,
                     moduleName + " module engaged to the operation Successfully");
@@ -280,9 +280,9 @@
     private void engageModulesToService(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
         HashMap modules =
-            ((AxisConfigurationImpl) engineContext.getAxisConfiguration()).getModules();
+            ((AxisConfigurationImpl) configContext.getAxisConfiguration()).getModules();
         req.getSession().setAttribute(Constants.MODULE_MAP, modules);
-        HashMap services = engineContext.getAxisConfiguration().getServices();
+        HashMap services = configContext.getAxisConfiguration().getServices();
         req.getSession().setAttribute(Constants.SERVICE_MAP, services);
         String moduleName = (String) req.getParameter("modules");
         req.getSession().setAttribute(Constants.ENGAGE_STATUS, null);
@@ -292,9 +292,9 @@
         if (serviceName != null && moduleName != null) {
             try {
 
-                engineContext.getAxisConfiguration().getService(
+                configContext.getAxisConfiguration().getService(
                     new QName(serviceName)).engageModule(
-                    engineContext.getAxisConfiguration().getModule(new QName(moduleName)));
+                    configContext.getAxisConfiguration().getModule(new QName(moduleName)));
                 req.getSession().setAttribute(
                     Constants.ENGAGE_STATUS,
                     moduleName + " module engaged to the service Successfully");
@@ -309,14 +309,14 @@
     private void listGloballyModules(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
         Collection modules =
-            ((AxisConfigurationImpl) engineContext.getAxisConfiguration()).getEngadgedModules();
+            ((AxisConfigurationImpl) configContext.getAxisConfiguration()).getEngadgedModules();
         req.getSession().setAttribute(Constants.MODULE_MAP, modules);
         res.sendRedirect(LIST_GLOABLLY_ENGAGED_MODULES_JSP_NAME);
     }
 
     private void lsitServiceformodules(HttpServletRequest req, HttpServletResponse res)
         throws IOException {
-        HashMap services = engineContext.getAxisConfiguration().getServices();
+        HashMap services = configContext.getAxisConfiguration().getServices();
         req.getSession().setAttribute(Constants.SERVICE_MAP, services);
         req.getSession().setAttribute(Constants.MODULE_ENGAMENT, "Yes");
         res.sendRedirect(SELECT_SERVICE_JSP_NAME);
@@ -326,7 +326,7 @@
         throws IOException {
         req.getSession().setAttribute(
             Constants.GLOBAL_HANDLERS,
-            engineContext.getAxisConfiguration());
+            configContext.getAxisConfiguration());
         res.sendRedirect(VIEW_GLOBAL_HANDLERS_JSP_NAME);
     }
 
@@ -336,7 +336,7 @@
         if (service != null) {
             req.getSession().setAttribute(
                 Constants.SERVICE_HANDLERS,
-                engineContext.getAxisConfiguration().getService(new QName(service)));
+                configContext.getAxisConfiguration().getService(new QName(service)));
         }
         res.sendRedirect(VIEW_SERVICE_HANDLERS_JSP_NAME);
     }
@@ -369,7 +369,7 @@
     private void listService(HttpServletRequest req, HttpServletResponse res, String filePart)
         throws IOException {
         String serviceName = filePart.substring(filePart.lastIndexOf("/") + 1, filePart.length());
-        HashMap services = engineContext.getAxisConfiguration().getServices();
+        HashMap services = configContext.getAxisConfiguration().getServices();
         if ((services != null) && !services.isEmpty()) {
             Object serviceObj = services.get(new QName(serviceName));
             if (serviceObj != null) {