You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ma...@apache.org on 2003/11/05 16:39:09 UTC
cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts SecureLinkTool.java
marino 2003/11/05 07:39:09
Modified: src/java/org/apache/velocity/tools/struts
SecureLinkTool.java
Log:
javadoc fixes.
Revision Changes Path
1.5 +11 -9 jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java
Index: SecureLinkTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/SecureLinkTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecureLinkTool.java 15 Oct 2003 21:58:52 -0000 1.4
+++ SecureLinkTool.java 5 Nov 2003 15:39:09 -0000 1.5
@@ -139,7 +139,7 @@
return (SecureLinkTool)copyWith(computeURL(request, application, url));
}
- public String computeURL(HttpServletRequest request,
+ public String computeURL(HttpServletRequest request,
ServletContext app, String link)
{
StringBuffer url = new StringBuffer(link);
@@ -169,7 +169,7 @@
SecurePlugIn.getAppHttpsPort(app) : SecurePlugIn.getAppHttpPort(app);
// If scheme and port we are using do not match the ones we want
- if (!desiredScheme.equals(usingScheme) ||
+ if (!desiredScheme.equals(usingScheme) ||
!desiredPort.equals(usingPort))
{
url.insert(0, startNewUrlString(request, desiredScheme, desiredPort));
@@ -191,14 +191,15 @@
/**
* Finds the configuration definition for the specified action link
*
- * @param pageContext the current page context.
- * @param linkString The action we are searching for, specified as a
+ * @param request the current request.
+ * @param app the current ServletContext.
+ * @param linkString The action we are searching for, specified as a
* link. (i.e. may include "..")
- * @return The SecureActionConfig object entry for this action,
+ * @return The SecureActionConfig object entry for this action,
* or null if not found
*/
private static SecureActionConfig getActionConfig(HttpServletRequest request,
- ServletContext app,
+ ServletContext app,
String linkString)
{
ModuleConfig moduleConfig = StrutsUtils.selectModule(linkString, app);
@@ -241,7 +242,7 @@
}
// Unable to establish this link as an action, short circuit
- if (!(linkString.startsWith(prefix) &&
+ if (!(linkString.startsWith(prefix) &&
linkString.endsWith(suffix)))
{
return null;
@@ -255,7 +256,7 @@
linkString = "/" + linkString;
}
- SecureActionConfig secureConfig =
+ SecureActionConfig secureConfig =
(SecureActionConfig)moduleConfig.findActionConfig(linkString);
return secureConfig;
@@ -290,6 +291,7 @@
*
* @param url URL to be encoded with the session id
* @param sessionId Session id to be included in the encoded URL
+ * @return the specified URL with the specified session identifier suitably encoded
*/
public String toEncoded(String url, String sessionId)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org