Fix invalid JSP syntax.

veithen · veithen · commit e8d15d28f2ea · 2017-06-06T21:08:25.000Z
diff --git a/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java b/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
@@ -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,13 +448,15 @@ public View viewServiceContext(HttpServletRequest req) throws AxisFault {
     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);
     }
 
     @Action(name="listOperation")
     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 @@ public View viewGlobalChains(HttpServletRequest req) {
         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 @@ public Redirect deleteService(HttpServletRequest req) throws AxisFault {
     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);
     }
 }
diff --git a/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp b/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
@@ -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%">
diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
@@ -57,4 +57,12 @@ public void loginInvalidatesExistingSession() {
         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");
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,12 @@ public void loginInvalidatesExistingSession() {`
`57`	`57`	`tester.submit();`
`58`	`58`	`assertThat(tester.getSessionId()).isNotEqualTo(sessionId);`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ @Test`
	`62`	`+ public void testEditServiceParameters() {`
	`63`	`+ tester.clickLinkWithText("Edit Parameters");`
	`64`	`+ tester.selectOption("axisService", "Version");`
	`65`	`+ tester.clickButtonWithText(" Edit Parameters ");`
	`66`	`+ tester.assertTextFieldEquals("Version_ServiceClass", "sample.axisversion.Version");`
	`67`	`+ }`
`60`	`68`	`}`