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 2009/02/01 19:04:50 UTC
svn commit: r739802 [13/13] - in /incubator/jspwiki/trunk: ./ doc/ etc/
etc/i18n/ etc/ini/ src/WebContent/ src/WebContent/WEB-INF/
src/WebContent/admin/ src/WebContent/scripts/
src/WebContent/templates/default/ src/WebContent/templates/default/admin/
s...
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.text.SimpleDateFormat;
import java.util.Properties;
@@ -28,10 +28,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.plugin.PluginManager;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
public class ReferringPagesPluginTest extends TestCase
{
@@ -96,7 +97,7 @@
WikiContext context2 = engine.getWikiContextFactory().newViewContext( engine.createPage( "Foobar" ) );
String res = manager.execute( context2,
- "{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE max=5}");
+ "{INSERT org.apache.wiki.plugin.ReferringPagesPlugin WHERE max=5}");
assertEquals( mkLink( "TestPage" )+"<br />",
res );
@@ -106,7 +107,7 @@
throws Exception
{
String res = manager.execute( context,
- "{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE max=5}");
+ "{INSERT org.apache.wiki.plugin.ReferringPagesPlugin WHERE max=5}");
int count = 0;
int index = -1;
@@ -137,7 +138,7 @@
WikiContext context2 = engine.getWikiContextFactory().newViewContext( engine.createPage( "Foobar" ) );
String res = manager.execute( context2,
- "{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE maxwidth=5}");
+ "{INSERT org.apache.wiki.plugin.ReferringPagesPlugin WHERE maxwidth=5}");
assertEquals( mkFullLink( "TestP...", "TestPage" )+"<br />",
res );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/SamplePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/SamplePlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/SamplePlugin.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/SamplePlugin.java Sun Feb 1 18:04:05 2009
@@ -18,15 +18,17 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Map;
-import org.apache.jspwiki.api.ModuleData;
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.ModuleData;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.parser.PluginContent;
+import org.apache.wiki.plugin.ParserStagePlugin;
+import org.apache.wiki.plugin.WikiPlugin;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.PluginContent;
/**
* Implements a simple plugin that just returns its text.
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java Sun Feb 1 18:04:05 2009
@@ -22,13 +22,13 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.WikiException;
-import com.ecyrd.jspwiki.TestEngine;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Properties;
@@ -27,10 +27,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.plugin.PluginManager;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
public class UndefinedPagesPluginTest extends TestCase
{
@@ -82,7 +83,7 @@
WikiContext context2 = engine.getWikiContextFactory().newViewContext( engine.createPage( "Foobar") );
String res = manager.execute( context2,
- "{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin");
+ "{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin");
String exp = "[Foobar 2]\\\\";
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java Sun Feb 1 18:04:05 2009
@@ -19,15 +19,17 @@
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import junit.framework.*;
import java.io.*;
import java.util.*;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.*;
-import com.ecyrd.jspwiki.util.FileUtil;
+import org.apache.wiki.*;
+import org.apache.wiki.attachment.*;
+import org.apache.wiki.providers.BasicAttachmentProvider;
+import org.apache.wiki.util.FileUtil;
+
public class BasicAttachmentProviderTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CachingProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CachingProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CachingProviderTest.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import junit.framework.*;
@@ -29,10 +29,12 @@
import java.io.StringReader;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.CachingProvider;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.util.FileUtil;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.util.FileUtil;
public class CachingProviderTest extends TestCase
@@ -72,7 +74,7 @@
props.load( TestEngine.findTestProperties() );
props.setProperty( "jspwiki.usePageCache", "true" );
- props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.CounterProvider" );
+ props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.CounterProvider" );
props.setProperty( "jspwiki.cachingProvider.capacity", "100" );
m_engine.shutdown();
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CounterProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CounterProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CounterProvider.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CounterProvider.java Sun Feb 1 18:04:05 2009
@@ -18,17 +18,19 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.providers.WikiPageProvider;
+import org.apache.wiki.search.QueryItem;
-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.
@@ -159,7 +161,7 @@
}
/* (non-Javadoc)
- * @see com.ecyrd.jspwiki.providers.WikiPageProvider#movePage(java.lang.String, java.lang.String)
+ * @see org.apache.wiki.providers.WikiPageProvider#movePage(java.lang.String, java.lang.String)
*/
public void movePage( String from, String to ) throws ProviderException
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/FileSystemProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/FileSystemProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/FileSystemProviderTest.java Sun Feb 1 18:04:05 2009
@@ -19,16 +19,17 @@
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import junit.framework.*;
import java.io.*;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.util.FileUtil;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.util.FileUtil;
public class FileSystemProviderTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/RCSFileProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/RCSFileProviderTest.java Sun Feb 1 18:04:05 2009
@@ -19,16 +19,19 @@
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import junit.framework.*;
import java.io.*;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.providers.NoSuchVersionException;
+import org.apache.wiki.providers.WikiPageProvider;
+import org.apache.wiki.util.FileUtil;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.util.FileUtil;
/**
* Tests the RCSFileProvider. If you are getting strange errors, please check that you
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VersioningFileProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VersioningFileProviderTest.java Sun Feb 1 18:04:05 2009
@@ -19,16 +19,19 @@
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import junit.framework.*;
import java.io.*;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.providers.NoSuchVersionException;
+import org.apache.wiki.providers.WikiPageProvider;
+import org.apache.wiki.util.FileUtil;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.util.FileUtil;
// FIXME: Should this thingy go directly to the VersioningFileProvider,
// or should it rely on the WikiEngine API?
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VerySimpleProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VerySimpleProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VerySimpleProvider.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VerySimpleProvider.java Sun Feb 1 18:04:05 2009
@@ -18,14 +18,16 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.providers.WikiPageProvider;
+import org.apache.wiki.search.QueryItem;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.search.QueryItem;
/**
* This is a simple provider that is used by some of the tests. It has some
@@ -152,7 +154,7 @@
}
/* (non-Javadoc)
- * @see com.ecyrd.jspwiki.providers.WikiPageProvider#movePage(java.lang.String, java.lang.String)
+ * @see org.apache.wiki.providers.WikiPageProvider#movePage(java.lang.String, java.lang.String)
*/
public void movePage( String from, String to ) throws ProviderException
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.render;
+package org.apache.wiki.render;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/CreoleRendererTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/CreoleRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/CreoleRendererTest.java Sun Feb 1 18:04:05 2009
@@ -18,22 +18,23 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.render;
+package org.apache.wiki.render;
import java.io.IOException;
import java.io.StringReader;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.render.CreoleRenderer;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
public class CreoleRendererTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.render;
+package org.apache.wiki.render;
import java.util.Properties;
@@ -27,12 +27,13 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.time.StopWatch;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.render.RenderingManager;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
public class RenderingManagerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/WysiwygEditingRendererTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/WysiwygEditingRendererTest.java Sun Feb 1 18:04:05 2009
@@ -18,22 +18,23 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.render;
+package org.apache.wiki.render;
import java.io.IOException;
import java.io.StringReader;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.render.WysiwygEditingRenderer;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
public class WysiwygEditingRendererTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.rss;
+package org.apache.wiki.rss;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java Sun Feb 1 18:04:05 2009
@@ -22,19 +22,24 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.rss;
+package org.apache.wiki.rss;
import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Properties;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.WeblogEntryPlugin;
-import com.ecyrd.jspwiki.plugin.WeblogPlugin;
-import com.ecyrd.jspwiki.providers.FileSystemProvider;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.plugin.WeblogEntryPlugin;
+import org.apache.wiki.plugin.WeblogPlugin;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.rss.Feed;
+import org.apache.wiki.rss.RSS10Feed;
+import org.apache.wiki.rss.RSS20Feed;
+import org.apache.wiki.rss.RSSGenerator;
+
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.search;
+package org.apache.wiki.search;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,20 +18,23 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.search;
+package org.apache.wiki.search;
import java.io.File;
import java.util.Collection;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.search.SearchManager;
+import org.apache.wiki.search.SearchResult;
+
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
public class SearchManagerTest extends TestCase
{
@@ -69,7 +72,7 @@
public void testDefaultProvider()
{
- assertEquals( "com.ecyrd.jspwiki.search.LuceneSearchProvider",
+ assertEquals( "org.apache.wiki.search.LuceneSearchProvider",
m_mgr.getSearchEngine().getClass().getName() );
}
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/AllTests.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/AllTests.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/InputValidatorTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/InputValidatorTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/InputValidatorTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/InputValidatorTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/InputValidatorTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/InputValidatorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/InputValidatorTest.java Sun Feb 1 18:04:05 2009
@@ -22,17 +22,19 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
import java.util.Properties;
import java.util.regex.Pattern;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.ui.InputValidator;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
public class InputValidatorTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
import java.io.File;
import java.io.FileNotFoundException;
@@ -27,12 +27,14 @@
import java.util.Locale;
import java.util.Properties;
+import org.apache.wiki.ui.migrator.BundleMigrator;
+import org.apache.wiki.ui.migrator.BundleMigrator.Bundle;
+import org.apache.wiki.util.CommentedProperties;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.ui.migrator.BundleMigrator.Bundle;
-import com.ecyrd.jspwiki.util.CommentedProperties;
public class BundleMigratorTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java Sun Feb 1 18:04:05 2009
@@ -18,12 +18,14 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.wiki.ui.migrator.*;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -97,7 +99,7 @@
node = nodes.get( 0 );
assertEquals( NodeType.JSP_DIRECTIVE, node.getType() );
assertEquals( "page", node.getName() );
- assertEquals( "com.ecyrd.jspwiki.action.WikiContextFactory", ( (Tag)node).getAttribute( "import" ).getValue() );
+ assertEquals( "org.apache.wiki.action.WikiContextFactory", ( (Tag)node).getAttribute( "import" ).getValue() );
node = nodes.get( 1 );
assertEquals( NodeType.TEXT, node.getType() );
node = nodes.get( 2 );
@@ -107,7 +109,7 @@
public void testChangeFindContext2() throws Exception
{
- String s = "<%@ page import=\"com.ecyrd.jspwiki.action.*\" %><% WikiContext ctx = WikiContext.findContext(pageContext); %>";
+ String s = "<%@ page import=\"org.apache.wiki.action.*\" %><% WikiContext ctx = WikiContext.findContext(pageContext); %>";
JspDocument doc = new JspParser().parse( s );
// Should be 2 nodes: directive (with wildcard) plus scriptlet
@@ -116,7 +118,7 @@
Node node = nodes.get( 0 );
assertEquals( NodeType.JSP_DIRECTIVE, node.getType() );
assertEquals( "page", node.getName() );
- assertEquals( "com.ecyrd.jspwiki.action.*", ( (Tag)node).getAttribute( "import" ).getValue() );
+ assertEquals( "org.apache.wiki.action.*", ( (Tag)node).getAttribute( "import" ).getValue() );
node = nodes.get( 1 );
assertEquals( NodeType.SCRIPTLET, node.getType() );
@@ -129,7 +131,7 @@
node = nodes.get( 0 );
assertEquals( NodeType.JSP_DIRECTIVE, node.getType() );
assertEquals( "page", node.getName() );
- assertEquals( "com.ecyrd.jspwiki.action.*", ( (Tag)node).getAttribute( "import" ).getValue() );
+ assertEquals( "org.apache.wiki.action.*", ( (Tag)node).getAttribute( "import" ).getValue() );
node = nodes.get( 1 );
assertEquals( NodeType.SCRIPTLET, node.getType() );
assertEquals( " WikiContext ctx = WikiContextFactory.findContext( pageContext ); ", node.getValue() );
@@ -264,7 +266,7 @@
Tag tag = (Tag)doc.getNodes().get( 2 );
assertEquals( "stripes:useActionBean", tag.getName() );
assertEquals( "beanclass", tag.getAttributes().get( 0 ).getName() );
- assertEquals( "com.ecyrd.jspwiki.action.EditActionBean", tag.getAttributes().get( 0 ).getValue() );
+ assertEquals( "org.apache.wiki.action.EditActionBean", tag.getAttributes().get( 0 ).getValue() );
assertEquals( "event", tag.getAttributes().get( 1 ).getName() );
assertEquals( "edit", tag.getAttributes().get( 1 ).getValue() );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspDocumentTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspDocumentTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspDocumentTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspDocumentTest.java Sun Feb 1 18:04:05 2009
@@ -18,9 +18,13 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
+import org.apache.wiki.ui.migrator.JspDocument;
+import org.apache.wiki.ui.migrator.JspParser;
+import org.apache.wiki.ui.migrator.Node;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java Sun Feb 1 18:04:05 2009
@@ -18,11 +18,13 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
import java.io.File;
import java.util.List;
+import org.apache.wiki.ui.migrator.*;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -393,7 +395,7 @@
assertEquals( 3, ((Tag) node).getAttributes().size() );
attribute = ((Tag) node).getAttributes().get( 0 );
assertEquals( "beanclass", attribute.getName() );
- assertEquals( "com.ecyrd.jspwiki.action.LoginActionBean", attribute.getValue() );
+ assertEquals( "org.apache.wiki.action.LoginActionBean", attribute.getValue() );
i++;
node = nodes.get( i );
assertEquals( 2, node.getLine() );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java Sun Feb 1 18:04:05 2009
@@ -18,12 +18,14 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.wiki.ui.migrator.*;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/TagTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/TagTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/TagTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/TagTest.java Sun Feb 1 18:04:05 2009
@@ -18,9 +18,13 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.migrator;
+package org.apache.wiki.ui.migrator;
+import org.apache.wiki.ui.migrator.JspDocument;
+import org.apache.wiki.ui.migrator.NodeType;
+import org.apache.wiki.ui.migrator.Tag;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.stripes;
+package org.apache.wiki.ui.stripes;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java Sun Feb 1 18:04:05 2009
@@ -18,23 +18,25 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.ui.stripes;
+package org.apache.wiki.ui.stripes;
import java.lang.reflect.Method;
import java.security.Permission;
import java.util.Map;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.action.GroupActionBean;
+import org.apache.wiki.action.ViewActionBean;
+import org.apache.wiki.auth.permissions.GroupPermission;
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.ui.stripes.HandlerInfo;
+
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.action.GroupActionBean;
-import com.ecyrd.jspwiki.action.ViewActionBean;
-import com.ecyrd.jspwiki.auth.permissions.GroupPermission;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
public class HandlerInfoTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.url;
+package org.apache.wiki.url;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/DefaultURLConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/DefaultURLConstructorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/DefaultURLConstructorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/DefaultURLConstructorTest.java Sun Feb 1 18:04:05 2009
@@ -22,19 +22,22 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.url;
+package org.apache.wiki.url;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.url.DefaultURLConstructor;
+import org.apache.wiki.url.ShortViewURLConstructor;
+import org.apache.wiki.url.URLConstructor;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
public class DefaultURLConstructorTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortURLConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortURLConstructorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortURLConstructorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortURLConstructorTest.java Sun Feb 1 18:04:05 2009
@@ -22,19 +22,21 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.url;
+package org.apache.wiki.url;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.url.ShortURLConstructor;
+import org.apache.wiki.url.URLConstructor;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
public class ShortURLConstructorTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortViewURLConstructorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortViewURLConstructorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortViewURLConstructorTest.java Sun Feb 1 18:04:05 2009
@@ -22,19 +22,21 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.url;
+package org.apache.wiki.url;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.url.ShortViewURLConstructor;
+import org.apache.wiki.url.URLConstructor;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
public class ShortViewURLConstructorTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,10 +19,10 @@
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
-import com.ecyrd.jspwiki.ui.migrator.JspParserTest;
+import org.apache.wiki.ui.migrator.JspParserTest;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,9 @@
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
+
+import org.apache.wiki.util.ClassUtil;
import junit.framework.*;
@@ -36,9 +38,9 @@
public void testFindClass()
throws Exception
{
- Class foo = ClassUtil.findClass( "org.apache.jspwiki.api", "WikiPage" );
+ Class foo = ClassUtil.findClass( "org.apache.wiki.api", "WikiPage" );
- assertEquals( foo.getName(), "org.apache.jspwiki.api.WikiPage" );
+ assertEquals( foo.getName(), "org.apache.wiki.api.WikiPage" );
}
/**
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CommentedPropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CommentedPropertiesTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CommentedPropertiesTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CommentedPropertiesTest.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
import java.io.*;
import java.net.URI;
@@ -27,6 +27,8 @@
import java.net.URL;
import java.util.Properties;
+import org.apache.wiki.util.CommentedProperties;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CryptoUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CryptoUtilTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CryptoUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CryptoUtilTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
@@ -29,6 +29,7 @@
import junit.framework.TestSuite;
import org.apache.commons.codec.binary.Base64;
+import org.apache.wiki.util.CryptoUtil;
public class CryptoUtilTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/MailUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/MailUtilTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/MailUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/MailUtilTest.java Sun Feb 1 18:04:05 2009
@@ -19,19 +19,21 @@
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
import java.net.ConnectException;
import java.util.Properties;
import javax.mail.MessagingException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.util.MailUtil;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
/**
* This test is not integrated into any TestSuite yet, because I don't know how
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,9 @@
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
+
+import org.apache.wiki.util.PriorityList;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/SerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/SerializerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/SerializerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/SerializerTest.java Sun Feb 1 18:04:05 2009
@@ -18,12 +18,14 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import org.apache.wiki.util.Serializer;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TextUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TextUtilTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TextUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TextUtilTest.java Sun Feb 1 18:04:05 2009
@@ -18,9 +18,11 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
+import org.apache.wiki.util.TextUtil;
+
import junit.framework.*;
public class TextUtilTest extends TestCase
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TimedCounterListTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TimedCounterListTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TimedCounterListTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TimedCounterListTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,9 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
+
+import org.apache.wiki.util.TimedCounterList;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/UtilJ2eeCompatTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/UtilJ2eeCompatTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/UtilJ2eeCompatTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/UtilJ2eeCompatTest.java Sun Feb 1 18:04:05 2009
@@ -18,12 +18,13 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.util;
+package org.apache.wiki.util;
+
+import org.apache.wiki.util.UtilJ2eeCompat;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.util.UtilJ2eeCompat;
public class UtilJ2eeCompatTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.web;
+package org.apache.wiki.web;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.web;
+package org.apache.wiki.web;
import java.io.File;
import java.io.IOException;
@@ -29,8 +29,9 @@
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
import org.hsqldb.jdbc.jdbcDataSource;
import org.mortbay.http.*;
import org.mortbay.http.handler.SecurityHandler;
@@ -43,7 +44,6 @@
import org.mortbay.jndi.Util;
import org.mortbay.util.Password;
-import com.ecyrd.jspwiki.auth.Users;
/**
* Lightweight wrapper that starts and stops an embedded Jetty server on a
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.security.Principal;
import java.util.Collection;
@@ -27,15 +27,16 @@
import junit.framework.TestCase;
-import org.apache.jspwiki.api.FilterException;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.FilterException;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.filters.BasicPageFilter;
+import org.apache.wiki.workflow.*;
-import com.ecyrd.jspwiki.PageManager;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.filters.BasicPageFilter;
public class ApprovalWorkflowTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/DecisionQueueTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/DecisionQueueTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/DecisionQueueTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/DecisionQueueTest.java Sun Feb 1 18:04:05 2009
@@ -18,20 +18,21 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.security.Principal;
import java.util.Collection;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.workflow.*;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
public class DecisionQueueTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/FactTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/FactTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/FactTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/FactTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,10 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
+
+import org.apache.wiki.workflow.Fact;
+import org.apache.wiki.workflow.Outcome;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/OutcomeTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/OutcomeTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/OutcomeTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/OutcomeTest.java Sun Feb 1 18:04:05 2009
@@ -18,16 +18,19 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.util.Locale;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.workflow.NoSuchOutcomeException;
+import org.apache.wiki.workflow.Outcome;
+
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
public class OutcomeTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/SimpleDecisionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/SimpleDecisionTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/SimpleDecisionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/SimpleDecisionTest.java Sun Feb 1 18:04:05 2009
@@ -18,16 +18,17 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.util.Collection;
import java.util.List;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.workflow.*;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
public class SimpleDecisionTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/TaskTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/TaskTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/TaskTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/TaskTest.java Sun Feb 1 18:04:05 2009
@@ -18,16 +18,17 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.util.Collection;
import java.util.List;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.workflow.*;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
public class TaskTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,18 +18,19 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.workflow.*;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
public class WorkflowManagerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowTest.java Sun Feb 1 18:04:05 2009
@@ -18,18 +18,19 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
import java.math.BigDecimal;
import java.security.Principal;
import java.util.Date;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.workflow.*;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
public class WorkflowTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java Sun Feb 1 18:04:05 2009
@@ -19,16 +19,17 @@
under the License.
*/
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
+
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
import junit.framework.*;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.xmlrpc.RPCHandler;
import org.apache.xmlrpc.*;
-import com.ecyrd.jspwiki.xmlrpc.RPCHandler;
public class RPCHandlerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java Sun Feb 1 18:04:05 2009
@@ -24,13 +24,14 @@
import java.util.Properties;
import java.util.Random;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiProvider;
+import org.apache.wiki.providers.CachingProvider;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.util.TextUtil;
+
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiProvider;
-import com.ecyrd.jspwiki.providers.CachingProvider;
-import com.ecyrd.jspwiki.providers.FileSystemProvider;
-import com.ecyrd.jspwiki.util.TextUtil;
public class MassiveRepositoryTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/stress/StressTestRCSProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/stress/StressTestRCSProvider.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/stress/StressTestRCSProvider.java (original)
+++ incubator/jspwiki/trunk/tests/java/stress/StressTestRCSProvider.java Sun Feb 1 18:04:05 2009
@@ -24,10 +24,10 @@
import java.io.*;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.*;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.providers.*;
/**
* Does stress testing on the RCSProvider.
Modified: incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java (original)
+++ incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java Sun Feb 1 18:04:05 2009
@@ -23,9 +23,11 @@
import junit.framework.*;
import java.io.*;
import java.util.*;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.providers.*;
-import com.ecyrd.jspwiki.util.FileUtil;
+
+import org.apache.wiki.*;
+import org.apache.wiki.providers.*;
+import org.apache.wiki.util.FileUtil;
+
public final class StressTestSpeed extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/stress/StressTestVersioningProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/stress/StressTestVersioningProvider.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/stress/StressTestVersioningProvider.java (original)
+++ incubator/jspwiki/trunk/tests/java/stress/StressTestVersioningProvider.java Sun Feb 1 18:04:05 2009
@@ -24,10 +24,10 @@
import java.io.*;
import java.util.*;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.*;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.providers.*;
public class StressTestVersioningProvider extends TestCase
{