You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/05/28 11:57:35 UTC
svn commit: r1745869 - in /axis/axis2/java/core/trunk/modules/webapp: ./
src/main/java/org/apache/axis2/webapp/ src/main/webapp/WEB-INF/
src/main/webapp/WEB-INF/include/ src/main/webapp/WEB-INF/views/
src/main/webapp/WEB-INF/views/admin/ src/main/webap...
Author: veithen
Date: Sat May 28 11:57:34 2016
New Revision: 1745869
URL: http://svn.apache.org/viewvc?rev=1745869&view=rev
Log:
Apply best practices and move views under /WEB-INF.
Added:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/include/
- copied from r1745868, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/include/LeftFrame.jsp
- copied unchanged from r1745868, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ActivateService.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ActivateService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/EngageToServiceGroup.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/InActivateService.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/InActivateService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ListServiceGroup.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/Login.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Login.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/SelectService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ServiceParaEdit.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ServiceParaEdit.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewContexts.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewContexts.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewGlobalHandlers.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewServiceHandlers.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewServiceHandlers.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/admin.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/admin.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deleteService.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/disengage.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/disengage.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingglobally.jsp
- copied, changed from r1745860, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoanoperation.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoaservice.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/errorModule.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/errorModule.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/globalModules.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/globalModules.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listModules.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listModules.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listService.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/upload.jsp
- copied, changed from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/upload.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceContext.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceContext.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceGroupContext.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceGroupContext.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewphases.jsp
- copied, changed from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp
Removed:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ActivateService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/InActivateService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Login.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/SelectService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ServiceParaEdit.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewContexts.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewServiceHandlers.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/admin.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/disengage.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/errorModule.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/globalModules.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listModules.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/upload.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceContext.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceGroupContext.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp
Modified:
axis/axis2/java/core/trunk/modules/webapp/pom.xml
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/include/adminheader.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/HappyAxis.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/error.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/index.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sat May 28 11:57:34 2016
@@ -315,7 +315,7 @@
<webAppConfig>
<contextPath>/axis2</contextPath>
<baseResource implementation="org.eclipse.jetty.util.resource.ResourceCollection">
- <resourcesAsCSV>src/main/webapp,${project.build.directory}/webResources</resourcesAsCSV>
+ <resourcesAsCSV>${project.build.directory}/webResources,src/main/webapp</resourcesAsCSV>
</baseResource>
</webAppConfig>
</configuration>
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=1745869&r1=1745868&r2=1745869&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 Sat May 28 11:57:34 2016
@@ -109,7 +109,7 @@ final class AdminActions {
protected void renderView(String jspName, HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) throws IOException, ServletException {
httpServletResponse.setContentType("text/html");
- httpServletRequest.getRequestDispatcher(Constants.AXIS_WEB_CONTENT_ROOT + jspName)
+ httpServletRequest.getRequestDispatcher("/WEB-INF/views/admin/" + jspName)
.include(httpServletRequest, httpServletResponse);
}
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/include/adminheader.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/include/adminheader.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/include/adminheader.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/include/adminheader.jsp Sat May 28 11:57:34 2016
@@ -71,7 +71,7 @@
<table summary="left frame table" class="FULL_BLANK">
<tr>
<td valign="top" style="width:20%">
- <jsp:include page="../LeftFrame.jsp"/>
+ <jsp:include page="LeftFrame.jsp"/>
</td>
<td valign="top" align="left" style="width:80%">
<table summary="logout table" width="100%">
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ActivateService.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ActivateService.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ActivateService.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ActivateService.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ActivateService.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ActivateService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ActivateService.jsp Sat May 28 11:57:34 2016
@@ -24,7 +24,7 @@
java.util.HashMap,
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Turn On Service</h1>
<form method="get" name="serviceActivate" action="<c:url value="axis2-admin/activateService"/>">
<table summary="main content table" width="100%" border="0">
@@ -80,4 +80,4 @@ if (count > 0) {
</table>
</form>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/EngageToServiceGroup.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/EngageToServiceGroup.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/EngageToServiceGroup.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/EngageToServiceGroup.jsp Sat May 28 11:57:34 2016
@@ -25,7 +25,7 @@
<%@ page import="java.util.HashMap"%>
<%@ page import="java.util.Iterator"%>
<%@ page import="org.apache.axis2.util.Utils" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
String status = (String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
HashMap moduels = (HashMap)request.getSession().getAttribute(Constants.MODULE_MAP);
@@ -136,4 +136,4 @@
}
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/InActivateService.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/InActivateService.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/InActivateService.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/InActivateService.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/InActivateService.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/InActivateService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/InActivateService.jsp Sat May 28 11:57:34 2016
@@ -24,7 +24,7 @@
java.util.HashMap,
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Deactivate Service</h1>
<form method="get" name="serviceInActivate" action="<c:url value="axis2-admin/deactivateService"/>">
<table summary="main content table" style="width: 100%" border="0">
@@ -81,4 +81,4 @@ if (count > 0) {
</table>
</form>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ListServiceGroup.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ListServiceGroup.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ListServiceGroup.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ListServiceGroup.jsp Sat May 28 11:57:34 2016
@@ -25,7 +25,7 @@
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Available Service Groups</h1>
<%
Iterator axisServiceGroupIter = (Iterator) request.getSession().getAttribute(
@@ -44,7 +44,7 @@
AxisService axisService = (AxisService) axisServiceIter.next();
String serviceName = axisService.getName();
%>
- <li><a style="color:blue" href="<c:url value="axis2-admin/ListSingleService"><c:param name="serviceName" value="<%=serviceName%>"/></c:url>">
+ <li><a style="color:blue" href="<c:url value="axis2-admin/listSingleService"><c:param name="serviceName" value="<%=serviceName%>"/></c:url>">
<%=serviceName%></a></li>
<%
}
@@ -66,4 +66,4 @@
}
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/Login.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Login.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/Login.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/Login.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Login.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Login.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/Login.jsp Sat May 28 11:57:34 2016
@@ -21,14 +21,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
- <jsp:include page="include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>Login to Axis2 :: Administration page</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body onload="javascript:document.LoginForm.userName.focus();">
- <jsp:include page="include/header.inc"/>
- <jsp:include page="include/link-footer.jsp"/>
+ <jsp:include page="/WEB-INF/include/header.inc"/>
+ <jsp:include page="/WEB-INF/include/link-footer.jsp"/>
<table summary="main content table" class="FULL_BLANK">
<tr>
<td valign="top">
@@ -83,7 +83,7 @@
</td>
</tr>
</table>
- <jsp:include page="include/footer.inc"/>
+ <jsp:include page="/WEB-INF/include/footer.inc"/>
</body>
</html>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/SelectService.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/SelectService.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/SelectService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp Sat May 28 11:57:34 2016
@@ -24,7 +24,7 @@
java.util.HashMap,
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
String action ="";
@@ -78,4 +78,4 @@
</tr>
</table>
</form>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ServiceParaEdit.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ServiceParaEdit.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ServiceParaEdit.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ServiceParaEdit.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ServiceParaEdit.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ServiceParaEdit.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ServiceParaEdit.jsp Sat May 28 11:57:34 2016
@@ -25,7 +25,7 @@
java.util.ArrayList,
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Edit Service Parameters</h1>
<form method="get" name="editServicepara" action="<c:url value="axis2-admin/editServicepara"/>">
<%
@@ -120,4 +120,4 @@
%>
</form>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewContexts.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewContexts.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewContexts.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewContexts.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewContexts.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewContexts.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewContexts.jsp Sat May 28 11:57:34 2016
@@ -24,7 +24,7 @@
<%@ page import="org.apache.axis2.context.ServiceGroupContext"%>
<%@ page import="java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Running Context Hierarchy</h1>
<%
ConfigurationContext configContext = (ConfigurationContext) request.getSession().getAttribute(
@@ -65,4 +65,4 @@
<p>No running contexts were found on the system.</p>
<%}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewGlobalHandlers.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewGlobalHandlers.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewGlobalHandlers.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewGlobalHandlers.jsp Sat May 28 11:57:34 2016
@@ -23,7 +23,7 @@
org.apache.axis2.engine.Phase,
java.util.List"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>View Global Execution Chains</h1>
<%
AxisConfiguration axisConfig = (AxisConfiguration)request.getSession().
@@ -134,4 +134,4 @@
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewServiceHandlers.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewServiceHandlers.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewServiceHandlers.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewServiceHandlers.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewServiceHandlers.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/ViewServiceHandlers.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/ViewServiceHandlers.jsp Sat May 28 11:57:34 2016
@@ -27,7 +27,7 @@
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>View Operation Specific Chains</h1>
<%
AxisService axisService = (AxisService)request.getSession().
@@ -144,4 +144,4 @@
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/admin.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/admin.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/admin.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/admin.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/admin.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/admin.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/admin.jsp Sat May 28 11:57:34 2016
@@ -18,7 +18,7 @@
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Welcome to Axis2 Web Admin Module !!</h1>
<p>You are now logged into the Axis2 administration console from inside
the console you will be able to</p>
@@ -28,4 +28,4 @@ the console you will be able to</p>
<li>to upload new services into Axis2 [Service hot-deployment].</li>
</ul>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deleteService.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deleteService.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deleteService.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/deleteService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/deleteService.jsp Sat May 28 11:57:34 2016
@@ -17,7 +17,7 @@
~ under the License.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<p><%=request.getSession().getAttribute("status")%></p>
<p>Click <a href="services/listServices">here</a> to go to the service list page</p>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/disengage.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/disengage.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/disengage.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/disengage.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/disengage.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/disengage.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/disengage.jsp Sat May 28 11:57:34 2016
@@ -17,6 +17,6 @@
~ under the License.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%=request.getSession().getAttribute("status")%>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingglobally.jsp (from r1745860, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingglobally.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingglobally.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp&r1=1745860&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingglobally.jsp Sat May 28 11:57:34 2016
@@ -24,7 +24,7 @@
java.util.HashMap,
java.util.Iterator" %>
<%@ page import="org.apache.axis2.util.Utils" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
String status = (String) request.getSession().getAttribute(Constants.ENGAGE_STATUS);
%>
@@ -69,4 +69,4 @@
<p style="color:blue"><%=Utils.sanitizeWebOutput(status)%></p>
<%
} %>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoanoperation.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoanoperation.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoanoperation.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoanoperation.jsp Sat May 28 11:57:34 2016
@@ -25,7 +25,7 @@
java.util.Collection,
java.util.HashMap,
java.util.Iterator"%>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
String status = (String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
%>
@@ -126,4 +126,4 @@
</tr>
</table>
</form>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoaservice.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoaservice.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoaservice.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/engagingtoaservice.jsp Sat May 28 11:57:34 2016
@@ -26,7 +26,7 @@
java.util.Iterator"
%>
<%@ page import="org.apache.axis2.util.Utils" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
String status = (String) request.getSession().getAttribute(Constants.ENGAGE_STATUS);
%>
@@ -148,4 +148,4 @@
</tr>
</table>
</form>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/errorModule.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/errorModule.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/errorModule.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/errorModule.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/errorModule.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/errorModule.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/errorModule.jsp Sat May 28 11:57:34 2016
@@ -20,7 +20,7 @@
<%@ page import="org.apache.axis2.Constants,
java.util.Hashtable"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
Hashtable errornessModules =(Hashtable)request.getSession().getAttribute(Constants.ERROR_MODULE_MAP);
String moduleName = request.getParameter("moduleName");
@@ -28,4 +28,4 @@
%><span style="color:red"><%=(String)errornessModules.get(moduleName) %></span><%
%>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/globalModules.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/globalModules.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/globalModules.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/globalModules.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/globalModules.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/globalModules.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/globalModules.jsp Sat May 28 11:57:34 2016
@@ -20,7 +20,7 @@
java.util.Collection,
java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Globally Engaged Modules</h1>
<%
boolean foundModules = false;
@@ -52,4 +52,4 @@
<%
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listModules.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listModules.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listModules.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listModules.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listModules.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listModules.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listModules.jsp Sat May 28 11:57:34 2016
@@ -23,7 +23,7 @@
<%@ page import="java.util.Hashtable"%>
<%@ page import="java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Available Modules</h1>
<%
boolean foundModules = false;
@@ -78,4 +78,4 @@
<%
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listService.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listService.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listService.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listService.jsp Sat May 28 11:57:34 2016
@@ -31,7 +31,7 @@
<%@ page import="java.util.Hashtable" %>
<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Available Services</h1>
<% String prefix = request.getAttribute("frontendHostUrl") + (String)request.getSession().getAttribute(Constants.SERVICE_PATH) + "/";
@@ -170,4 +170,4 @@ Actions : <a href="<c:url value="axis2-a
%> No services listed! Try hitting refresh. <%
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp Sat May 28 11:57:34 2016
@@ -26,7 +26,7 @@
<%@ page import="java.util.Hashtable" %>
<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>List Single Service</h1>
<%
String prefix = request.getAttribute("frontendHostUrl") + (String)request.getSession().getAttribute(Constants.SERVICE_PATH) + "/";
@@ -105,4 +105,4 @@ Service Status : <%=axisService.isActive
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/upload.jsp (from r1745826, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/upload.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/upload.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/upload.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/upload.jsp&r1=1745826&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/upload.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/upload.jsp Sat May 28 11:57:34 2016
@@ -19,7 +19,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<script type="text/javascript">
<!--
function checkFileUpload(){
@@ -73,4 +73,4 @@ The following error occurred
<p>Hot deployment of new service archives is <%=request.getAttribute("hotDeployment") %></p>
<p>Hot update of existing service archives is <%=request.getAttribute("hotUpdate") %></p>
</blockquote>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceContext.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceContext.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceContext.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceContext.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceContext.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceContext.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceContext.jsp Sat May 28 11:57:34 2016
@@ -20,7 +20,7 @@
<%@ page import="org.apache.axis2.context.ServiceContext" %>
<%@ page import="java.util.Iterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Running Context Hierarchy</h1>
<%
ServiceContext serviceContext = (ServiceContext) request.getSession().getAttribute("ServiceContext");
@@ -47,4 +47,4 @@
}
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceGroupContext.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceGroupContext.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceGroupContext.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceGroupContext.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceGroupContext.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewServiceGroupContext.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewServiceGroupContext.jsp Sat May 28 11:57:34 2016
@@ -21,7 +21,7 @@
<%@ page import="org.apache.axis2.context.ServiceGroupContext"%>
<%@ page import="java.util.Iterator"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Running Context hierarchy</h1>
<%
String type = (String) request.getSession().getAttribute("TYPE");
@@ -52,4 +52,4 @@
%> <h4>No service group context found</h4><%
}
%>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Copied: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewphases.jsp (from r1745637, axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewphases.jsp?p2=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewphases.jsp&p1=axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp&r1=1745637&r2=1745869&rev=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/WEB-INF/views/admin/viewphases.jsp Sat May 28 11:57:34 2016
@@ -20,7 +20,7 @@
org.apache.axis2.engine.Phase"%>
<%@ page import="java.util.List"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Available Phases</h1>
<%
PhasesInfo phases = (PhasesInfo)request.getSession().getAttribute(Constants.PHASE_LIST);
@@ -108,4 +108,4 @@
}
%>
</blockquote>
-<jsp:include page="include/adminfooter.jsp"/>
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error404.jsp Sat May 28 11:57:34 2016
@@ -21,7 +21,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
- <jsp:include page="../include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>Axis2 :: Resource not found!</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -60,4 +60,4 @@
</tr>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/Error/error500.jsp Sat May 28 11:57:34 2016
@@ -21,7 +21,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
- <jsp:include page="../include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>Axis2 :: Internal server error</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -61,4 +61,4 @@
</tr>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/HappyAxis.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/HappyAxis.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/HappyAxis.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/HappyAxis.jsp Sat May 28 11:57:34 2016
@@ -38,14 +38,14 @@
javax.xml.stream.XMLStreamException"
session="false" %>
<head>
- <jsp:include page="include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>Axis2 Happiness Page</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body>
-<jsp:include page="include/header.inc"/>
-<jsp:include page="include/link-footer.jsp"/>
+<jsp:include page="/WEB-INF/include/header.inc"/>
+<jsp:include page="/WEB-INF/include/link-footer.jsp"/>
<%IP = request.getRequestURL().toString();%>
<%!
/*
@@ -502,7 +502,7 @@
}
%>
-<jsp:include page="include/footer.inc"/>
+<jsp:include page="/WEB-INF/include/footer.inc"/>
</body>
</html>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/error.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/error.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/error.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/error.jsp Sat May 28 11:57:34 2016
@@ -19,7 +19,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@page isErrorPage="true" %>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<table summary="main content table">
<tr>
<td align="center">An error has occured!. Please check the details below</td>
@@ -28,4 +28,4 @@
<td align="center"><%=exception.getMessage()%></td>
</tr>
</table>
-<jsp:include page="include/adminfooter.jsp"/>
\ No newline at end of file
+<jsp:include page="/WEB-INF/include/adminfooter.jsp"/>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/index.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/index.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/index.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/index.jsp Sat May 28 11:57:34 2016
@@ -21,13 +21,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
- <jsp:include page="include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>Axis 2 - Home</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body>
- <jsp:include page="include/header.inc"/>
+ <jsp:include page="/WEB-INF/include/header.inc"/>
<br>
<h1>Welcome!</h1>
@@ -54,6 +54,6 @@
Console for administering this Axis2 installation.
</li>
</ul>
- <jsp:include page="include/footer.inc"/>
+ <jsp:include page="/WEB-INF/include/footer.inc"/>
</body>
</html>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp Sat May 28 11:57:34 2016
@@ -25,13 +25,13 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
- <jsp:include page="include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>List Single service</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body>
- <jsp:include page="include/header.inc"/>
- <jsp:include page="include/link-footer.jsp"/>
+ <jsp:include page="/WEB-INF/include/header.inc"/>
+ <jsp:include page="/WEB-INF/include/link-footer.jsp"/>
<%
String prifix = request.getAttribute("frontendHostUrl") + (String)request.getSession().getAttribute(Constants.SERVICE_PATH) +"services/";
%>
@@ -86,6 +86,6 @@
}
%>
-<jsp:include page="include/footer.inc"/>
+<jsp:include page="/WEB-INF/include/footer.inc"/>
</body>
</html>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp Sat May 28 11:57:34 2016
@@ -27,13 +27,13 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
- <jsp:include page="include/httpbase.jsp"/>
+ <jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>List Services</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body>
-<jsp:include page="include/adminheader.jsp"/>
+<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<h1>Available services</h1>
<%
String prefix = request.getAttribute("frontendHostUrl") + (String)request.getSession().getAttribute(Constants.SERVICE_PATH) +"/";
@@ -124,6 +124,6 @@ Engaged Modules for the Operation
<%
}
%>
-<jsp:include page="include/adminfooter.inc"/>
+<jsp:include page="/WEB-INF/include/adminfooter.inc"/>
</body>
</html>
Modified: axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp?rev=1745869&r1=1745868&r2=1745869&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp (original)
+++ axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listServices.jsp Sat May 28 11:57:34 2016
@@ -33,14 +33,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
-<jsp:include page="include/httpbase.jsp"/>
+<jsp:include page="/WEB-INF/include/httpbase.jsp"/>
<title>List Services</title>
<link href="axis2-web/css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body>
-<jsp:include page="include/header.inc"/>
-<jsp:include page="include/link-footer.jsp"/>
+<jsp:include page="/WEB-INF/include/header.inc"/>
+<jsp:include page="/WEB-INF/include/link-footer.jsp"/>
<h1>Available services</h1>
<% String prefix = request.getAttribute("frontendHostUrl") + (String)request.getSession().getAttribute(Constants.SERVICE_PATH) + "/";
%>
@@ -132,6 +132,6 @@
%> No services listed! Try hitting refresh. <%
}
%>
-<jsp:include page="include/footer.inc"/>
+<jsp:include page="/WEB-INF/include/footer.inc"/>
</body>
</html>