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 2017/06/06 21:08:25 UTC
svn commit: r1797823 - in /axis/axis2/java/core/trunk:
modules/webapp/src/main/java/org/apache/axis2/webapp/
modules/webapp/src/main/webapp/WEB-INF/views/admin/
systests/webapp-tests/src/test/java/org/apache/axis2/webapp/
Author: veithen
Date: Tue Jun 6 21:08:25 2017
New Revision: 1797823
URL: http://svn.apache.org/viewvc?rev=1797823&view=rev
Log:
Fix invalid JSP syntax.
Modified:
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/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
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=1797823&r1=1797822&r2=1797823&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 Tue Jun 6 21:08:25 2017
@@ -71,6 +71,7 @@ final class AdminActions {
private static final String DEACTIVATE_SERVICE = "deactivateService";
private static final String ACTIVATE_SERVICE = "activateService";
private static final String EDIT_SERVICE_PARAMETERS = "editServiceParameters";
+ private static final String VIEW_OPERATION_SPECIFIC_CHAINS = "viewOperationSpecificChains";
/**
* Field LIST_MULTIPLE_SERVICE_JSP_NAME
@@ -447,6 +448,7 @@ final class AdminActions {
public View selectServiceParaEdit(HttpServletRequest req) {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "SERVICE_PARAMETER");
+ req.setAttribute("action", EDIT_SERVICE_PARAMETERS);
return new View(SELECT_SERVICE_JSP_NAME);
}
@@ -454,6 +456,7 @@ final class AdminActions {
public View listOperation(HttpServletRequest req) {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "MODULE");
+ req.setAttribute("action", ENGAGE_TO_OPERATION);
return new View(SELECT_SERVICE_JSP_NAME);
}
@@ -501,7 +504,7 @@ final class AdminActions {
return new View("viewGlobalChains.jsp");
}
- @Action(name="viewOperationSpecificChains")
+ @Action(name=VIEW_OPERATION_SPECIFIC_CHAINS)
public View viewOperationSpecificChains(HttpServletRequest req) throws AxisFault {
String service = req.getParameter("axisService");
@@ -624,7 +627,7 @@ final class AdminActions {
public View selectService(HttpServletRequest req) {
populateSessionInformation(req);
req.getSession().setAttribute(Constants.SELECT_SERVICE_TYPE, "VIEW");
-
+ req.setAttribute("action", VIEW_OPERATION_SPECIFIC_CHAINS);
return new View(SELECT_SERVICE_JSP_NAME);
}
}
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=1797823&r1=1797822&r2=1797823&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 Tue Jun 6 21:08:25 2017
@@ -27,31 +27,27 @@
<jsp:include page="/WEB-INF/include/adminheader.jsp"/>
<%
- String action ="";
String buttonName="" ;
String status = (String)request.getSession().getAttribute(Constants.SELECT_SERVICE_TYPE);
String heading = "";
String disc = "";
if(status != null && status.equals("MODULE")) {
- action = "engageToOperation";
buttonName = " View Operations";
heading = "Select a service to view operation specific chains";
disc = "Select an Axis service from the combo and click on the 'View Operations' button to view operation specific Chains.";
} else if(status != null && status.equals("VIEW")){
buttonName = " View ";
- action = "viewOperationSpecificChains";
heading = "Select a service to view service handlers";
disc = "Select an Axis service from the combo and click on the 'View' button to view service handlers.";
} else if (status != null && status.equals("SERVICE_PARAMETER")){
buttonName = " Edit Parameters ";
- action = "editServiceParameters"; // Constants.EDIR_SERVICE_PARA;
heading = "Select a Service to Edit Parameters";
disc = "Select an Axis service from the combo and click on the 'Edit Parameters' button to edit parameters.";
}
%>
<h1><%=heading%></h1>
<p><%=disc%></p>
-<form method="get" name="selectServiceForm" action="<c:url value="<%="axis2-admin/"+action%>"/>">
+<form method="get" name="selectServiceForm" action="<c:url value="axis2-admin/${requestScope.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/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java?rev=1797823&r1=1797822&r2=1797823&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java (original)
+++ axis/axis2/java/core/trunk/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java Tue Jun 6 21:08:25 2017
@@ -57,4 +57,12 @@ public class AxisAdminServletITCase {
tester.submit();
assertThat(tester.getSessionId()).isNotEqualTo(sessionId);
}
+
+ @Test
+ public void testEditServiceParameters() {
+ tester.clickLinkWithText("Edit Parameters");
+ tester.selectOption("axisService", "Version");
+ tester.clickButtonWithText(" Edit Parameters ");
+ tester.assertTextFieldEquals("Version_ServiceClass", "sample.axisversion.Version");
+ }
}