Author: ajaquith
Date: Fri Mar 19 12:17:18 2010
New Revision: 925197
URL: http://svn.apache.org/viewvc?rev=925197&view=rev
Log:
Minor fixes and doc tweaks.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiInterceptor.java
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=925197&r1=925196&r2=925197&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Fri Mar 19
12:17:18 2010
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "214";
+ public static final String BUILD = "215";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java?rev=925197&r1=925196&r2=925197&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java
Fri Mar 19 12:17:18 2010
@@ -90,7 +90,7 @@ public class DynamicAttachment extends J
String fileName,
DynamicAttachmentProvider provider)
{
- super(engine, WikiPath.valueOf( parentPage ).resolve( fileName ) );
+ super( engine, WikiPath.valueOf( parentPage ).resolve( fileName ) );
m_provider = provider;
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java?rev=925197&r1=925196&r2=925197&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
Fri Mar 19 12:17:18 2010
@@ -366,8 +366,8 @@ public class RenderingManager implements
Collection<WikiPath> referringPages =
m_engine.getReferenceManager().getReferredBy(pageName);
//
- // Flush also those pages that refer to this page (if an
nonexistant page
- // appears; we need to flush the HTML that refers to the
now-existant page
+ // Flush also those pages that refer to this page (if an
non-existent page
+ // appears; we need to flush the HTML that refers to the
now-existent page
//
if( referringPages != null )
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java?rev=925197&r1=925196&r2=925197&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
Fri Mar 19 12:17:18 2010
@@ -93,7 +93,6 @@ public class TemplateManager extends Mod
* {...@link #DEFAULT_TEMPLATE} will be used for all resource requests.</p>
* <p>Note that because the resource resolver is stashed as a
ServletContext
* attribute, it is (effectively) lazily initialized once per
ServletContext.
- * The stashed resolver is
* @param context the servlet context
* @return the unmodifiable map
*/
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiInterceptor.java?rev=925197&r1=925196&r2=925197&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiInterceptor.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiInterceptor.java
Fri Mar 19 12:17:18 2010
@@ -30,6 +30,7 @@ import java.util.Properties;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
import net.sourceforge.stripes.action.ActionBean;
@@ -142,6 +143,11 @@ public class WikiInterceptor implements
{
case RequestInit: {
HttpServletRequest request =
context.getActionBeanContext().getRequest();
+ HttpServletResponse response =
context.getActionBeanContext().getResponse();
+
+ // Add Microsoft security headers: see
http://blogs.msdn.com/ie/archive/2009/01/27/ie8-security-part-vii-clickjacking-defenses.aspx
+ response.addHeader( "X-FRAME-OPTIONS", "DENY" );
+
WikiEngine engine = ((WikiActionBeanContext)
context.getActionBeanContext()).getEngine();
MDC.put( engine.getApplicationName() + ":" +
request.getRequestURI(), "WikiInterceptor" );
break;
