Fixing bpel/humantask ui management console link issues for product EI

wso2 · Jan 31, 2017 · b37ab99 · b37ab99
1 parent 3b5388f
commit b37ab99
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 22 deletions.
diff --git a/...onents/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/BpelUIUtil.java b/...onents/bpel/org.wso2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/BpelUIUtil.java
@@ -227,8 +227,7 @@ public static String getRetireLink(String pid, String filter, String order, int
         } catch (UnsupportedEncodingException e) {
             log.error("Error encoding the url " + pid + e);
         }
-        String link = "process_list.jsp?operation=retire&processID=" + encodedPid + "&filter=" + filter +
-                "&order=" + order + "&pageNumber=" + pageNumber + "&retiredPackageName=" + packageName;
+        String link = "process_list.jsp?operation=retire&processID=" + encodedPid + "&pageNumber=" + pageNumber + "&retiredPackageName=" + packageName;
 
         return link;
     }
@@ -241,8 +240,7 @@ public static String getActivateLink(String pid, String filter, String order, in
             log.error("Error encoding the url " + pid + e);
         }
 
-        String link = "process_list.jsp?operation=activate&processID=" + encodedPid + "&filter=" + filter +
-                "&order=" + order + "&pageNumber=" + pageNumber;
+        String link = "process_list.jsp?operation=activate&processID=" + encodedPid  + "&pageNumber=" + pageNumber;
 
         return link;
     }
@@ -469,12 +467,14 @@ public static int getTotalInstance(ProcessInfoType processInfo) {
         return totalInstances;
     }
 
-    public static String getInstanceFilterURL(String processId) {
+    public static String getInstanceFilterURL(String processId) throws UnsupportedEncodingException {
         StringBuilder strBuilder = new StringBuilder();
         strBuilder.append("list_instances.jsp?filter=pid=");
         strBuilder.append(processId);
-        strBuilder.
-                append(" status=active|completed|suspended|terminated|failed|error&order=-last-active");
+        strBuilder.append("%20status=active");
+        String encodedFilter = URLEncoder.encode("|completed|suspended|terminated|failed|error", "UTF-8");
+        strBuilder.append(encodedFilter);
+        strBuilder.append("&order=-last-active");
 
         return strBuilder.toString();
     }

diff --git a/...so2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/DeploymentDescriptorUpdater.java b/...so2.carbon.bpel.ui/src/main/java/org/wso2/carbon/bpel/ui/DeploymentDescriptorUpdater.java
@@ -150,7 +150,10 @@ public void setPropertyList(PropertyListType propertyList) {
     }
 
     public ScopeEventType[] getScopeEvents() {
-        return Arrays.copyOf(scopeEvents, scopeEvents.length);
+        if(scopeEvents !=null) {
+            return Arrays.copyOf(scopeEvents, scopeEvents.length);
+        }
+        return null;
     }
 
     public void setScopeEvents(ScopeEventType[] scopeEvents) {

diff --git a/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/instance_view.jsp b/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/instance_view.jsp
@@ -30,6 +30,7 @@
 <%@ page import="java.util.Comparator" %>
 <%@ page import="javax.xml.namespace.QName" %>
 <%@ page import="org.wso2.carbon.bpel.stub.mgt.*" %>
+<%@ page import="java.net.URLEncoder" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
 
@@ -347,7 +348,7 @@
     if (isAuthenticatedForInstanceMonitor || isAuthenticatedForProcessManagement) {
 %>
                                         <td>
-                                            <a href="process_info.jsp?Pid=<%=instanceInfo.getPid()%>"><%=instanceInfo.getPid()%>
+                                            <a href="process_info.jsp?Pid=<%=URLEncoder.encode(instanceInfo.getPid(),"UTF-8")%>"><%=instanceInfo.getPid()%>
                                             </a>
                                         </td>
 <%

diff --git a/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/list_instances.jsp b/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/list_instances.jsp
@@ -31,6 +31,7 @@
 <%@ page import="org.wso2.carbon.bpel.ui.InstanceFilterUtil" %>
 <%@ page import="org.apache.commons.httpclient.HttpStatus" %>
 <%@ page import="org.wso2.carbon.bpel.ui.InstanceFilter" %>
+<%@ page import="java.net.URLEncoder" %>
 <%@ page import="org.wso2.carbon.businessprocesses.common.utils.CharacterEncoder" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
@@ -821,7 +822,7 @@
     <tr>
         <td><a href="instance_view.jsp?iid=<%=instanceInfo.getIid()%>"><%=instanceInfo.getIid()%>
         </a></td>
-        <td><a href="process_info.jsp?Pid=<%=instanceInfo.getPid()%>"><%=instanceInfo.getPid()%>
+        <td><a href="process_info.jsp?Pid=<%=URLEncoder.encode(instanceInfo.getPid(),"UTF-8")%>"><%=instanceInfo.getPid()%>
         </td>
         <td><%=failedActivity.getActivityID()%>
         </td>
@@ -870,7 +871,7 @@
         <%
             if (isAuthenticatedForProcessManagement || isAuthenticatedForInstanceMonitor) {
         %>
-        <td><a href="process_info.jsp?Pid=<%=instanceInfo.getPid()%>"><%=instanceInfo.getPid()%>
+        <td><a href="process_info.jsp?Pid=<%=URLEncoder.encode(instanceInfo.getPid(),"UTF-8")%>"><%=instanceInfo.getPid()%>
         </a></td>
         <%
         } else {

diff --git a/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/package_dashboard.jsp b/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/package_dashboard.jsp
@@ -10,6 +10,7 @@
 <%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
 <%@ page import="org.wso2.carbon.utils.ServerConstants" %>
 <%@ page import="java.io.File" %>
+<%@ page import="java.net.URLEncoder" %>
 <%@ page import="org.wso2.carbon.registry.core.RegistryConstants" %>
 <%@ page import="org.wso2.carbon.businessprocesses.common.utils.CharacterEncoder" %>
 <!--
@@ -237,7 +238,7 @@
                         <tbody>
                         <tr>
                             <td>
-                                <a href="./process_info.jsp?Pid=<%=processInfo.getPid()%>"><%=processInfo.getPid()%>
+                                <a href="./process_info.jsp?Pid=<%=URLEncoder.encode(processInfo.getPid(),"UTF-8")%>"><%=processInfo.getPid()%>
                                 </a>
 
                             </td>

diff --git a/...nts/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/process_basic_info_frame.jsp b/...nts/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/process_basic_info_frame.jsp
@@ -1,5 +1,6 @@
 <%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
 <%@ page import="org.wso2.carbon.bpel.ui.BpelUIUtil" %>
+<%@ page import="java.net.URLEncoder" %>
 <%@ page import="org.wso2.carbon.businessprocesses.common.utils.CharacterEncoder" %>
 <!--
  ~ Copyright (c) 2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
@@ -67,10 +68,10 @@
 <%
             if (processStatus.toUpperCase().equals("ACTIVE")) {
 %>
-            <a href="<%=BpelUIUtil.generateRetireLinkForProcessInfoPage(processID)%>" id="process_det_ret"
+            <a href="<%=BpelUIUtil.generateRetireLinkForProcessInfoPage(URLEncoder.encode(processID,"UTF-8"))%>" id="process_det_ret"
                class="bpel-icon-link registryWriteOperation"
                style="background-image:url(images/deactivate.gif);"><fmt:message key="retire"/></a>
-            <a href="<%=BpelUIUtil.generateRetireLinkForProcessInfoPage(processID)%>" id="process_det_ret"
+            <a href="<%=BpelUIUtil.generateRetireLinkForProcessInfoPage(URLEncoder.encode(processID,"UTF-8"))%>" id="process_det_ret"
                class="bpel-icon-link registryNonWriteOperation"
                style="background-image:url(images/deactivate.gif);color:#777;cursor:default;"
                onclick="return false"><fmt:message key="retire"/></a>
@@ -92,10 +93,10 @@
 <%
             } else if (processOlderVersion.equals("0")){
 %>
-            <a href="<%=BpelUIUtil.generateActivateLinkForProcessInfoPage(processID)%>" id="process_det_act"
+            <a href="<%=BpelUIUtil.generateActivateLinkForProcessInfoPage(URLEncoder.encode(processID,"UTF-8"))%>" id="process_det_act"
                class="bpel-icon-link registryWriteOperation"
                style="background-image:url(images/activate.gif);"><fmt:message key="activate"/></a>
-            <a href="<%=BpelUIUtil.generateActivateLinkForProcessInfoPage(processID)%>" id="process_det_act"
+            <a href="<%=BpelUIUtil.generateActivateLinkForProcessInfoPage(URLEncoder.encode(processID,"UTF-8"))%>" id="process_det_act"
                class="bpel-icon-link registryNonWriteOperation"
                style="background-image:url(images/activate.gif);color:#777;cursor:default;"
                onclick="return false"><fmt:message key="activate"/></a>
@@ -130,7 +131,7 @@
     </tr>
     <tr>
         <td width="30%"><fmt:message key="total.instances"/></td>
-         <td><a href="<%=BpelUIUtil.getInstanceFilterURL(processID)%>"><%= noOfInstances%></a>
+         <td><a href="<%=BpelUIUtil.getInstanceFilterURL(URLEncoder.encode(processID,"UTF-8"))%>"><%= noOfInstances%></a>
         </td>
     </tr>
     <tr>
@@ -141,7 +142,7 @@
     <tr>
         <td width="30%"><fmt:message key="deployment.information"/></td>
         <% if (processStatus.toUpperCase().equals("ACTIVE")) { %>
-            <td><a href="./deployment_descriptor_editor.jsp?Pid=<%=processID%>">View Deployment Descriptor</a></td>
+            <td><a href="./deployment_descriptor_editor.jsp?Pid=<%=URLEncoder.encode(processID,"UTF-8")%>">View Deployment Descriptor</a></td>
         <% } else { %>
             <td>View Deployment Descriptor</td>
         <% } %>

diff --git a/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/process_info.jsp b/components/bpel/org.wso2.carbon.bpel.ui/src/main/resources/web/bpel/process_info.jsp
@@ -31,6 +31,7 @@
     <%@ page import="java.util.HashMap" %>
     <%@ page import="java.util.Map" %>
     <%@ page import="java.util.TreeMap" %>
+    <%@ page import="java.net.URLEncoder" %>
     <%@ page import="org.wso2.carbon.businessprocesses.common.utils.CharacterEncoder" %>
     <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
     <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
@@ -187,7 +188,7 @@
 
         jQuery(document).ready(function() {
             //BPEL.process.drawInstanceSummaryGraph();
-            BPEL.summary.drawInstanceSummary("<%=processInfo.getPid()%>", "process-instance-summary")
+            BPEL.summary.drawInstanceSummary("<%=URLEncoder.encode(processInfo.getPid(),"UTF-8")%>", "process-instance-summary")
             var wid = jQuery("#process-details").width();
             jQuery("#process-definition").width(wid);
             jQuery("#bpel2svg").width(wid - 2);
@@ -682,8 +683,9 @@
                             </thead>
                             <tr>
                                 <td>
+                                 <% String imageProcessId = URLEncoder.encode(processID,"UTF-8"); %>
                                     <div id="bpel2svg" style="height:auto;text-align:center;">
-                                            <%="<img src=../png?pid=" + processID + " />"%>
+                                            <%="<img src=../png?pid=" + imageProcessId + " />"%>
                                     </div>
                                 </td>
                             </tr>

diff --git a/...g.wso2.carbon.humantask.ui/src/main/resources/web/humantask/humantask_definition_list.jsp b/...g.wso2.carbon.humantask.ui/src/main/resources/web/humantask/humantask_definition_list.jsp
@@ -6,6 +6,7 @@
 <%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
 <%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
 <%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="java.net.URLEncoder" %>
 <%@ page import="org.wso2.carbon.humantask.stub.mgt.types.TaskDefinition_type0" %>
 <%@ page import="org.wso2.carbon.humantask.stub.mgt.types.UndeployStatus_type0" %>
 <%@ page import="org.wso2.carbon.humantask.stub.mgt.types.TaskStatusType" %>
@@ -209,7 +210,7 @@
                                     if (!TaskStatusType.UNDEPLOYING.equals(taskDef.getState())) {
                                 %>
 
-                                <a href="./task_definition_info.jsp?taskDefId=<%=taskDef.getTaskName()%>"><%=taskDef.getTaskName()%>
+                                <a href="./task_definition_info.jsp?taskDefId=<%=URLEncoder.encode(taskDef.getTaskName(),"UTF-8")%>"><%=taskDef.getTaskName()%>
                                 </a>
 
                                 <%

diff --git a/...wso2.carbon.humantask.ui/src/main/resources/web/humantask/humantask_package_dashboard.jsp b/...wso2.carbon.humantask.ui/src/main/resources/web/humantask/humantask_package_dashboard.jsp
@@ -7,6 +7,7 @@
 <%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
 <%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
 <%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="java.net.URLEncoder" %>
 <%@ page import="org.wso2.carbon.businessprocesses.common.utils.CharacterEncoder" %>
 <!--
 ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
@@ -199,7 +200,7 @@
                         %>
                         <tr>
                             <td>
-                                <a href="./task_definition_info.jsp?taskDefId=<%=aTaskDefinitionsInPackage.getName()%>">
+                                <a href="./task_definition_info.jsp?taskDefId=<%=URLEncoder.encode(aTaskDefinitionsInPackage.getName(),"UTF-8")%>">
                                     <%=aTaskDefinitionsInPackage.getName()%>
                                 </a>