Author: veithen
Date: Sun Sep 10 12:54:47 2017
New Revision: 1807947
URL: http://svn.apache.org/viewvc?rev=1807947&view=rev
Log:
Put the ConfigurationContext into the request scope and then get the service
map from there.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
Sun Sep 10 12:54:47 2017
@@ -164,7 +164,6 @@ public class Constants extends org.apach
*/
public static final String SINGLE_SERVICE = "singleservice";
- public static final String SERVICE_MAP = "servicemap";
public static final String SERVICE_ROOT = "serviceRoot";
public static final String SERVICE_PATH = "servicePath";
public static final String SERVICE_HANDLERS = "serviceHandlers";
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
Sun Sep 10 12:54:47 2017
@@ -153,8 +153,7 @@ public class AbstractAgent {
}
protected void populateRequestAttributes(HttpServletRequest req) {
- HashMap services = configContext.getAxisConfiguration().getServices();
- req.setAttribute(Constants.SERVICE_MAP, services);
+ req.setAttribute("configContext", configContext);
req.setAttribute(Constants.SERVICE_PATH,
configContext.getServicePath());
}
}
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
Sun Sep 10 12:54:47 2017
@@ -47,7 +47,6 @@ import javax.servlet.http.HttpServletReq
import javax.xml.namespace.QName;
import java.io.File;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -105,8 +104,7 @@ final class AdminActions {
}
protected void populateRequestAttributes(HttpServletRequest req) {
- HashMap services = configContext.getAxisConfiguration().getServices();
- req.setAttribute(Constants.SERVICE_MAP, services);
+ req.setAttribute("configContext", configContext);
}
@Action(name=INDEX)
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
Sun Sep 10 12:54:47 2017
@@ -25,6 +25,7 @@
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
+<c:set var="services"
value="${requestScope.configContext.axisConfiguration.services}"/>
<%
String buttonName="" ;
@@ -53,7 +54,7 @@
<td style="width: 35%">Select a Service :</td><td style="width:65%">
<select name="axisService">
<%
- HashMap services =
(HashMap)request.getAttribute(Constants.SERVICE_MAP);
+ HashMap services =
(HashMap)pageContext.getAttribute("services");
Collection serviceCol = services.values();
for (Iterator iterator = serviceCol.iterator();
iterator.hasNext();) {
AxisService axisService = (AxisService)iterator.next();
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp
Sun Sep 10 12:54:47 2017
@@ -25,6 +25,7 @@
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
+<c:set var="services"
value="${requestScope.configContext.axisConfiguration.services}"/>
<h1>Turn On Service</h1>
<form method="post" name="serviceActivate" action="<c:url
value="axis2-admin/doActivateService"/>">
<table summary="main content table" width="100%" border="0">
@@ -35,7 +36,7 @@
</tr>
<tr>
<%
-HashMap services = (HashMap)request.getAttribute(Constants.SERVICE_MAP);
+HashMap services = (HashMap)pageContext.getAttribute("services");
Collection col = services.values();
String html = "";
int count = 0;
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp
Sun Sep 10 12:54:47 2017
@@ -25,6 +25,7 @@
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
+<c:set var="services"
value="${requestScope.configContext.axisConfiguration.services}"/>
<h1>Deactivate Service</h1>
<form method="post" name="serviceInActivate" action="<c:url
value="axis2-admin/doDeactivateService"/>">
<table summary="main content table" style="width: 100%" border="0">
@@ -35,7 +36,7 @@
</tr>
<tr>
<%
-HashMap services = (HashMap)request.getAttribute(Constants.SERVICE_MAP);
+HashMap services = (HashMap)pageContext.getAttribute("services");
Collection col = services.values();
String html = "";
int count = 0;
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp
Sun Sep 10 12:54:47 2017
@@ -28,6 +28,7 @@
%>
<%@ page import="org.apache.axis2.util.Utils" %>
<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
+<c:set var="services"
value="${requestScope.configContext.axisConfiguration.services}"/>
<h1>Engage Module for a Service</h1>
<p>To engage a module for a axis service,</p>
@@ -86,7 +87,7 @@
<select name="axisService">
<%
- HashMap services =
(HashMap)request.getAttribute(Constants.SERVICE_MAP);
+ HashMap services =
(HashMap)pageContext.getAttribute("services");
Collection serviceCol = services.values();
for (Iterator iterator = serviceCol.iterator();
iterator.hasNext();) {
AxisService axisService =
(AxisService)iterator.next();
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
Sun Sep 10 12:54:47 2017
@@ -30,13 +30,14 @@
<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
+<c:set var="services"
value="${requestScope.configContext.axisConfiguration.services}"/>
<h1>Available Services</h1>
<t:status/>
<% String prefix = request.getAttribute("frontendHostUrl") +
(String)request.getAttribute(Constants.SERVICE_PATH) + "/";
%>
<%
- HashMap serviceMap = (HashMap) request.getAttribute(Constants.SERVICE_MAP);
+ HashMap serviceMap = (HashMap) pageContext.getAttribute("services");
Hashtable errornessservice = (Hashtable)
request.getSession().getAttribute(Constants.ERROR_SERVICE_MAP);
boolean status = false;
if (serviceMap != null && !serviceMap.isEmpty()) {
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp?rev=1807947&r1=1807946&r2=1807947&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp
Sun Sep 10 12:54:47 2017
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page session="false" %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisOperation" %>
@@ -28,6 +29,7 @@
<%@ page import="java.util.Hashtable" %>
<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<c:set var="services"
value="${requestScope.configContext.axisConfiguration.services}"/>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
@@ -43,7 +45,7 @@
<% String prefix = request.getAttribute("frontendHostUrl") +
(String)request.getAttribute(Constants.SERVICE_PATH) + "/";
%>
<%
- HashMap serviceMap = (HashMap) request.getAttribute(Constants.SERVICE_MAP);
+ HashMap serviceMap = (HashMap) pageContext.getAttribute("services");
Hashtable errornessservice = (Hashtable)
request.getAttribute(Constants.ERROR_SERVICE_MAP);
boolean status = false;
if (serviceMap != null && !serviceMap.isEmpty()) {
