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 [12/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/action/WikiContextFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java Sun Feb 1 18:04:05 2009
@@ -23,7 +23,7 @@
*
*/
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
import java.util.Locale;
import java.util.Properties;
@@ -36,12 +36,14 @@
import net.sourceforge.stripes.mock.MockHttpSession;
import net.sourceforge.stripes.mock.MockRoundtrip;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.action.ViewActionBean;
+import org.apache.wiki.action.WikiContextFactory;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
public class WikiContextFactoryTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.attachment;
+package org.apache.wiki.attachment;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AttachmentManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AttachmentManagerTest.java Sun Feb 1 18:04:05 2009
@@ -19,19 +19,22 @@
under the License.
*/
-package com.ecyrd.jspwiki.attachment;
+package org.apache.wiki.attachment;
import java.io.*;
import java.util.Collection;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.FileUtil;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.FileUtil;
public class AttachmentManagerTest extends TestCase
{
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AllTests.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AllTests.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.auth;
+package org.apache.wiki.auth;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -39,12 +39,12 @@
suite.addTest( AuthenticationManagerTest.suite() );
suite.addTest( AuthorizationManagerTest.suite() );
suite.addTest( GroupManagerTest.suite() );
- suite.addTest( com.ecyrd.jspwiki.auth.acl.AllTests.suite() );
- suite.addTest( com.ecyrd.jspwiki.auth.authorize.AllTests.suite() );
- suite.addTest( com.ecyrd.jspwiki.auth.login.AllTests.suite() );
- suite.addTest( com.ecyrd.jspwiki.auth.permissions.AllTests.suite() );
- suite.addTest( com.ecyrd.jspwiki.auth.user.AllTests.suite() );
- suite.addTestSuite( com.ecyrd.jspwiki.auth.UserManagerTest.class );
+ suite.addTest( org.apache.wiki.auth.acl.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.authorize.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.login.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.permissions.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.user.AllTests.suite() );
+ suite.addTestSuite( org.apache.wiki.auth.UserManagerTest.class );
return suite;
}
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,23 +18,28 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth;
+package org.apache.wiki.auth;
import java.security.Principal;
import java.util.Map;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.WikiSessionTest;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.WikiSessionTest;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
/**
* Tests the AuthorizationManager class.
@@ -85,7 +90,7 @@
props.load( TestEngine.findTestProperties() );
// Supply a custom LoginModule class
- props.put( "jspwiki.loginModule.class", "com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" );
+ props.put( "jspwiki.loginModule.class", "org.apache.wiki.auth.login.CookieAssertionLoginModule" );
// Init the engine and verify that we initialized with a custom auth login module
m_engine.shutdown();
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.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.auth;
+package org.apache.wiki.auth;
import java.io.File;
import java.security.Permission;
@@ -30,21 +30,25 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.acl.UnresolvedPrincipal;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.permissions.AllPermission;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.providers.ProviderException;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.auth.acl.UnresolvedPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.permissions.AllPermission;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.providers.ProviderException;
/**
* Tests the AuthorizationManager class.
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/GroupManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/GroupManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/GroupManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/GroupManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/GroupManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/GroupManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/GroupManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,24 +18,28 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth;
+package org.apache.wiki.auth;
import java.security.Principal;
import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.WikiSessionTest;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.event.WikiSecurityEvent;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.WikiSessionTest;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.event.WikiSecurityEvent;
public class GroupManagerTest extends TestCase
{
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/SecurityEventTrap.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/SecurityEventTrap.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/SecurityEventTrap.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/SecurityEventTrap.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/SecurityEventTrap.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/SecurityEventTrap.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/SecurityEventTrap.java Sun Feb 1 18:04:05 2009
@@ -18,14 +18,15 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth;
+package org.apache.wiki.auth;
import java.util.ArrayList;
import java.util.List;
-import com.ecyrd.jspwiki.event.WikiEvent;
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WikiSecurityEvent;
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiSecurityEvent;
+
/**
* Traps the most recent WikiEvent so that it can be used in assertions.
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/UserManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/UserManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/UserManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,23 +18,26 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth;
+package org.apache.wiki.auth;
import java.security.Principal;
import java.util.Collection;
import java.util.List;
import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.UserManager;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.auth.user.*;
+import org.apache.wiki.workflow.*;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
-import com.ecyrd.jspwiki.auth.user.*;
-import com.ecyrd.jspwiki.workflow.*;
/**
* @author Andrew Jaquith
Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/Users.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/Users.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/Users.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/Users.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/Users.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/Users.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/Users.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.auth;
+package org.apache.wiki.auth;
public class Users
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclEntryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclEntryImplTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclEntryImplTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclEntryImplTest.java Sun Feb 1 18:04:05 2009
@@ -18,15 +18,16 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.acl;
+package org.apache.wiki.auth.acl;
+
+import org.apache.wiki.auth.acl.AclEntryImpl;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.PermissionFactory;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.auth.acl.AclEntryImpl;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
public class AclEntryImplTest
extends TestCase
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclImplTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclImplTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclImplTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclImplTest.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.auth.acl;
+package org.apache.wiki.auth.acl;
import java.io.*;
import java.security.Principal;
@@ -26,21 +26,22 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.WikiSessionTest;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.acl.AclEntry;
+import org.apache.wiki.auth.acl.AclEntryImpl;
+import org.apache.wiki.auth.acl.AclImpl;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.auth.permissions.PagePermission;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.WikiSessionTest;
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.acl.AclEntry;
-import com.ecyrd.jspwiki.auth.acl.AclEntryImpl;
-import com.ecyrd.jspwiki.auth.acl.AclImpl;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
public class AclImplTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/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.auth.acl;
+package org.apache.wiki.auth.acl;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java Sun Feb 1 18:04:05 2009
@@ -18,23 +18,24 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.acl;
+package org.apache.wiki.auth.acl;
import java.security.Principal;
import java.util.Properties;
import java.util.regex.Matcher;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.acl.*;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.providers.ProviderException;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
-import com.ecyrd.jspwiki.providers.ProviderException;
public class DefaultAclManagerTest
extends TestCase
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/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.auth.authorize;
+package org.apache.wiki.auth.authorize;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/GroupTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/GroupTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/GroupTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/GroupTest.java Sun Feb 1 18:04:05 2009
@@ -18,18 +18,20 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.authorize;
+package org.apache.wiki.auth.authorize;
import java.security.Principal;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Group;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
public class GroupTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.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.auth.authorize;
+package org.apache.wiki.auth.authorize;
import java.io.File;
import java.security.Principal;
@@ -30,14 +30,16 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.JDBCGroupDatabase;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
/**
* @author Andrew Jaquith
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.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.auth.authorize;
+package org.apache.wiki.auth.authorize;
import java.security.Principal;
import java.util.Properties;
@@ -28,10 +28,12 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.authorize.WebContainerAuthorizer;
import org.jdom.Document;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
public class WebContainerAuthorizerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java Sun Feb 1 18:04:05 2009
@@ -18,18 +18,20 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.authorize;
+package org.apache.wiki.auth.authorize;
import java.security.Principal;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.XMLGroupDatabase;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/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.auth.login;
+package org.apache.wiki.auth.login;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.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.auth.login;
+package org.apache.wiki.auth.login;
import java.util.HashMap;
import java.util.Properties;
@@ -30,16 +30,19 @@
import javax.security.auth.spi.LoginModule;
import javax.servlet.http.HttpServletRequest;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.TestAuthorizer;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.auth.Authorizer;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.login.AnonymousLoginModule;
+import org.apache.wiki.auth.login.WebContainerCallbackHandler;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.XMLUserDatabase;
+
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TestAuthorizer;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.Authorizer;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.XMLUserDatabase;
/**
* @author Andrew R. Jaquith
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.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.auth.login;
+package org.apache.wiki.auth.login;
import java.util.HashMap;
import java.util.Properties;
@@ -30,18 +30,21 @@
import javax.security.auth.spi.LoginModule;
import javax.servlet.http.Cookie;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.TestAuthorizer;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.auth.Authorizer;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+import org.apache.wiki.auth.login.WebContainerCallbackHandler;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.XMLUserDatabase;
+
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TestAuthorizer;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.Authorizer;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.XMLUserDatabase;
/**
* @author Andrew R. Jaquith
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.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.auth.login;
+package org.apache.wiki.auth.login;
import java.util.HashMap;
import java.util.Locale;
@@ -30,14 +30,17 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.login.UserDatabaseLoginModule;
+import org.apache.wiki.auth.login.WikiCallbackHandler;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.XMLUserDatabase;
+
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.XMLUserDatabase;
/**
* @author Andrew R. Jaquith
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.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.auth.login;
+package org.apache.wiki.auth.login;
import java.security.Principal;
import java.util.HashMap;
@@ -31,18 +31,21 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.TestAuthorizer;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.auth.Authorizer;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.login.WebContainerCallbackHandler;
+import org.apache.wiki.auth.login.WebContainerLoginModule;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.XMLUserDatabase;
+
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TestAuthorizer;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.Authorizer;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.XMLUserDatabase;
/**
* @author Andrew R. Jaquith
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java Sun Feb 1 18:04:05 2009
@@ -18,11 +18,16 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.permissions;
+package org.apache.wiki.auth.permissions;
import java.security.Permission;
import java.util.Enumeration;
+import org.apache.wiki.auth.permissions.AllPermission;
+import org.apache.wiki.auth.permissions.AllPermissionCollection;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.WikiPermission;
+
import junit.framework.TestCase;
/**
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionTest.java Sun Feb 1 18:04:05 2009
@@ -18,7 +18,11 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.permissions;
+package org.apache.wiki.auth.permissions;
+
+import org.apache.wiki.auth.permissions.AllPermission;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.WikiPermission;
import junit.framework.TestCase;
@@ -92,11 +96,11 @@
public void testToString()
{
AllPermission p = new AllPermission( "myWiki" );
- String result = "(\"com.ecyrd.jspwiki.auth.permissions.AllPermission\",\"myWiki\")";
+ String result = "(\"org.apache.wiki.auth.permissions.AllPermission\",\"myWiki\")";
assertEquals( result, p.toString() );
p = new AllPermission( "*" );
- result = "(\"com.ecyrd.jspwiki.auth.permissions.AllPermission\",\"*\")";
+ result = "(\"org.apache.wiki.auth.permissions.AllPermission\",\"*\")";
assertEquals( result, p.toString() );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/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.auth.permissions;
+package org.apache.wiki.auth.permissions;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/GroupPermissionTest.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.auth.permissions;
+package org.apache.wiki.auth.permissions;
import java.security.AccessControlException;
import java.security.Permission;
@@ -26,8 +26,11 @@
import javax.security.auth.Subject;
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.permissions.GroupPermission;
+import org.apache.wiki.auth.permissions.PagePermission;
+
import junit.framework.TestCase;
@@ -72,10 +75,10 @@
{
GroupPermission p;
p = new GroupPermission( "Test", "view,edit,delete" );
- assertEquals( "(\"com.ecyrd.jspwiki.auth.permissions.GroupPermission\",\"*:Test\",\"delete,edit,view\")", p
+ assertEquals( "(\"org.apache.wiki.auth.permissions.GroupPermission\",\"*:Test\",\"delete,edit,view\")", p
.toString() );
p = new GroupPermission( "mywiki:Test", "view,edit,delete" );
- assertEquals( "(\"com.ecyrd.jspwiki.auth.permissions.GroupPermission\",\"mywiki:Test\",\"delete,edit,view\")", p
+ assertEquals( "(\"org.apache.wiki.auth.permissions.GroupPermission\",\"mywiki:Test\",\"delete,edit,view\")", p
.toString() );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/PagePermissionTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/PagePermissionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/PagePermissionTest.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.auth.permissions;
+package org.apache.wiki.auth.permissions;
+
+import org.apache.wiki.auth.permissions.PagePermission;
import junit.framework.TestCase;
@@ -62,10 +64,10 @@
{
PagePermission p;
p = new PagePermission( "Main", "view,edit,delete" );
- assertEquals( "(\"com.ecyrd.jspwiki.auth.permissions.PagePermission\",\":Main\",\"delete,edit,view\")", p
+ assertEquals( "(\"org.apache.wiki.auth.permissions.PagePermission\",\":Main\",\"delete,edit,view\")", p
.toString() );
p = new PagePermission( "mywiki:Main", "view,edit,delete" );
- assertEquals( "(\"com.ecyrd.jspwiki.auth.permissions.PagePermission\",\"mywiki:Main\",\"delete,edit,view\")", p
+ assertEquals( "(\"org.apache.wiki.auth.permissions.PagePermission\",\"mywiki:Main\",\"delete,edit,view\")", p
.toString() );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/WikiPermissionTest.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.auth.permissions;
+package org.apache.wiki.auth.permissions;
+
+import org.apache.wiki.auth.permissions.WikiPermission;
import junit.framework.TestCase;
@@ -148,7 +150,7 @@
public void testToString()
{
WikiPermission p1 = new WikiPermission("*", "createPages,createGroups,editProfile");
- String result = "(\"com.ecyrd.jspwiki.auth.permissions.WikiPermission\",\"*\",\"creategroups,createpages,editprofile\")";
+ String result = "(\"org.apache.wiki.auth.permissions.WikiPermission\",\"*\",\"creategroups,createpages,editprofile\")";
assertEquals(result, p1.toString());
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/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.auth.user;
+package org.apache.wiki.auth.user;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.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.auth.user;
+package org.apache.wiki.auth.user;
import java.io.File;
import java.io.Serializable;
@@ -34,13 +34,17 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
+import org.apache.wiki.TestJDBCDataSource;
+import org.apache.wiki.TestJNDIContext;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.user.DuplicateUserException;
+import org.apache.wiki.auth.user.JDBCUserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.util.CryptoUtil;
+
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestJDBCDataSource;
-import com.ecyrd.jspwiki.TestJNDIContext;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.util.CryptoUtil;
/**
* @author Andrew Jaquith
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/UserProfileTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/UserProfileTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/UserProfileTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/UserProfileTest.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.auth.user;
+package org.apache.wiki.auth.user;
import java.util.Date;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
/**
* Tests the DefaultUserProfile class.
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java Sun Feb 1 18:04:05 2009
@@ -18,22 +18,25 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
import java.io.Serializable;
import java.security.Principal;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.user.DuplicateUserException;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.auth.user.XMLUserDatabase;
+import org.apache.wiki.util.CryptoUtil;
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.util.CryptoUtil;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.content;
+package org.apache.wiki.content;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java Sun Feb 1 18:04:05 2009
@@ -1,4 +1,4 @@
-package com.ecyrd.jspwiki.content;
+package org.apache.wiki.content;
import java.util.Properties;
@@ -6,10 +6,12 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.content.WikiName;
-import com.ecyrd.jspwiki.TestEngine;
public class ContentManagerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java Sun Feb 1 18:04:05 2009
@@ -18,20 +18,20 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.content;
+package org.apache.wiki.content;
import java.util.Collection;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
public class PageRenamerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.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.content;
+package org.apache.wiki.content;
+
+import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.content.WikiName;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.dav;
+package org.apache.wiki.dav;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AttachmentDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AttachmentDavProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AttachmentDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AttachmentDavProviderTest.java Sun Feb 1 18:04:05 2009
@@ -18,14 +18,17 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.dav;
+package org.apache.wiki.dav;
import java.util.Properties;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.DirectoryItem;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.dav.AttachmentDavProvider;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.dav.items.DirectoryItem;
+
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/DavPathTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/DavPathTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/DavPathTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/DavPathTest.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,9 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.dav;
+package org.apache.wiki.dav;
+
+import org.apache.wiki.dav.DavPath;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/HTMLPagesDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/HTMLPagesDavProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/HTMLPagesDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/HTMLPagesDavProviderTest.java Sun Feb 1 18:04:05 2009
@@ -18,13 +18,16 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.dav;
+package org.apache.wiki.dav;
import java.util.Properties;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.DirectoryItem;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.HTMLPagesDavProvider;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.dav.items.DirectoryItem;
+
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/RawPagesDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/RawPagesDavProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/RawPagesDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/RawPagesDavProviderTest.java Sun Feb 1 18:04:05 2009
@@ -18,13 +18,16 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.dav;
+package org.apache.wiki.dav;
import java.util.Properties;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.DirectoryItem;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.RawPagesDavProvider;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.dav.items.DirectoryItem;
+
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.diff;
+package org.apache.wiki.diff;
import junit.framework.Test;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/ContextualDiffProviderTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/ContextualDiffProviderTest.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.diff;
+package org.apache.wiki.diff;
import java.io.IOException;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.diff.ContextualDiffProvider;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.*;
public class ContextualDiffProviderTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java Sun Feb 1 18:04:05 2009
@@ -19,7 +19,7 @@
under the License.
*/
-package com.ecyrd.jspwiki.filters;
+package org.apache.wiki.filters;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/FilterManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/FilterManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/FilterManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/FilterManagerTest.java Sun Feb 1 18:04:05 2009
@@ -19,12 +19,16 @@
under the License.
*/
-package com.ecyrd.jspwiki.filters;
+package org.apache.wiki.filters;
import junit.framework.*;
import java.util.*;
-import com.ecyrd.jspwiki.*;
+import org.apache.wiki.*;
+import org.apache.wiki.filters.FilterManager;
+import org.apache.wiki.filters.PageFilter;
+import org.apache.wiki.filters.ProfanityFilter;
+
public class FilterManagerTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/TestFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/TestFilter.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/TestFilter.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/TestFilter.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.filters;
+package org.apache.wiki.filters;
import java.util.Properties;
-import com.ecyrd.jspwiki.WikiEngine;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.filters.BasicPageFilter;
+
public class TestFilter
extends BasicPageFilter
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/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.htmltowiki;
+package org.apache.wiki.htmltowiki;
import junit.framework.*;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.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.htmltowiki;
+package org.apache.wiki.htmltowiki;
+
+import org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java Sun Feb 1 18:04:05 2009
@@ -22,7 +22,7 @@
* (C) Janne Jalkanen 2005
*
*/
-package com.ecyrd.jspwiki.parser;
+package org.apache.wiki.parser;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java Sun Feb 1 18:04:05 2009
@@ -18,13 +18,15 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.parser;
+package org.apache.wiki.parser;
import java.io.FileInputStream;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Properties;
+import org.apache.wiki.parser.CreoleToJSPWikiTranslator;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.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.parser;
+package org.apache.wiki.parser;
import java.io.BufferedReader;
import java.io.File;
@@ -31,20 +31,22 @@
import javax.servlet.ServletException;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.providers.BasicAttachmentProvider;
+import org.apache.wiki.render.XHTMLRenderer;
+import org.apache.wiki.util.TextUtil;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import stress.Benchmark;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
-import com.ecyrd.jspwiki.render.XHTMLRenderer;
-import com.ecyrd.jspwiki.util.TextUtil;
public class JSPWikiMarkupParserTest extends TestCase
{
@@ -1608,7 +1610,7 @@
public void testPluginInsert()
throws Exception
{
- String src="[{INSERT com.ecyrd.jspwiki.plugin.SamplePlugin WHERE text=test}]";
+ String src="[{INSERT org.apache.wiki.plugin.SamplePlugin WHERE text=test}]";
assertEquals( "test", translate(src) );
}
@@ -1616,7 +1618,7 @@
public void testPluginHTMLInsert()
throws Exception
{
- String src="[{INSERT com.ecyrd.jspwiki.plugin.SamplePlugin WHERE text='<b>Foo</b>'}]";
+ String src="[{INSERT org.apache.wiki.plugin.SamplePlugin WHERE text='<b>Foo</b>'}]";
assertEquals( "<b>Foo</b>", translate(src) );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/MarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/MarkupParserTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/MarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/MarkupParserTest.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.parser;
+package org.apache.wiki.parser;
+
+import org.apache.wiki.parser.MarkupParser;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.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 junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/CounterPluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/CounterPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/CounterPluginTest.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.io.IOException;
import java.io.StringReader;
@@ -27,18 +27,19 @@
import javax.servlet.ServletException;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.render.WikiRenderer;
+import org.apache.wiki.render.XHTMLRenderer;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
-import com.ecyrd.jspwiki.render.WikiRenderer;
-import com.ecyrd.jspwiki.render.XHTMLRenderer;
public class CounterPluginTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java Sun Feb 1 18:04:05 2009
@@ -18,19 +18,22 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.plugin.Denounce;
+import org.apache.wiki.plugin.PluginManager;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import net.sourceforge.stripes.mock.MockHttpServletRequest;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
public class DenouncePluginTest extends TestCase {
Properties props = new Properties();
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java Sun Feb 1 18:04:05 2009
@@ -19,15 +19,16 @@
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
public class GroupsTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java Sun Feb 1 18:04:05 2009
@@ -18,18 +18,20 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.io.File;
import java.io.FileWriter;
import java.io.StringReader;
import java.util.Properties;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
-import com.ecyrd.jspwiki.util.FileUtil;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.plugin.PluginManager;
+import org.apache.wiki.util.FileUtil;
+
import junit.framework.Test;
import junit.framework.TestCase;
@@ -72,7 +74,7 @@
{
m_engine.saveText( "TestPage", "Content of TestPage" );
- String res = m_manager.execute( m_context, "{INSERT com.ecyrd.jspwiki.plugin.IndexPlugin}" );
+ String res = m_manager.execute( m_context, "{INSERT org.apache.wiki.plugin.IndexPlugin}" );
assertTrue( "TestPage not found in Index", res.contains( "<a href='/Wiki.jsp?page=TestPage'>TestPage</a>" ) );
}
@@ -90,7 +92,7 @@
att.setAuthor( "OmeJoop" );
m_attManager.storeAttachment( att, makeAttachmentFile() );
- String res = m_manager.execute( m_context, "{INSERT com.ecyrd.jspwiki.plugin.IndexPlugin}" );
+ String res = m_manager.execute( m_context, "{INSERT org.apache.wiki.plugin.IndexPlugin}" );
assertTrue( "TestPage not found in Index", res.contains( "<a href='/Wiki.jsp?page=TestPage'>TestPage</a>" ) );
@@ -111,7 +113,7 @@
att.setAuthor( "OmeJoop" );
m_attManager.storeAttachment( att, makeAttachmentFile() );
- String res = m_manager.execute( m_context, "{INSERT com.ecyrd.jspwiki.plugin.IndexPlugin showAttachments=false}" );
+ String res = m_manager.execute( m_context, "{INSERT org.apache.wiki.plugin.IndexPlugin showAttachments=false}" );
assertTrue( "TestPage not found in Index", res.contains( "<a href='/Wiki.jsp?page=TestPage'>TestPage</a>" ) );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/InsertPageTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/InsertPageTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/InsertPageTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/InsertPageTest.java Sun Feb 1 18:04:05 2009
@@ -18,11 +18,12 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Properties;
-import com.ecyrd.jspwiki.TestEngine;
+import org.apache.wiki.TestEngine;
+
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/JavaScriptPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/JavaScriptPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/JavaScriptPlugin.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/JavaScriptPlugin.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.plugin;
+package org.apache.wiki.plugin;
import java.util.Map;
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.plugin.InitializablePlugin;
+import org.apache.wiki.plugin.WikiPlugin;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
/**
* Implements a simple plugin that just returns a piece of Javascript
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginIndexPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginIndexPluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginIndexPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginIndexPluginTest.java Sun Feb 1 18:04:05 2009
@@ -19,20 +19,21 @@
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Collection;
import java.util.Properties;
-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 org.apache.wiki.plugin.PluginManager.WikiPluginInfo;
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.plugin.PluginManager.WikiPluginInfo;
public class PluginIndexPluginTest extends TestCase
{
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java Sun Feb 1 18:04:05 2009
@@ -19,20 +19,22 @@
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Collection;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.plugin.PluginManager;
+import org.apache.wiki.plugin.PluginManager.WikiPluginInfo;
+import org.apache.wiki.providers.ProviderException;
+
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;
-import com.ecyrd.jspwiki.plugin.PluginManager.WikiPluginInfo;
-import com.ecyrd.jspwiki.providers.ProviderException;
public class PluginManagerTest extends TestCase
{
@@ -72,7 +74,7 @@
throws Exception
{
String res = manager.execute( context,
- "{INSERT com.ecyrd.jspwiki.plugin.SamplePlugin WHERE text=foobar}");
+ "{INSERT org.apache.wiki.plugin.SamplePlugin WHERE text=foobar}");
assertEquals( "foobar",
res );
@@ -113,7 +115,7 @@
res );
}
- /** Check that in all cases com.ecyrd.jspwiki.plugin is searched. */
+ /** Check that in all cases org.apache.wiki.plugin is searched. */
public void testSimpleInsertNoPackage4()
throws Exception
{
@@ -131,7 +133,7 @@
throws Exception
{
String res = manager.execute( context,
- "{INSERT com.ecyrd.jspwiki.plugin.SamplePlugin WHERE text = foobar2, moo=blat}");
+ "{INSERT org.apache.wiki.plugin.SamplePlugin WHERE text = foobar2, moo=blat}");
assertEquals( "foobar2",
res );
@@ -142,7 +144,7 @@
throws Exception
{
String res = manager.execute( context,
- "{INSERT com.ecyrd.jspwiki.plugin.SamplePlugin WHERE text = foobar2, moo=blat");
+ "{INSERT org.apache.wiki.plugin.SamplePlugin WHERE text = foobar2, moo=blat");
assertEquals( "foobar2",
res );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java Sun Feb 1 18:04:05 2009
@@ -19,16 +19,18 @@
under the License.
*/
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
import java.util.Properties;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.plugin.PluginManager;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiContext;
public class ReferredPagesPluginTest extends TestCase
{
@@ -83,7 +85,7 @@
{
context = engine.getWikiContextFactory().newViewContext( null, null, engine.createPage( "IPointToSomeoneElse" ) );
- String res = manager.execute( context, "{INSERT com.ecyrd.jspwiki.plugin.ReferredPagesPlugin}" );
+ String res = manager.execute( context, "{INSERT org.apache.wiki.plugin.ReferredPagesPlugin}" );
assertEquals(
"<div class=\"ReferredPagesPlugin\">\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=IPointToSomeoneElse\" title=\"ReferredPagesPlugin: depth[1] include[.*] exclude[^$] format[compact]\">IPointToSomeoneElse</a>\n<ul>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMe\">SomeBodyPointsToMe</a></li>\n</ul>\n</div>\n",
@@ -100,7 +102,7 @@
{
context = engine.getWikiContextFactory().newViewContext( null, null, engine.createPage( "IPointToSomeoneElse" ) );
- String res = manager.execute( context, "{INSERT com.ecyrd.jspwiki.plugin.ReferredPagesPlugin page=IPointToSomeoneElseToo}" );
+ String res = manager.execute( context, "{INSERT org.apache.wiki.plugin.ReferredPagesPlugin page=IPointToSomeoneElseToo}" );
assertEquals(
"<div class=\"ReferredPagesPlugin\">\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=IPointToSomeoneElseToo\" title=\"ReferredPagesPlugin: depth[1] include[.*] exclude[^$] format[compact]\">IPointToSomeoneElseToo</a>\n<ul>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMe\">SomeBodyPointsToMe</a></li>\n</ul>\n</div>\n",
@@ -117,7 +119,7 @@
context = engine.getWikiContextFactory().newViewContext( null, null, engine.createPage( "IPointToTwoPages" ) );
String res = manager.execute( context,
- "{INSERT com.ecyrd.jspwiki.plugin.ReferredPagesPlugin include='SomeBodyPointsToMe.*'}" );
+ "{INSERT org.apache.wiki.plugin.ReferredPagesPlugin include='SomeBodyPointsToMe.*'}" );
assertEquals(
"<div class=\"ReferredPagesPlugin\">\n<a class=\"wikipage\" href=\"/Wiki.jsp?page=IPointToTwoPages\" title=\"ReferredPagesPlugin: depth[1] include[SomeBodyPointsToMe.*] exclude[^$] format[compact]\">IPointToTwoPages</a>\n<ul>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMe\">SomeBodyPointsToMe</a></li>\n<li><a class=\"wikipage\" href=\"/Wiki.jsp?page=SomeBodyPointsToMeToo\">SomeBodyPointsToMeToo</a></li>\n</ul>\n</div>\n",