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 2006/09/10 10:49:25 UTC
svn commit: r441932 - in /webservices/axis2/trunk/java/modules:
kernel/src/org/apache/axis2/transport/http/AdminAgent.java
kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webapp/listService.jsp webapp/listServices.jsp
Author: deepal
Date: Sun Sep 10 01:49:24 2006
New Revision: 441932
URL: http://svn.apache.org/viewvc?view=rev&rev=441932
Log:
- added support for module dis-engagment from web-admin
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/webapp/listService.jsp
webservices/axis2/trunk/java/modules/webapp/listServices.jsp
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java?view=diff&rev=441932&r1=441931&r2=441932
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java Sun Sep 10 01:49:24 2006
@@ -22,9 +22,11 @@
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.util.PhasesInfo;
+import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.fileupload.DiskFileUpload;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUpload;
@@ -507,6 +509,33 @@
renderView(LIST_AVAILABLE_MODULES_JSP_NAME, req, res);
}
+ protected void processdisengageModule(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
+ String type = req.getParameter("type");
+ String serviceName = req.getParameter("serviceName");
+ String moduleName = req.getParameter("module");
+ AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
+ AxisService service = axisConfiguration.getService(serviceName);
+ AxisModule module = axisConfiguration.getModule(new QName(moduleName));
+ if (type.equals("operation")) {
+ if (service.isEngaged(module.getName()) || axisConfiguration.isEngaged(module.getName())) {
+ req.getSession().setAttribute("status", "can not disengage module has engage to top levle");
+ } else {
+ String opName = req.getParameter("operation");
+ AxisOperation op = service.getOperation(new QName(opName));
+ op.disEngageModule(module);
+ req.getSession().setAttribute("status", "disenged from the operation");
+ }
+ } else {
+ if (axisConfiguration.isEngaged(module.getName())) {
+ req.getSession().setAttribute("status", "can not disengage module has engage to top levle");
+ } else {
+ service.disEngageModule(axisConfiguration.getModule(new QName(moduleName)));
+ req.getSession().setAttribute("status", "disenged from the service");
+ }
+ }
+ renderView("disengage.jsp", req, res);
+ }
+
protected void processSelectService(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "VIEW");
@@ -515,12 +544,15 @@
}
- private boolean authorizationRequired(HttpServletRequest httpServletRequest) {
+ private boolean authorizationRequired
+ (HttpServletRequest
+ httpServletRequest) {
return httpServletRequest.getSession().getAttribute(Constants.LOGGED) == null &&
!httpServletRequest.getRequestURI().endsWith("login");
}
- private boolean axisSecurityEnabled() {
+ private boolean axisSecurityEnabled
+ () {
Parameter parameter = configContext.getAxisConfiguration().getParameter(Constants.ADMIN_SECURITY_DISABLED);
return parameter == null || !"true".equals(parameter.getValue());
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=441932&r1=441931&r2=441932
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Sun Sep 10 01:49:24 2006
@@ -74,6 +74,7 @@
protected boolean disableREST = false;
protected boolean disableSeperateEndpointForREST = false;
private static final String LIST_SERVICES_SUFIX = "/services/listServices";
+ private static final String LIST_FAUKT_SERVICES_SUFIX = "/services/ListFaultyServices";
protected MessageContext
@@ -136,7 +137,7 @@
if ((query != null) && (query.indexOf("wsdl2") >= 0 ||
query.indexOf("wsdl") >= 0 || query.indexOf("xsd") >= 0)) { // handling meta data exchange stuff
agent.processListService(req, resp);
- } else if (requestURI.endsWith(LIST_SERVICES_SUFIX)) { // handling list services request
+ } else if (requestURI.endsWith(LIST_SERVICES_SUFIX) || requestURI.endsWith(LIST_FAUKT_SERVICES_SUFIX)) { // handling list services request
try {
agent.handle(req, resp);
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/webapp/listService.jsp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listService.jsp?view=diff&rev=441932&r1=441931&r2=441932
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listService.jsp Sun Sep 10 01:49:24 2006
@@ -4,7 +4,6 @@
<%@ page import="org.apache.axis2.description.AxisService" %>
<%@ page import="org.apache.axis2.description.Parameter" %>
<%@ page import="org.apache.axis2.engine.AxisConfiguration" %>
-<%@ page import="org.apache.axis2.transport.http.AxisServlet" %>
<%@ page import="org.apache.axis2.util.JavaUtils" %>
<%@ page import="java.util.*" %>
<%
@@ -123,7 +122,7 @@
%>
<ul>
<% }
- %><li><%=moduleName%></li>
+ %><li><%=moduleName%> :: <a href="axis2-admin/disengageModule?type=service&serviceName=<%=serviceName%>&module=<%=moduleName%>">Disengage</a></li>
<br>
<%
}
@@ -152,7 +151,7 @@
for (Iterator iterator2 = engagedModules.iterator(); iterator2.hasNext();) {
AxisModule moduleDecription = (AxisModule) iterator2.next();
moduleName = moduleDecription.getName().getLocalPart();
- %><li><%=moduleName%></li><br><%
+ %><li><%=moduleName%> :: <a href="axis2-admin/disengageModule?type=operation&serviceName=<%=serviceName%>&operation=<%=axisOperation.getName().getLocalPart()%>&module=<%=moduleName%>">Disengage</a></li><br><%
}
%></ul><%
}
@@ -172,7 +171,7 @@
Enumeration faultyservices = errornessservice.keys();
while (faultyservices.hasMoreElements()) {
String faultyserviceName = (String) faultyservices.nextElement();
-%><h3><font color="blue"><a href="listSingleService.jsp?serviceName=<%=faultyserviceName%>">
+%><h3><font color="blue"><a href="services/ListFaultyServices?serviceName=<%=faultyserviceName%>">
<%=faultyserviceName%></a></font></h3>
<%
}
Modified: webservices/axis2/trunk/java/modules/webapp/listServices.jsp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listServices.jsp?view=diff&rev=441932&r1=441931&r2=441932
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listServices.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listServices.jsp Sun Sep 10 01:49:24 2006
@@ -3,7 +3,6 @@
<%@ page import="org.apache.axis2.description.AxisService" %>
<%@ page import="org.apache.axis2.description.Parameter" %>
<%@ page import="org.apache.axis2.engine.AxisConfiguration" %>
-<%@ page import="org.apache.axis2.transport.http.AxisServlet" %>
<%@ page import="org.apache.axis2.util.JavaUtils" %>
<%@ page import="java.util.*" %>
<%--
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org