Author: ajaquith
Date: Tue Oct 14 09:08:58 2008
New Revision: 704572
URL: http://svn.apache.org/viewvc?rev=704572&view=rev
Log:
[JSPWIKI-313] ShortURLConstructor was not creating URLs for the LOGIN context
correctly. We now check for this context specifically.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenameProfile.html
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=704572&r1=704571&r2=704572&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Oct 14 09:08:58 2008
@@ -1,6 +1,13 @@
-2008-10-01 Andrew Jaquith <ajaquith AT apache DOT org>
+2008-10-14 Andrew Jaquith <ajaquith AT apache DOT org>
- * 2.8.0-beta-18
+ * 2.8.0-beta-20
+
+ * [JSPWIKI-313] ShortURLConstructor was not creating URLs for the LOGIN
+ context correctly. We now check for this context specifically.
+
+2008-10-13 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 2.8.0-beta-19
* [JSPWiki-342] Resolved issue by removing outdated doc files.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=704572&r1=704571&r2=704572&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Tue Oct 14
09:08:58 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "19";
+ public static final String BUILD = "20";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java?rev=704572&r1=704571&r2=704572&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
Tue Oct 14 09:08:58 2008
@@ -126,7 +126,8 @@
}
else if( context.equals(WikiContext.LOGIN) )
{
- return doReplacement( viewurl+"?do=Login", name, absolute );
+ String loginUrl = absolute ? "%uLogin.jsp?redirect=%n" :
"%pLogin.jsp?redirect=%n";
+ return doReplacement( loginUrl, name, absolute );
}
else if( context.equals(WikiContext.DELETE) )
{
Modified:
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenameProfile.html
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenameProfile.html?rev=704572&r1=704571&r2=704572&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenameProfile.html
(original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/RenameProfile.html Tue
Oct 14 09:08:58 2008
@@ -47,7 +47,7 @@
<tr><td>store</td> <td>${baseUrl}/Logout.jsp</td>
<td>logouturl</td></tr>
<tr><td>store</td> <td>This page was created with an ACL by
${user}</td> <td>PageContent</td></tr>
- <tr><td rowspan="1" colspan="3"> Create a new user and group (and log
in)<br/></td></tr>
+ <tr><td rowspan="1" colspan="3"> Create a new user and group (and log
in) -- at the moment, this ALWAYS fails for container-managed
tests.<br/></td></tr>
<tr><td>open</td> <td>${loginurl}?tab=profile</td>
<td> </td></tr>
<tr><td>type</td> <td>loginname</td> <td>${user}</td></tr>
<tr><td>type</td> <td>password</td> <td>password</td></tr>
