Author: ajaquith
Date: Tue Aug 12 08:38:19 2008
New Revision: 685188
URL: http://svn.apache.org/viewvc?rev=685188&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685086.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/TranslatorReader.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormSelect.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/URLConstructor.java
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
Tue Aug 12 08:38:19 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
+ public static final String BUILD = "13";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/TranslatorReader.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/TranslatorReader.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/TranslatorReader.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/TranslatorReader.java
Tue Aug 12 08:38:19 2008
@@ -264,7 +264,7 @@
private StringReader m_data;
- /** [EMAIL PROTECTED]/
+ /** [EMAIL PROTECTED] */
public int read()
throws IOException
{
@@ -280,21 +280,21 @@
return m_data.read();
}
- /** [EMAIL PROTECTED]/
+ /** [EMAIL PROTECTED] */
public int read( char[] buf, int off, int len )
throws IOException
{
return m_data.read( buf, off, len );
}
- /** [EMAIL PROTECTED]/
+ /** [EMAIL PROTECTED] */
public boolean ready()
throws IOException
{
return m_data.ready();
}
- /** [EMAIL PROTECTED]/
+ /** [EMAIL PROTECTED] */
public void close()
{
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
Tue Aug 12 08:38:19 2008
@@ -2232,7 +2232,6 @@
/**
* @since 2.2.6
* @return the URL constructor
- * @deprecated
*/
public URLConstructor getURLConstructor()
{
@@ -2240,6 +2239,9 @@
}
/**
+ * Returns the RSSGenerator. If the property
<code>jspwiki.rss.generate</code>
+ * has not been set to <code>true</code>, this method will return
<code>null</code>,
+ * <em>and callers should check for this value.</em>
* @since 2.1.165
* @return the RSS generator
*/
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
Tue Aug 12 08:38:19 2008
@@ -97,6 +97,9 @@
/** Value specifying that the user wants to use the built-in JAAS-based
system */
public static final String SECURITY_JAAS = "jaas";
+ /** Whether logins should be throttled to limit brute-forcing attempts.
Defaults to true. */
+ public static final String PROP_LOGIN_THROTTLING =
"jspwiki.login.throttling";
+
protected static final Logger log =
Logger.getLogger( AuthenticationManager.class );
/** Prefix for LoginModule options key/value pairs. */
@@ -134,6 +137,8 @@
/** Static Boolean for lazily-initializing the "allows assertions" flag */
private boolean m_allowsCookieAssertions = true;
+ private boolean m_throttleLogins = true;
+
/** Static Boolean for lazily-initializing the "allows cookie
authentication" flag */
private boolean m_allowsCookieAuthentication = false;
@@ -175,6 +180,11 @@
PROP_ALLOW_COOKIE_AUTH,
false );
+ // Should we throttle logins? (default: yes)
+ m_throttleLogins = TextUtil.getBooleanProperty( props,
+ PROP_LOGIN_THROTTLING,
+ true );
+
// Look up the LoginModule class
String loginModuleClassName = TextUtil.getStringProperty( props,
PROP_LOGIN_MODULE, DEFAULT_LOGIN_MODULE );
try
@@ -348,7 +358,11 @@
return false;
}
- delayLogin(username);
+ // Protect against brute-force password guessing if configured to do so
+ if ( m_throttleLogins )
+ {
+ delayLogin(username);
+ }
UserManager userMgr = m_engine.getUserManager();
CallbackHandler handler = new WikiCallbackHandler(
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
Tue Aug 12 08:38:19 2008
@@ -30,6 +30,7 @@
import java.util.Set;
import javax.security.auth.Subject;
+import javax.security.auth.spi.LoginModule;
import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
@@ -583,11 +584,10 @@
}
/**
- * Verfies the JAAS configuration. The configuration is valid if value of
- * the system property <code>java.security.auth.login.config</code>
- * resolves to an existing file, and we can find the JAAS login
- * configurations for <code>JSPWiki-container</code> and
- * <code>JSPWiki-custom</code>.
+ * Verfies the JAAS configuration. The configuration is valid if value of
the
+ * <code>jspwiki.properties<code> property
+ * [EMAIL PROTECTED]
com.ecyrd.jspwiki.auth.AuthenticationManager#PROP_LOGIN_MODULE}
+ * resolves to a valid class on the classpath.
*/
protected final void verifyJaas()
{
@@ -596,13 +596,49 @@
if ( !authMgr.isJAASAuthorized() )
{
m_session.addMessage( ERROR_JAAS, "JSPWiki's JAAS-based
authentication " +
- "and authorization system is turned off (your
<code>jspwiki.properties</code> " +
+ "and authorization system is turned off (your
jspwiki.properties file " +
"contains the setting 'jspwiki.security = container'. This
" +
"setting disables authorization checks and is meant for
testing " +
"and troubleshooting only. The test results on this page
will not " +
"be reliable as a result. You should set this to 'jaas' " +
"so that security works properly." );
}
+
+ // Verify that the specified JAAS moduie corresponds to a class we can
load successfully.
+ String jaasClass = m_engine.getWikiProperties().getProperty(
AuthenticationManager.PROP_LOGIN_MODULE );
+ if ( jaasClass == null || jaasClass.length() == 0 )
+ {
+ m_session.addMessage( ERROR_JAAS, "The value of the '" +
AuthenticationManager.PROP_LOGIN_MODULE +
+ "' property was null or blank. This is a fatal error. This
value should be set to a valid LoginModule implementation " +
+ "on the classpath." );
+ return;
+ }
+
+ // See if we can find the LoginModule on the classpath
+ Class c = null;
+ try
+ {
+ m_session.addMessage( INFO_JAAS, "The property '" +
AuthenticationManager.PROP_LOGIN_MODULE +
+ "' specified the class '" + jaasClass + ".'"
);
+ c = Class.forName( jaasClass );
+ }
+ catch( ClassNotFoundException e )
+ {
+ m_session.addMessage( ERROR_JAAS, "We could not find the the class
'" + jaasClass + "' on the " +
+ "classpath. This is fatal error." );
+ }
+
+ // Is the specified class actually a LoginModule?
+ if ( LoginModule.class.isAssignableFrom( c ) )
+ {
+ m_session.addMessage( INFO_JAAS, "We found the the class '" +
jaasClass + "' on the " +
+ "classpath, and it is a LoginModule implementation. Good!"
);
+ }
+ else
+ {
+ m_session.addMessage( ERROR_JAAS, "We found the the class '" +
jaasClass + "' on the " +
+ "classpath, but it does not seem to be LoginModule implementation!
This is fatal error." );
+ }
}
/**
@@ -697,8 +733,9 @@
KeyStore ks = policy.getKeyStore();
if ( ks == null )
{
- m_session.addMessage( ERROR_POLICY,
- "Policy file does not have a keystore... at least not one
that we can locate." );
+ m_session.addMessage( WARNING_POLICY,
+ "Policy file does not have a keystore... at least not one
that we can locate. If your policy file " +
+ "does not contain any 'signedBy' blocks, this is probably
ok." );
}
else
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
Tue Aug 12 08:38:19 2008
@@ -31,8 +31,6 @@
import javax.servlet.http.HttpServletRequest;
-import net.sourceforge.stripes.mock.MockServletContext;
-
import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
@@ -389,12 +387,6 @@
else
{
url = m_engine.getServletContext().getResource( "/WEB-INF/web.xml"
);
- // Hack in case we're using Stripes mock servlet context
- // See bug [STS-376] at
http://stripesframework.org/jira/browse/STS-376. Will be fixed in Stripes 1.5.
- if ( url == null && m_engine.getServletContext() instanceof
MockServletContext )
- {
- url = m_engine.getServletContext().getResource(
"WEB-INF/web.xml" );
- }
if( url != null )
log.info( "Examining " + url.toExternalForm() );
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/WikiDavServlet.java
Tue Aug 12 08:38:19 2008
@@ -167,7 +167,6 @@
// Do the "sanitize url" trick
// String p = new String(req.getPathInfo().getBytes("ISO-8859-1"),
"UTF-8");
- req.setCharacterEncoding( m_engine.getContentEncoding() );
String p = req.getPathInfo();
DavPath path = new DavPath( p );
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java
Tue Aug 12 08:38:19 2008
@@ -122,7 +122,7 @@
String htmlWikiDiff = TextUtil.replaceEntities( rawWikiDiff );
if (m_traditionalColorization) //FIXME, see comment near
declaration...
- diff = colorizeDiff(diff);
+ diff = colorizeDiff(htmlWikiDiff);
else
diff = htmlWikiDiff;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormSelect.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormSelect.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormSelect.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormSelect.java
Tue Aug 12 08:38:19 2008
@@ -39,7 +39,7 @@
extends FormElement
{
/**
- * [EMAIL PROTECTED]
+ * [EMAIL PROTECTED]
*/
public String execute( WikiContext ctx, Map params )
throws PluginException
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
Tue Aug 12 08:38:19 2008
@@ -150,7 +150,8 @@
ResourceBundle rb =
context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
if( context.getVariable( VAR_ALREADY_PROCESSING ) != null )
- return rb.getString("tableofcontents.title");
+ //return rb.getString("tableofcontents.title");
+ return "<a href=\"#section-TOC\"
class=\"toc\">"+rb.getString("tableofcontents.title")+"</a>";
StringBuffer sb = new StringBuffer();
@@ -158,14 +159,18 @@
sb.append("<div class=\"collapsebox\">\n");
String title = (String) params.get(PARAM_TITLE);
+ sb.append("<h4 id=\"section-TOC\">");
if( title != null )
{
- sb.append("<h4>"+TextUtil.replaceEntities(title)+"</h4>\n");
+ //sb.append("<h4>"+TextUtil.replaceEntities(title)+"</h4>\n");
+ sb.append(TextUtil.replaceEntities(title));
}
else
{
- sb.append("<h4>"+rb.getString("tableofcontents.title")+"</h4>\n");
+
//sb.append("<h4>"+rb.getString("tableofcontents.title")+"</h4>\n");
+ sb.append(rb.getString("tableofcontents.title"));
}
+ sb.append("</h4>\n");
// should we use an ordered list?
m_usingNumberedList = false;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
Tue Aug 12 08:38:19 2008
@@ -107,13 +107,12 @@
prefs.put("TimeZone", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.timezone",
java.util.TimeZone.getDefault().getID() ) );
- /*
- prefs.put("TimeZone", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.timezone",
- Integer.toString(
java.util.TimeZone.getDefault().getRawOffset() )
- ) );
- */
+
prefs.put("Orientation", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.orientation", "fav-left" ) );
+ prefs.put("Language", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.language",
+ getLocale( ctx
).toString() ) );
+
// FIXME: "editor" property does not get registered, may be related
with http://bugs.jspwiki.org/show_bug.cgi?id=117
// disabling it until knowing why it's happening
// FIXME: editormanager reads jspwiki.editor -- which of both
properties should continue
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
Tue Aug 12 08:38:19 2008
@@ -138,10 +138,10 @@
*/
public static final String PROP_RSS_COPYRIGHT =
"jspwiki.rss.copyright";
- /** Just for compatibilty. [EMAIL PROTECTED] */
+ /** Just for compatibilty. @deprecated */
public static final String PROP_RSSAUTHOR = PROP_RSS_AUTHOR;
- /** Just for compatibilty. [EMAIL PROTECTED] */
+ /** Just for compatibilty. @deprecated */
public static final String PROP_RSSAUTHOREMAIL = PROP_RSS_AUTHOREMAIL;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/Installer.java
Tue Aug 12 08:38:19 2008
@@ -192,9 +192,6 @@
m_session.getLocale() );
m_validated = false;
- // Set request encoding
- m_request.setCharacterEncoding("UTF-8");
-
try
{
InputStream in = null;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
Tue Aug 12 08:38:19 2008
@@ -418,7 +418,7 @@
* List all installed i18n language properties
*
* @param pageContext
- * @return map of installed Languages (with help of Juan Pablo Santos
RodrÂ’guez)
+ * @return map of installed Languages (with help of Juan Pablo Santos
Rodriguez)
* @since 2.7.x
*/
public Map listLanguages(PageContext pageContext)
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
Tue Aug 12 08:38:19 2008
@@ -142,7 +142,7 @@
/**
* Goes through all types and writes the appropriate response.
*
- * @param wikiContext The action bean for the current context
+ * @param wikiContext The usual processing context
* @param string The source string
* @return The modified string with all the insertions in place.
*/
@@ -188,7 +188,7 @@
* were requested by any plugins or other components for this particular
* type.
*
- * @param wikiContext The action bean for the current context
+ * @param wikiContext The usual processing context
* @param string The source string
* @param type Type identifier for insertion
* @return The filtered string.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
Tue Aug 12 08:38:19 2008
@@ -118,7 +118,13 @@
return;
}
- if( m_engine.getBaseURL().length() == 0 &&
!((HttpServletRequest)request).getRequestURI().endsWith("Install.jsp") )
+ // If we haven't done so, wrap the request
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+
+ // Set the character encoding
+ httpRequest.setCharacterEncoding( m_engine.getContentEncoding() );
+
+ if( m_engine.getBaseURL().length() == 0 &&
!httpRequest.getRequestURI().endsWith("Install.jsp") )
{
PrintWriter out = response.getWriter();
@@ -135,8 +141,6 @@
return;
}
- // If we haven't done so, wrap the request and run the security filter
- HttpServletRequest httpRequest = (HttpServletRequest) request;
if ( !isWrapped( request ) )
{
// Prepare the WikiSession
@@ -155,9 +159,6 @@
throw new ServletException( e );
}
}
-
- // Set the character encoding
- httpRequest.setCharacterEncoding( m_engine.getContentEncoding() );
try
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
Tue Aug 12 08:38:19 2008
@@ -41,7 +41,6 @@
* WikiContext.VIEW points at "Wiki.jsp", etc.
*
* @since 2.2
- * @deprecated
*/
public class DefaultURLConstructor
implements URLConstructor
@@ -203,7 +202,6 @@
* @param parameters If null or empty, no parameters are added.
*
* [EMAIL PROTECTED]
- * @deprecated
*/
public String makeURL( String context,
String name,
@@ -237,14 +235,12 @@
* request.
*
* [EMAIL PROTECTED]
- * @deprecated
*/
public String parsePage( String context,
HttpServletRequest request,
String encoding )
throws UnsupportedEncodingException
{
- request.setCharacterEncoding( encoding );
String pagereq = request.getParameter( "page" );
if( context.equals(WikiContext.ATTACH) )
@@ -335,7 +331,6 @@
* @param request The HTTP Request that was used to end up in this page.
* @return "Wiki.jsp", "PageInfo.jsp", etc. Just return the name,
* JSPWiki will figure out the page.
- * @deprecated
*/
public String getForwardPage( HttpServletRequest request )
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
Tue Aug 12 08:38:19 2008
@@ -38,7 +38,6 @@
*
*
* @since 2.2
- * @deprecated
*/
public class ShortURLConstructor
extends DefaultURLConstructor
@@ -171,7 +170,6 @@
/**
* [EMAIL PROTECTED]
- * @deprecated
*/
public String makeURL( String context,
String name,
@@ -202,14 +200,12 @@
/**
* [EMAIL PROTECTED]
- * @deprecated
*/
public String parsePage( String context,
HttpServletRequest request,
String encoding )
throws UnsupportedEncodingException
{
- request.setCharacterEncoding( encoding );
String pagereq = request.getParameter( "page" );
if( pagereq == null )
@@ -222,7 +218,6 @@
/**
* [EMAIL PROTECTED]
- * @deprecated
*/
public String getForwardPage( HttpServletRequest req )
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java
Tue Aug 12 08:38:19 2008
@@ -33,7 +33,6 @@
*
*
* @since 2.2
- * @deprecated
*/
public class ShortViewURLConstructor
extends ShortURLConstructor
@@ -69,7 +68,6 @@
/**
* [EMAIL PROTECTED]
- * @deprecated
*/
public String makeURL( String context,
String name,
@@ -104,7 +102,6 @@
*
* @param request The HTTP Request that was used to end up in this page.
* @return always returns "Wiki.jsp"
- * @deprecated
*/
public String getForwardPage( HttpServletRequest request )
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/URLConstructor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/URLConstructor.java?rev=685188&r1=685187&r2=685188&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/URLConstructor.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/URLConstructor.java
Tue Aug 12 08:38:19 2008
@@ -34,7 +34,6 @@
* you would call makeURL( WikiContext.EDIT, "TextFormattingRules", false,
null );
*
* @since 2.2
- * @deprecated
*/
public interface URLConstructor
{
@@ -60,7 +59,6 @@
* @param parameters An URL parameter string (these must be URL-encoded,
and separated with &amp;)
* @return An URL pointing to the resource. Must never return null -
throw an InternalWikiException
* if something goes wrong.
- * @deprecated use the Stripes classes to make URLs
*/
public String makeURL( String context,
String name,
@@ -79,7 +77,6 @@
* @param request The HTTP request that was used when coming here
* @param encoding The encoding with which the request was made (UTF-8 or
ISO-8859-1).
* @return This method must return the name of the resource.
- * @deprecated callers should use Stripes ActionBean bindings to extract
the WIkiPage
* @throws IOException If parsing failes
*/
public String parsePage( String context,
@@ -94,7 +91,6 @@
* @param request The HTTP Request that was used to end up in this page.
* @return "Wiki.jsp", "PageInfo.jsp", etc. Just return the name,
* JSPWiki will figure out the page.
- * @deprecated callers should
*/
public String getForwardPage( HttpServletRequest request );
}
