Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Fri Apr 18 23:21:23 2014 @@ -196,8 +196,8 @@ <td class="separator" colspan="4"><hr/></td> </tr> <tr><td class="message" colspan="4"> - <nobr><a href='<%="viewauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a></nobr> - <nobr><a href='<%="editauthority.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a></nobr> + <nobr><a href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a></nobr> + <nobr><a href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Delete")%></a></nobr> </td></tr> </table>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp Fri Apr 18 23:21:23 2014 @@ -220,8 +220,8 @@ </tr> <tr> <td class="message" colspan="4"> - <nobr><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a></nobr> - <nobr><a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a></nobr> + <nobr><a href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a></nobr> + <nobr><a href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Delete")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:ClearHistory(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.ClearHistoryAssociatedWithThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ClearAllRelatedHistory")%></a></nobr> </td> Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp Fri Apr 18 23:21:23 2014 @@ -92,7 +92,7 @@ </tr> <tr> <td class="message" colspan="4"> - <a href='<%="editgroup.jsp?groupname="+java.net.URLEncoder.encode(groupName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Edit")%></a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Delete")%></a> + <a href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(groupName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Edit")%></a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Delete")%></a> </td> </tr> </table> Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewmapper.jsp Fri Apr 18 23:21:23 2014 @@ -177,8 +177,8 @@ <td class="separator" colspan="4"><hr/></td> </tr> <tr><td class="message" colspan="4"> - <nobr><a href='<%="viewmapper.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%></a></nobr> - <nobr><a href='<%="editmapper.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.EditThisMappingConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Edit")%></a></nobr> + <nobr><a href='<%="viewmapper.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%></a></nobr> + <nobr><a href='<%="editmapper.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.EditThisMappingConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Edit")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.DeleteThisMappingConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Delete")%></a></nobr> </td></tr> </table> Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp Fri Apr 18 23:21:23 2014 @@ -172,8 +172,8 @@ </tr> <tr> <td class="message" colspan="4"> - <nobr><a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%></a></nobr> - <nobr><a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.EditThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Edit")%></a></nobr> + <nobr><a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%></a></nobr> + <nobr><a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.EditThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Edit")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.DeleteThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Delete")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllAssociatedDocuments")%></a></nobr> <nobr><a href="javascript:void()" onclick='<%="javascript:RemoveAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllAssociatedDocuments")%></a></nobr> Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java (original) +++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java Fri Apr 18 23:21:23 2014 @@ -21,7 +21,7 @@ package org.apache.manifoldcf.crawler.sy import org.apache.manifoldcf.core.interfaces.*; import org.apache.manifoldcf.agents.interfaces.*; import org.apache.manifoldcf.crawler.interfaces.*; -import org.apache.manifoldcf.crawler.system.Logging; +import org.apache.manifoldcf.core.util.URLEncoder; import java.util.*; import java.io.*; import java.lang.reflect.*; @@ -2479,19 +2479,12 @@ public class WorkerThread extends Thread public String qualifyAccessToken(String authorityNameString, String accessToken) throws ManifoldCFException { - try - { if (authorityNameString == null) - return java.net.URLEncoder.encode(accessToken,"UTF-8"); - return java.net.URLEncoder.encode(authorityNameString,"UTF-8") + ":" + java.net.URLEncoder.encode(accessToken,"UTF-8"); - } - catch (java.io.UnsupportedEncodingException e) - { - throw new ManifoldCFException(e.getMessage(),e); - } + return URLEncoder.encode(accessToken); + else + return URLEncoder.encode(authorityNameString) + ":" + URLEncoder.encode(accessToken); } - } } Modified: manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java (original) +++ manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableConnectionName.java Fri Apr 18 23:21:23 2014 @@ -19,8 +19,7 @@ package org.apache.manifoldcf.scriptengine; -import java.io.*; -import java.net.*; +import org.apache.manifoldcf.core.util.URLEncoder; /** Variable class representing a ManifoldCF API URL connection name segment. In conjunction * with the URL variable, this variable will properly character-stuff the connection name to make @@ -91,14 +90,7 @@ public class VariableConnectionName exte public String getURLPathValue() throws ScriptException { - try - { - return URLEncoder.encode(encodedConnectionName,"utf-8").replace("+","%20"); - } - catch (UnsupportedEncodingException e) - { - throw new ScriptException(composeMessage(e.getMessage()),e); - } + return URLEncoder.encode(encodedConnectionName).replace("+","%20"); } /** Check if the variable has a string value */ Modified: manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableQueryArg.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableQueryArg.java?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableQueryArg.java (original) +++ manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableQueryArg.java Fri Apr 18 23:21:23 2014 @@ -19,8 +19,7 @@ package org.apache.manifoldcf.scriptengine; -import java.net.*; -import java.io.*; +import org.apache.manifoldcf.core.util.URLEncoder; /** Variable class representing a ManifoldCF query argument, with a name * and a value. @@ -107,15 +106,8 @@ public class VariableQueryArg extends Va public String getStringValue() throws ScriptException { - try - { - return URLEncoder.encode(name,"utf-8").replace("+","%20") + "=" + - URLEncoder.encode(value,"utf-8").replace("+","%20"); - } - catch (UnsupportedEncodingException e) - { - throw new ScriptException(composeMessage(e.getMessage()),e); - } + return URLEncoder.encode(name).replace("+","%20") + "=" + + URLEncoder.encode(value).replace("+","%20"); } @Override Modified: manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java?rev=1588591&r1=1588590&r2=1588591&view=diff ============================================================================== --- manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java (original) +++ manifoldcf/trunk/framework/script-engine/src/main/java/org/apache/manifoldcf/scriptengine/VariableString.java Fri Apr 18 23:21:23 2014 @@ -19,8 +19,7 @@ package org.apache.manifoldcf.scriptengine; -import java.net.*; -import java.io.*; +import org.apache.manifoldcf.core.util.URLEncoder; /** Variable class representing an integer. */ @@ -92,14 +91,7 @@ public class VariableString extends Vari public String getURLPathValue() throws ScriptException { - try - { - return URLEncoder.encode(value,"utf-8").replace("+","%20"); - } - catch (UnsupportedEncodingException e) - { - throw new ScriptException(composeMessage(e.getMessage()),e); - } + return URLEncoder.encode(value).replace("+","%20"); } /** Get the variable's script value */
