Author: veithen
Date: Sat May 28 00:05:59 2016
New Revision: 1745826
URL: http://svn.apache.org/viewvc?rev=1745826&view=rev
Log:
Implement URL rewriting in the admin console so that it works with session
cookies disabled.
Added:
axis/axis2/java/core/trunk/modules/webapp/conf/jetty.xml (with props)
Removed:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/TopFrame.jsp
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/adminheader.inc
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
axis/axis2/java/core/trunk/modules/webapp/pom.xml
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
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/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/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/include/adminheader.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/upload.jsp
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=1745826&r1=1745825&r2=1745826&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
Sat May 28 00:05:59 2016
@@ -56,7 +56,8 @@ public class AbstractAgent {
throws IOException, ServletException {
- String requestURI = httpServletRequest.getRequestURI();
+ // Don't use getRequestURI() here because it includes the session ID
+ String requestURI = httpServletRequest.getServletPath() +
httpServletRequest.getPathInfo();
String operation;
int i = requestURI.lastIndexOf('/');
Added: axis/axis2/java/core/trunk/modules/webapp/conf/jetty.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/conf/jetty.xml?rev=1745826&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/conf/jetty.xml (added)
+++ axis/axis2/java/core/trunk/modules/webapp/conf/jetty.xml Sat May 28
00:05:59 2016
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN"
"http://www.eclipse.org/jetty/configure.dtd";>
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <Get name="sessionHandler">
+ <Get name="sessionManager">
+ <!-- Disable session cookies so that we can test that the admin
console
+ implements URL rewriting correctly. -->
+ <Set name="usingCookies" type="boolean">false</Set>
+ </Get>
+ </Get>
+</Configure>
Propchange: axis/axis2/java/core/trunk/modules/webapp/conf/jetty.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=1745826&r1=1745825&r2=1745826&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sat May 28 00:05:59 2016
@@ -307,13 +307,14 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.22</version>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.1.16.v20140903</version>
<configuration>
<webXml>conf/web.xml</webXml>
+ <contextXml>conf/jetty.xml</contextXml>
<webAppConfig>
<contextPath>/axis2</contextPath>
- <baseResource
implementation="org.mortbay.resource.ResourceCollection">
+ <baseResource
implementation="org.eclipse.jetty.util.resource.ResourceCollection">
<resourcesAsCSV>src/main/webapp,${project.build.directory}/webResources</resourcesAsCSV>
</baseResource>
</webAppConfig>
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java?rev=1745826&r1=1745825&r2=1745826&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
Sat May 28 00:05:59 2016
@@ -109,11 +109,10 @@ public class AdminAgent extends Abstract
HttpServletResponse httpServletResponse)
throws IOException, ServletException {
- // We forward to login page if axis2 security is enabled
+ // Redirect to the login page if axis2 security is enabled
// and the user is not authorized
- // TODO Fix workaround for login test
- if (axisSecurityEnabled() &&
authorizationRequired(httpServletRequest)) {
- renderView(LOGIN_JSP_NAME, httpServletRequest,
httpServletResponse);
+ if (!httpServletRequest.getPathInfo().equals("/welcome") &&
axisSecurityEnabled() && authorizationRequired(httpServletRequest)) {
+ httpServletResponse.sendRedirect("welcome");
} else {
super.handle(httpServletRequest, httpServletResponse);
}
@@ -127,6 +126,10 @@ public class AdminAgent extends Abstract
// supported web operations
+ public void processWelcome(HttpServletRequest req, HttpServletResponse
res) throws IOException, ServletException {
+ renderView(LOGIN_JSP_NAME, req, res);
+ }
+
public void processUpload(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String hasHotDeployment =
@@ -208,6 +211,7 @@ public class AdminAgent extends Abstract
if (username.equals(adminUserName) && password.equals(adminPassword)) {
req.getSession().setAttribute(Constants.LOGGED, "Yes");
+ res.sendRedirect(res.encodeURL("index"));
renderView(ADMIN_JSP_NAME, req, res);
} else {
req.setAttribute("errorMessage", "Invalid auth credentials!");
Modified:
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/axis2-web/ActivateService.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/ActivateService.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisService,
java.util.Collection,
@@ -25,7 +26,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="include/adminheader.jsp"/>
<h1>Turn On Service</h1>
-<form method="get" name="serviceActivate" action="axis2-admin/activateService">
+<form method="get" name="serviceActivate" action="<c:url
value="axis2-admin/activateService"/>">
<table summary="main content table" width="100%" border="0">
<tr>
<td colspan="2" >
Modified:
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/axis2-web/EngageToServiceGroup.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/EngageToServiceGroup.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page contentType="text/html; charset=iso-8859-1" language="java"
import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisModule,
org.apache.axis2.description.AxisServiceGroup,
@@ -51,7 +52,7 @@
<p>No Axis service groups are present to be engaged.</p>
<%} else {
%>
-<form method="get" name="selectModuleForm"
action="axis2-admin/engageToServiceGroup">
+<form method="get" name="selectModuleForm" action="<c:url
value="axis2-admin/engageToServiceGroup"/>">
<table summary="main content table" border="0" width="100%"
cellspacing="1" cellpadding="1">
<tr>
<td>Select a Module :</td>
Modified:
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/axis2-web/InActivateService.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/InActivateService.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisService,
java.util.Collection,
@@ -25,7 +26,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="include/adminheader.jsp"/>
<h1>Deactivate Service</h1>
-<form method="get" name="serviceInActivate"
action="axis2-admin/deactivateService">
+<form method="get" name="serviceInActivate" action="<c:url
value="axis2-admin/deactivateService"/>">
<table summary="main content table" style="width: 100%" border="0">
<tr>
<td colspan="2" >
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp?rev=1745826&r1=1745825&r2=1745826&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants" %>
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.apache.axis2.context.ServiceContext" %>
@@ -49,7 +50,7 @@
</td>
<td>
- <a href="axis2-admin/upload">Upload Service</a>
+ <a href="<c:url value="axis2-admin/upload"/>">Upload Service</a>
</td>
</tr>
<tr>
@@ -62,7 +63,7 @@
</td>
<td >
- <a href="axis2-admin/listService">Available Services</a>
+ <a href="<c:url value="axis2-admin/listService"/>">Available Services</a>
</td>
</tr>
<tr>
@@ -70,7 +71,7 @@
</td>
<td >
- <a href="axis2-admin/listServiceGroups">Available Service Groups</a>
+ <a href="<c:url value="axis2-admin/listServiceGroups"/>">Available
Service Groups</a>
</td>
</tr>
<tr>
@@ -78,7 +79,7 @@
</td>
<td >
- <a href="axis2-admin/listModules">Available Modules</a>
+ <a href="<c:url value="axis2-admin/listModules"/>">Available Modules</a>
</td>
</tr>
<tr>
@@ -86,7 +87,7 @@
</td>
<td>
- <a href="axis2-admin/globalModules">Globally Engaged Modules</a>
+ <a href="<c:url value="axis2-admin/globalModules"/>">Globally Engaged
Modules</a>
</td>
</tr>
<tr>
@@ -94,7 +95,7 @@
</td>
<td >
- <a href="axis2-admin/listPhases">Available Phases</a>
+ <a href="<c:url value="axis2-admin/listPhases"/>">Available Phases</a>
</td>
</tr>
<tr>
@@ -107,7 +108,7 @@
</td>
<td>
- <a href="axis2-admin/viewGlobalHandlers">Global Chains</a>
+ <a href="<c:url value="axis2-admin/viewGlobalHandlers"/>">Global
Chains</a>
</td>
</tr>
<tr>
@@ -115,7 +116,7 @@
</td>
<td>
- <a href="axis2-admin/selectService">Operation Specific Chains</a>
+ <a href="<c:url value="axis2-admin/selectService"/>">Operation
Specific Chains</a>
</td>
</tr>
<tr>
@@ -128,7 +129,7 @@
</td>
<td>
- <a href="axis2-admin/engagingglobally">For all Services</a>
+ <a href="<c:url value="axis2-admin/engagingglobally"/>">For all
Services</a>
</td>
</tr>
<tr>
@@ -136,7 +137,7 @@
</td>
<td>
- <a href="axis2-admin/engageToServiceGroup">For a Service Group</a>
+ <a href="<c:url value="axis2-admin/engageToServiceGroup"/>">For a
Service Group</a>
</td>
</tr>
@@ -146,7 +147,7 @@
</td>
<td>
- <a href="axis2-admin/engageToService">For a Service</a>
+ <a href="<c:url value="axis2-admin/engageToService"/>">For a
Service</a>
</td>
</tr>
@@ -155,7 +156,7 @@
</td>
<td>
- <a href="axis2-admin/listOperation">For an Operation</a>
+ <a href="<c:url value="axis2-admin/listOperation"/>">For an
Operation</a>
</td>
</tr>
@@ -169,7 +170,7 @@
</td>
<td>
- <a href="axis2-admin/deactivateService">Deactivate Service</a>
+ <a href="<c:url value="axis2-admin/deactivateService"/>">Deactivate
Service</a>
</td>
</tr>
<tr>
@@ -177,7 +178,7 @@
</td>
<td>
- <a href="axis2-admin/activateService">Activate Service</a>
+ <a href="<c:url value="axis2-admin/activateService"/>">Activate
Service</a>
</td>
</tr>
<tr>
@@ -185,7 +186,7 @@
</td>
<td>
- <a href="axis2-admin/selectServiceParaEdit">Edit Parameters</a>
+ <a href="<c:url value="axis2-admin/selectServiceParaEdit"/>">Edit
Parameters</a>
</td>
</tr>
<tr>
@@ -198,7 +199,7 @@
</td>
<td>
- <a href="axis2-admin/listContexts">View Hierarchy</a>
+ <a href="<c:url value="axis2-admin/listContexts"/>">View Hierarchy</a>
</td>
</tr>
</table>
Modified:
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/axis2-web/ListServiceGroup.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/ListServiceGroup.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants" %>
<%@ page import="org.apache.axis2.description.AxisModule" %>
<%@ page import="org.apache.axis2.description.AxisService" %>
@@ -43,7 +44,7 @@
AxisService axisService = (AxisService) axisServiceIter.next();
String serviceName = axisService.getName();
%>
- <li><a style="color:blue"
href="axis2-admin/ListSingleService?serviceName=<%=serviceName%>">
+ <li><a style="color:blue" href="<c:url
value="axis2-admin/ListSingleService"><c:param name="serviceName"
value="<%=serviceName%>"/></c:url>">
<%=serviceName%></a></li>
<%
}
Modified:
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/axis2-web/SelectService.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/SelectService.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisService,
java.util.Collection,
@@ -50,7 +51,7 @@
%>
<h1><%=heading%></h1>
<p><%=disc%></p>
-<form method="get" name="selectServiceForm" action="axis2-admin/<%=action%>">
+<form method="get" name="selectServiceForm" action="<c:url
value="<%="axis2-admin/"+action%>"/>">
<table summary="main content table" border="0" style="width: 50%"
cellspacing="1" cellpadding="1">
<tr>
<td style="width: 35%">Select a Service :</td><td style="width:65%">
Modified:
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/axis2-web/ServiceParaEdit.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/ServiceParaEdit.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisOperation,
org.apache.axis2.description.AxisService,
@@ -26,7 +27,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="include/adminheader.jsp"/>
<h1>Edit Service Parameters</h1>
- <form method="get" name="editServicepara"
action="axis2-admin/editServicepara">
+ <form method="get" name="editServicepara" action="<c:url
value="axis2-admin/editServicepara"/>">
<%
AxisService axisService = (AxisService)request.getSession().
getAttribute(Constants.SERVICE);
Modified:
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/axis2-web/ViewContexts.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/ViewContexts.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants"%>
<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
<%@ page import="org.apache.axis2.context.ServiceContext"%>
@@ -39,8 +40,8 @@
String groupContextID = serviceGroupIds[i];
ServiceGroupContext groupContext =
configContext.getServiceGroupContext(groupContextID);
%>
- <li><%=groupContextID%><a style="color:blue"
href="axis2-admin/viewServiceGroupConetxt?TYPE=VIEW&ID=<%=groupContextID%>">
- View</a> <a style="color:red"
href="axis2-admin/viewServiceGroupConetxt?TYPE=DELETE&ID=<%=groupContextID%>">
+ <li><%=groupContextID%><a style="color:blue" href="<c:url
value="axis2-admin/viewServiceGroupConetxt"><c:param name="TYPE"
value="VIEW"/><c:param name="ID" value="<%=groupContextID%>"/></c:url>">
+ View</a> <a style="color:red" href="<c:url
value="axis2-admin/viewServiceGroupConetxt"><c:param name="TYPE"
value="DELETE"/><c:param name="ID" value="<%=groupContextID%>"/></c:url>">
Remove</a> </li>
<li>
@@ -51,7 +52,7 @@
ServiceContext serviceContext =
(ServiceContext)serviceContextItr.next();
String serviceConID = serviceContext.getAxisService().getName();
%>
- <li><%=serviceConID%><a style="color:blue"
href="axis2-admin/viewServiceContext?TYPE=VIEW&ID=<%=serviceConID%>&PID=<%=groupContextID%>">
+ <li><%=serviceConID%><a style="color:blue" href="<c:url
value="axis2-admin/viewServiceContext"><c:param name="TYPE"
value="VIEW"/><c:param name="ID" value="<%=serviceConID%>"/><c:param name="PID"
value="<%=groupContextID%>"/></c:url>">
View</a></li>
<%
}
Modified:
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/axis2-web/engagingglobally.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/engagingglobally.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisModule,
java.util.Collection,
@@ -33,7 +34,7 @@
and click on the "Engage" button. Any module that needs to place handlers
into the pre-dispatch
phase needs to be engaged globally.</p>
-<form method="get" name="selectModuleForm"
action="axis2-admin/engagingglobally">
+<form method="get" name="selectModuleForm" action="<c:url
value="axis2-admin/engagingglobally"/>">
<table summary="main content table" border="0" style="width:100%"
cellspacing="1" cellpadding="1">
<tr>
<td style="width: 15%">Select a Module :</td>
Modified:
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/axis2-web/engagingtoanoperation.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/engagingtoanoperation.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page contentType="text/html; charset=iso-8859-1" language="java"
import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisModule,
org.apache.axis2.description.AxisOperation,
@@ -36,7 +37,7 @@
<li>click "Engage".</li>
</ol>
-<form method="get" name="selectModuleForm" action="axis2-admin/listOperations">
+<form method="get" name="selectModuleForm" action="<c:url
value="axis2-admin/listOperations"/>">
<table summary="main content table" border="0" width="100%" cellspacing="1"
cellpadding="1">
<tr>
<td>
Modified:
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/axis2-web/engagingtoaservice.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/engagingtoaservice.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page contentType="text/html; charset=iso-8859-1" language="java"
import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisModule,
org.apache.axis2.description.AxisService,
@@ -39,7 +40,7 @@
<li>click "Engage".</li>
</ol>
-<form method="get" name="selectModuleForm"
action="axis2-admin/engageToService">
+<form method="get" name="selectModuleForm" action="<c:url
value="axis2-admin/engageToService"/>">
<table summary="main content table" border="0" width="100%"
cellspacing="1" cellpadding="1">
<tr>
<td>
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/adminheader.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/adminheader.jsp?rev=1745826&r1=1745825&r2=1745826&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/adminheader.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/adminheader.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants" %>
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.apache.axis2.context.ServiceContext" %>
@@ -76,6 +77,6 @@
<table summary="logout table" width="100%">
<tr>
<td align="right" colspan="2"><a href="#"
onclick="javascript:history.back();">Back</a> | <a
- href="axis2-admin/logout">Log out</a></td>
+ href="<c:url value="axis2-admin/logout"/>">Log out</a></td>
</tr>
</table>
Modified:
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/axis2-web/listService.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/listService.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<%@ page import="org.apache.axis2.Constants,
org.apache.axis2.description.AxisModule" %>
<%@ page import="org.apache.axis2.description.AxisOperation" %>
@@ -78,7 +79,7 @@
<p>Service Description : <%=serviceDescription%><br>
Service EPR : <%=prefix + axisService.getName()%><br>
Service Status : <%=axisService.isActive() ? "Active" : "InActive"%><br>
-Actions : <a
href="axis2-admin/deleteService?serviceName=<%=serviceName%>">Remove
Service</a></p><br>
+Actions : <a href="<c:url value="axis2-admin/deleteService"><c:param
name="serviceName" value="<%=serviceName%>"/></c:url>">Remove
Service</a></p><br>
<%
Collection engagedModules = axisService.getEngagedModules();
String moduleName;
@@ -95,7 +96,7 @@ Actions : <a href="axis2-admin/deleteSer
%>
<ul>
<% }
- %><li><%=moduleName%> :: <a
href="axis2-admin/disengageModule?type=service&serviceName=<%=serviceName%>&module=<%=moduleName%>">Disengage</a></li>
+ %><li><%=moduleName%> :: <a href="<c:url
value="axis2-admin/disengageModule"><c:param name="type"
value="service"/><c:param name="serviceName" value="<%=serviceName%>"/><c:param
name="module" value="<%=moduleName%>"/></c:url>">Disengage</a></li>
<%
}
@@ -134,7 +135,7 @@ Actions : <a href="axis2-admin/deleteSer
moduleName = moduleDecription.getName();
%>
<li>
- <%=moduleName%> :: <a
href="axis2-admin/disengageModule?type=operation&serviceName=<%=serviceName%>&operation=<%=axisOperation.getName().getLocalPart()%>&module=<%=moduleName%>">Disengage</a>
+ <%=moduleName%> :: <a href="<c:url
value="axis2-admin/disengageModule"><c:param name="type"
value="operation"/><c:param name="serviceName"
value="<%=serviceName%>"/><c:param name="operation"
value="<%=axisOperation.getName().getLocalPart()%>"/><c:param name="module"
value="<%=moduleName%>"/></c:url>">Disengage</a>
</li>
<%
}
Modified:
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/axis2-web/upload.jsp?rev=1745826&r1=1745825&r2=1745826&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/axis2-web/upload.jsp
Sat May 28 00:05:59 2016
@@ -17,6 +17,7 @@
~ under the License.
--%>
+<%@ 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"/>
<script type="text/javascript">
@@ -55,7 +56,7 @@ The following error occurred
</p>
<% } %>
-<form method="post" name="Axis2upload" id="Axis2upload"
action="axis2-admin/upload"
+<form method="post" name="Axis2upload" id="Axis2upload" action="<c:url
value="axis2-admin/upload"/>"
enctype="multipart/form-data">
<table summary="main content table">
<tr>
