You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/03/22 10:21:30 UTC
svn commit: r757151 - in /webservices/axis2/trunk/java/modules/webapp: ./
conf/ src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/axis2/ src/main/java/org/apache/axis2/webapp/
Author: veithen
Date: Sun Mar 22 09:21:29 2009
New Revision: 757151
URL: http://svn.apache.org/viewvc?rev=757151&view=rev
Log:
Moved the admin console related code from axis2-transport-http to axis2-webapp. Reason:
* It doesn't make sense to split the view part (JSP pages; axis2-webapp) and the controller part (AdminAgent and AxisAdminServlet; axis2-transport-http) over two different projects!
* The admin console is tightly coupled to Axis2, so everything should be moved there.
Added:
webservices/axis2/trunk/java/modules/webapp/src/main/java/
webservices/axis2/trunk/java/modules/webapp/src/main/java/org/
webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/
webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/
webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/
webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (contents, props changed)
- copied, changed from r756927, webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (contents, props changed)
- copied, changed from r756927, webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AxisAdminServlet.java
Modified:
webservices/axis2/trunk/java/modules/webapp/conf/web.xml
webservices/axis2/trunk/java/modules/webapp/pom.xml
Modified: webservices/axis2/trunk/java/modules/webapp/conf/web.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/conf/web.xml?rev=757151&r1=757150&r2=757151&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/conf/web.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/conf/web.xml Sun Mar 22 09:21:29 2009
@@ -43,7 +43,7 @@
<servlet-name>AxisAdminServlet</servlet-name>
<display-name>Apache-Axis AxisAdmin Servlet (Web Admin)</display-name>
<servlet-class>
- org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
+ org.apache.axis2.webapp.AxisAdminServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
Modified: webservices/axis2/trunk/java/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/pom.xml?rev=757151&r1=757150&r2=757151&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/pom.xml Sun Mar 22 09:21:29 2009
@@ -1328,6 +1328,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
</dependency>
Copied: webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (from r756927, webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AdminAgent.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java?p2=webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java&p1=webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AdminAgent.java&r1=756927&r2=757151&rev=757151&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AdminAgent.java (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java Sun Mar 22 09:21:29 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.transport.http;
+package org.apache.axis2.webapp;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -30,6 +30,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.transport.http.AbstractAgent;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.RequestContext;
@@ -117,14 +118,14 @@
}
}
- protected void processIndex(HttpServletRequest req, HttpServletResponse res)
+ public void processIndex(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
renderView(ADMIN_JSP_NAME, req, res);
}
// supported web operations
- protected void processUpload(HttpServletRequest req, HttpServletResponse res)
+ public void processUpload(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String hasHotDeployment =
(String) configContext.getAxisConfiguration().getParameterValue("hotdeployment");
@@ -186,7 +187,7 @@
}
- protected void processLogin(HttpServletRequest req, HttpServletResponse res)
+ public void processLogin(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String username = req.getParameter("userName");
String password = req.getParameter("password");
@@ -212,7 +213,7 @@
}
}
- protected void processEditServicePara(HttpServletRequest req, HttpServletResponse res)
+ public void processEditServicePara(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String serviceName = req.getParameter("axisService");
if (req.getParameter("changePara") != null) {
@@ -260,7 +261,7 @@
renderView(SERVICE_PARA_EDIT_JSP_NAME, req, res);
}
- protected void processEngagingGlobally(HttpServletRequest req, HttpServletResponse res)
+ public void processEngagingGlobally(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
HashMap modules = configContext.getAxisConfiguration().getModules();
@@ -285,7 +286,7 @@
}
- protected void processListOperations(HttpServletRequest req, HttpServletResponse res)
+ public void processListOperations(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
HashMap modules = configContext.getAxisConfiguration().getModules();
@@ -331,7 +332,7 @@
renderView(ENGAGE_TO_OPERATION_JSP_NAME, req, res);
}
- protected void processEngageToService(HttpServletRequest req, HttpServletResponse res)
+ public void processEngageToService(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
HashMap modules = configContext.getAxisConfiguration().getModules();
@@ -364,7 +365,7 @@
renderView(ENGAGING_MODULE_TO_SERVICE_JSP_NAME, req, res);
}
- protected void processEngageToServiceGroup(HttpServletRequest req, HttpServletResponse res)
+ public void processEngageToServiceGroup(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
HashMap modules = configContext.getAxisConfiguration().getModules();
@@ -397,13 +398,13 @@
}
- protected void processLogout(HttpServletRequest req, HttpServletResponse res)
+ public void processLogout(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
req.getSession().invalidate();
renderView("index.jsp", req, res);
}
- protected void processviewServiceGroupConetxt(HttpServletRequest req, HttpServletResponse res)
+ public void processviewServiceGroupConetxt(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String type = req.getParameter("TYPE");
String sgID = req.getParameter("ID");
@@ -414,7 +415,7 @@
renderView("viewServiceGroupContext.jsp", req, res);
}
- protected void processviewServiceContext(HttpServletRequest req, HttpServletResponse res)
+ public void processviewServiceContext(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String type = req.getParameter("TYPE");
String sgID = req.getParameter("PID");
@@ -432,14 +433,14 @@
renderView("viewServiceContext.jsp", req, res);
}
- protected void processSelectServiceParaEdit(HttpServletRequest req, HttpServletResponse res)
+ public void processSelectServiceParaEdit(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "SERVICE_PARAMETER");
renderView(SELECT_SERVICE_JSP_NAME, req, res);
}
- protected void processListOperation(HttpServletRequest req, HttpServletResponse res)
+ public void processListOperation(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "MODULE");
@@ -447,7 +448,7 @@
renderView(SELECT_SERVICE_JSP_NAME, req, res);
}
- protected void processActivateService(HttpServletRequest req, HttpServletResponse res)
+ public void processActivateService(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
if (req.getParameter("submit") != null) {
String serviceName = req.getParameter("axisService");
@@ -462,7 +463,7 @@
renderView(ACTIVATE_SERVICE_JSP_NAME, req, res);
}
- protected void processDeactivateService(HttpServletRequest req, HttpServletResponse res)
+ public void processDeactivateService(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
if (req.getParameter("submit") != null) {
String serviceName = req.getParameter("axisService");
@@ -481,7 +482,7 @@
}
- protected void processViewGlobalHandlers(HttpServletRequest req, HttpServletResponse res)
+ public void processViewGlobalHandlers(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
req.getSession().setAttribute(Constants.GLOBAL_HANDLERS,
configContext.getAxisConfiguration());
@@ -489,7 +490,7 @@
renderView(VIEW_GLOBAL_HANDLERS_JSP_NAME, req, res);
}
- protected void processViewServiceHandlers(HttpServletRequest req, HttpServletResponse res)
+ public void processViewServiceHandlers(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String service = req.getParameter("axisService");
@@ -502,14 +503,14 @@
}
- protected void processListPhases(HttpServletRequest req, HttpServletResponse res)
+ public void processListPhases(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PhasesInfo info = configContext.getAxisConfiguration().getPhasesInfo();
req.getSession().setAttribute(Constants.PHASE_LIST, info);
renderView(LIST_PHASES_JSP_NAME, req, res);
}
- protected void processListServiceGroups(HttpServletRequest req, HttpServletResponse res)
+ public void processListServiceGroups(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
Iterator serviceGroups = configContext.getAxisConfiguration().getServiceGroups();
populateSessionInformation(req);
@@ -518,7 +519,7 @@
renderView(LIST_SERVICE_GROUP_JSP, req, res);
}
- protected void processListService(HttpServletRequest req, HttpServletResponse res)
+ public void processListService(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.ERROR_SERVICE_MAP,
@@ -527,7 +528,7 @@
renderView(LIST_SERVICES_JSP_NAME, req, res);
}
- protected void processListSingleService(HttpServletRequest req, HttpServletResponse res)
+ public void processListSingleService(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
req.getSession().setAttribute(Constants.IS_FAULTY, ""); //Clearing out any old values.
String serviceName = req.getParameter("serviceName");
@@ -539,13 +540,13 @@
}
- protected void processListContexts(HttpServletRequest req, HttpServletResponse res)
+ public void processListContexts(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
req.getSession().setAttribute(Constants.CONFIG_CONTEXT, configContext);
renderView("ViewContexts.jsp", req, res);
}
- protected void processglobalModules(HttpServletRequest req, HttpServletResponse res)
+ public void processglobalModules(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
Collection modules = configContext.getAxisConfiguration().getEngagedModules();
@@ -554,7 +555,7 @@
renderView(LIST_GLOABLLY_ENGAGED_MODULES_JSP_NAME, req, res);
}
- protected void processListModules(HttpServletRequest req, HttpServletResponse res)
+ public void processListModules(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
HashMap modules = configContext.getAxisConfiguration().getModules();
@@ -565,7 +566,7 @@
renderView(LIST_AVAILABLE_MODULES_JSP_NAME, req, res);
}
- protected void processdisengageModule(HttpServletRequest req, HttpServletResponse res)
+ public void processdisengageModule(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String type = req.getParameter("type");
String serviceName = req.getParameter("serviceName");
@@ -601,7 +602,7 @@
renderView("disengage.jsp", req, res);
}
- protected void processSelectService(HttpServletRequest req, HttpServletResponse res)
+ public void processSelectService(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "VIEW");
Propchange: webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (from r756927, webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AxisAdminServlet.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java?p2=webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java&p1=webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AxisAdminServlet.java&r1=756927&r2=757151&rev=757151&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/src/org/apache/axis2/transport/http/AxisAdminServlet.java (original)
+++ webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java Sun Mar 22 09:21:29 2009
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.axis2.transport.http;
+package org.apache.axis2.webapp;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.transport.http.AxisServlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
Propchange: webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
svn:mergeinfo =