You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2008/12/21 13:14:03 UTC
svn commit: r728430 [3/3] - in
/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH: ./ lib/
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/action/
src/com/ecyrd/jspwiki/attachment/ src/com/ecyrd/jspwiki/auth/
src/com/ecyrd/jspwiki/auth/acl/ src/com/ecyrd/jspw...
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java Sun Dec 21 04:13:58 2008
@@ -26,6 +26,7 @@
import java.util.*;
import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
import com.ecyrd.jspwiki.providers.*;
import com.ecyrd.jspwiki.util.FileUtil;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java Sun Dec 21 04:13:58 2008
@@ -22,6 +22,8 @@
import java.util.Properties;
+import org.apache.jspwiki.api.WikiPage;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -29,7 +31,6 @@
import net.sourceforge.stripes.validation.ValidationErrors;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.auth.Users;
public class RenameActionBeanTest extends TestCase
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java Sun Dec 21 04:13:58 2008
@@ -22,13 +22,14 @@
import java.util.Properties;
+import org.apache.jspwiki.api.WikiPage;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import net.sourceforge.stripes.mock.MockRoundtrip;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiPage;
public class ViewActionBeanTest extends TestCase
{
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java Sun Dec 21 04:13:58 2008
@@ -37,11 +37,11 @@
import net.sourceforge.stripes.mock.MockRoundtrip;
import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiPage;
public class WikiContextFactoryTest extends TestCase
{
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Sun Dec 21 04:13:58 2008
@@ -30,7 +30,6 @@
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.content.WikiName;
import com.ecyrd.jspwiki.providers.ProviderException;
import com.ecyrd.jspwiki.util.FileUtil;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java Sun Dec 21 04:13:58 2008
@@ -31,6 +31,7 @@
import org.apache.commons.lang.ArrayUtils;
import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java Sun Dec 21 04:13:58 2008
@@ -25,6 +25,7 @@
import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiPage;
import junit.framework.TestCase;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java Sun Dec 21 04:13:58 2008
@@ -25,13 +25,13 @@
import java.util.regex.Matcher;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiPage;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
import com.ecyrd.jspwiki.providers.ProviderException;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/ContentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/ContentManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/ContentManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/ContentManagerTest.java Sun Dec 21 04:13:58 2008
@@ -7,10 +7,10 @@
import junit.framework.TestSuite;
import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiPage;
public class ContentManagerTest extends TestCase
{
@@ -33,7 +33,7 @@
protected void tearDown() throws Exception
{
WikiPage p = m_mgr.getPage( m_engine.createContext( null, WikiContext.VIEW ),
- "Main:TestPage" );
+ WikiName.valueOf("Main:TestPage") );
if( p != null ) m_mgr.deletePage( p );
@@ -49,7 +49,7 @@
{
String content = "Test Content";
WikiContext ctx = m_engine.createContext( null, WikiContext.VIEW );
- WikiPage page = m_mgr.addPage( ctx, "Main:TestPage", ContentManager.JSPWIKI_CONTENT_TYPE );
+ WikiPage page = m_mgr.addPage( ctx, WikiName.valueOf("Main:TestPage"), ContentManager.JSPWIKI_CONTENT_TYPE );
assertNotNull("WikiPage create", page);
@@ -57,7 +57,7 @@
page.save();
- WikiPage page2 = m_mgr.getPage( ctx, "Main:TestPage" );
+ WikiPage page2 = m_mgr.getPage( ctx, WikiName.valueOf("Main:TestPage") );
assertNotNull( "page2", page2 );
@@ -69,7 +69,7 @@
{
WikiContext ctx = m_engine.createContext( null, WikiContext.VIEW );
String content = "Test Content";
- WikiPage page = m_mgr.addPage( ctx, "TestPage", ContentManager.JSPWIKI_CONTENT_TYPE );
+ WikiPage page = m_mgr.addPage( ctx, WikiName.valueOf("TestPage"), ContentManager.JSPWIKI_CONTENT_TYPE );
assertNotNull("WikiPage create", page);
@@ -77,7 +77,7 @@
page.save();
- WikiPage page2 = m_mgr.getPage( ctx, "TestPage" );
+ WikiPage page2 = m_mgr.getPage( ctx, WikiName.valueOf("TestPage") );
assertNotNull( "page2", page2 );
@@ -87,7 +87,7 @@
public void testPaths() throws Exception
{
- assertEquals( "One", "/pages/Main/MainPage", ContentManager.getJCRPath( null, "Main:MainPage" ) );
+ assertEquals( "One", "/pages/Main/MainPage", ContentManager.getJCRPath( WikiName.valueOf("Main:MainPage") ) );
assertEquals( "Back", "Main:MainPage", ContentManager.getWikiPath( "/pages/Main/MainPage" ) );
}
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Sun Dec 21 04:13:58 2008
@@ -24,6 +24,7 @@
import java.util.Properties;
import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Sun Dec 21 04:13:58 2008
@@ -30,7 +30,6 @@
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.content.WikiName;
public class ContextualDiffProviderTest extends TestCase
{
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Sun Dec 21 04:13:58 2008
@@ -32,6 +32,7 @@
import javax.servlet.ServletException;
import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -42,6 +43,7 @@
import com.ecyrd.jspwiki.attachment.Attachment;
import com.ecyrd.jspwiki.content.WikiName;
import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
+import com.ecyrd.jspwiki.providers.ProviderException;
import com.ecyrd.jspwiki.render.XHTMLRenderer;
import com.ecyrd.jspwiki.util.TextUtil;
@@ -98,7 +100,7 @@
private String translate( String src )
throws IOException,
NoRequiredPropertyException,
- ServletException
+ ServletException, ProviderException
{
return translate( testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ), src );
}
@@ -106,7 +108,7 @@
private String translate( WikiEngine e, String src )
throws IOException,
NoRequiredPropertyException,
- ServletException
+ ServletException, ProviderException
{
return translate( e, e.createPage( WikiName.valueOf( PAGE_NAME ) ), src );
}
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/AllTests.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/AllTests.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/AllTests.java Sun Dec 21 04:13:58 2008
@@ -46,6 +46,7 @@
suite.addTest( TableOfContentsTest.suite() );
suite.addTest( UndefinedPagesPluginTest.suite() );
suite.addTest( DenouncePluginTest.suite() );
+ suite.addTest( ReferredPagesPluginTest.suite() );
return suite;
}
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java Sun Dec 21 04:13:58 2008
@@ -27,6 +27,8 @@
import javax.servlet.ServletException;
+import org.apache.jspwiki.api.WikiException;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -34,7 +36,6 @@
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.content.WikiName;
import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
import com.ecyrd.jspwiki.parser.MarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
@@ -65,8 +66,7 @@
private String translate( String src )
throws IOException,
- NoRequiredPropertyException,
- ServletException
+ ServletException, WikiException
{
WikiContext context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage( "TestPage" ) );
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java Sun Dec 21 04:13:58 2008
@@ -31,7 +31,6 @@
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.content.WikiName;
import com.ecyrd.jspwiki.plugin.PluginManager.WikiPluginInfo;
import com.ecyrd.jspwiki.providers.ProviderException;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java Sun Dec 21 04:13:58 2008
@@ -32,7 +32,6 @@
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.content.WikiName;
public class ReferringPagesPluginTest extends TestCase
{
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java Sun Dec 21 04:13:58 2008
@@ -29,6 +29,8 @@
import java.io.StringReader;
import java.util.*;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.util.FileUtil;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java Sun Dec 21 04:13:58 2008
@@ -22,12 +22,14 @@
import java.util.*;
+import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
+
+import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.search.QueryItem;
-import com.ecyrd.jspwiki.*;
-
/**
* A provider who counts the hits to different parts.
*/
@@ -47,7 +49,7 @@
String m_defaultText = "[Foo], [Bar], [Blat], [Blah]";
- public void initialize( WikiEngine engine, Properties props )
+ public void initialize( WikiEngine engine, Properties props ) throws WikiException
{
m_pages = new WikiPage[]
{ engine.createPage("Foo"),
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java Sun Dec 21 04:13:58 2008
@@ -25,6 +25,8 @@
import java.io.*;
import java.util.*;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.util.FileUtil;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Sun Dec 21 04:13:58 2008
@@ -24,6 +24,9 @@
import junit.framework.*;
import java.io.*;
import java.util.*;
+
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.util.FileUtil;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Sun Dec 21 04:13:58 2008
@@ -25,6 +25,8 @@
import java.io.*;
import java.util.*;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.util.FileUtil;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java Sun Dec 21 04:13:58 2008
@@ -21,7 +21,11 @@
package com.ecyrd.jspwiki.providers;
import java.util.*;
-import com.ecyrd.jspwiki.*;
+
+import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
+
+import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.search.QueryItem;
/**
@@ -87,10 +91,19 @@
m_latestReq = page;
m_latestVers = version;
- WikiPage p = m_engine.createPage( page );
- p.setVersion( 5 );
- p.setAuthor( AUTHOR );
- p.setLastModified( new Date(0L) );
+ WikiPage p = null;
+ try
+ {
+ p = m_engine.createPage( page );
+ p.setVersion( 5 );
+ p.setAuthor( AUTHOR );
+ p.setLastModified( new Date(0L) );
+ }
+ catch( WikiException e )
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
return p;
}
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java Sun Dec 21 04:13:58 2008
@@ -28,9 +28,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
@@ -46,7 +48,7 @@
super.setUp();
}
- private String render(String s) throws IOException
+ private String render(String s) throws IOException, WikiException
{
WikiPage dummyPage = m_testEngine.createPage("TestPage");
WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( dummyPage );
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java Sun Dec 21 04:13:58 2008
@@ -27,10 +27,10 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.jspwiki.api.WikiPage;
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.parser.MarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java Sun Dec 21 04:13:58 2008
@@ -28,9 +28,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.jspwiki.api.WikiException;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
@@ -55,7 +57,7 @@
TestEngine.deleteTestPage( "This Pagename Has Spaces" );
}
- private String render(String s) throws IOException
+ private String render(String s) throws IOException, WikiException
{
WikiPage dummyPage = m_testEngine.createPage("TestPage");
WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( dummyPage );
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java Sun Dec 21 04:13:58 2008
@@ -25,6 +25,8 @@
import com.ecyrd.jspwiki.attachment.Attachment;
import junit.framework.*;
import java.util.*;
+
+import org.apache.jspwiki.api.WikiPage;
import org.apache.xmlrpc.*;
import com.ecyrd.jspwiki.xmlrpc.RPCHandler;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestRCSProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestRCSProvider.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestRCSProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestRCSProvider.java Sun Dec 21 04:13:58 2008
@@ -24,6 +24,8 @@
import java.io.*;
import java.util.*;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.providers.*;
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestVersioningProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestVersioningProvider.java?rev=728430&r1=728429&r2=728430&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestVersioningProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/stress/StressTestVersioningProvider.java Sun Dec 21 04:13:58 2008
@@ -24,6 +24,8 @@
import java.io.*;
import java.util.*;
+import org.apache.jspwiki.api.WikiPage;
+
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.providers.*;