Author: jalkanen
Date: Tue Dec 1 22:49:05 2009
New Revision: 885987
URL: http://svn.apache.org/viewvc?rev=885987&view=rev
Log:
Switched to use page.getContentAsString().
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/DefaultAclManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=885987&r1=885986&r2=885987&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
Tue Dec 1 22:49:05 2009
@@ -195,7 +195,7 @@
{
// Load the page text
WikiEngine engine = getContext().getEngine();
- setWikiText( engine.getPureText( getPage() ) );
+ setWikiText( getPage().getContentAsString() );
// Init edit fields and forward to the display JSP
initEditFields( "Editing" );
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/DefaultAclManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/DefaultAclManager.java?rev=885987&r1=885986&r2=885987&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/DefaultAclManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/DefaultAclManager.java
Tue Dec 1 22:49:05 2009
@@ -202,20 +202,20 @@
public void setPermissions( WikiPage page, Acl acl ) throws
WikiSecurityException
{
// Remove all of the existing ACLs.
- String pageText = m_engine.getPureText( page );
- Matcher matcher = DefaultAclManager.ACL_PATTERN.matcher( pageText );
- String cleansedText = matcher.replaceAll( "" );
- page.setAcl( acl );
- if ( pageText != null && !pageText.equals( cleansedText ) )
+ try
{
- try
+ String pageText = page.getContentAsString();
+ Matcher matcher = DefaultAclManager.ACL_PATTERN.matcher( pageText
);
+ String cleansedText = matcher.replaceAll( "" );
+ page.setAcl( acl );
+ if ( pageText != null && !pageText.equals( cleansedText ) )
{
page.setContent( cleansedText );
}
- catch ( ProviderException e )
- {
- throw new WikiSecurityException( "Could not set Acl. Reason:
ProviderException " + e.getMessage(), e );
- }
+ }
+ catch ( ProviderException e )
+ {
+ throw new WikiSecurityException( "Could not set Acl. Reason:
ProviderException " + e.getMessage(), e );
}
}
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java?rev=885987&r1=885986&r2=885987&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java
Tue Dec 1 22:49:05 2009
@@ -33,6 +33,7 @@
import org.apache.wiki.api.WikiException;
import org.apache.wiki.api.WikiPage;
import org.apache.wiki.content.PageAlreadyExistsException;
+import org.apache.wiki.content.PageNotFoundException;
import org.apache.wiki.content.WikiPath;
import org.apache.wiki.filters.RedirectException;
import org.apache.wiki.log.Logger;
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java?rev=885987&r1=885986&r2=885987&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java Tue
Dec 1 22:49:05 2009
@@ -32,6 +32,7 @@
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.content.WikiPath;
+import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.util.TextUtil;
@@ -165,9 +166,18 @@
WikiContext includedContext = (WikiContext) context.clone();
includedContext.setPage( page );
- String pageData = engine.getPureText( page );
+ String pageData;
+
+ try
+ {
+ pageData = page.getContentAsString();
+ }
+ catch( ProviderException e )
+ {
+ pageData = "";
+ }
String moreLink = "";
-
+
if( section != -1 )
{
try
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java?rev=885987&r1=885986&r2=885987&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
Tue Dec 1 22:49:05 2009
@@ -33,6 +33,7 @@
import org.apache.wiki.parser.Heading;
import org.apache.wiki.parser.HeadingListener;
import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.util.TextUtil;
@@ -216,7 +217,7 @@
try
{
- String wikiText = engine.getPureText( page );
+ String wikiText = page.getContentAsString();
boolean runFilters =
"true".equals(engine.getVariableManager().getValue(context,WikiEngine.PROP_RUNFILTERS,"true"));
@@ -245,6 +246,11 @@
log.error("Could not construct table of contents", e);
throw new PluginException( rb.getString(
"tableofcontents.unable.construct" ) );
}
+ catch( ProviderException e )
+ {
+ log.error("Could not construct table of contents", e);
+ throw new PluginException( rb.getString(
"tableofcontents.unable.construct" ) );
+ }
sb.append("</div>\n</div>\n");
