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 [11/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/src/java/org/apache/wiki/workflow/Workflow.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java Sun Feb  1 18:04:05 2009
@@ -18,17 +18,17 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.workflow;
+package org.apache.wiki.workflow;
 
 import java.io.Serializable;
 import java.security.Principal;
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiEventManager;
+import org.apache.wiki.event.WorkflowEvent;
 
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WikiEventManager;
-import com.ecyrd.jspwiki.event.WorkflowEvent;
 
 /**
  * <p>
@@ -132,7 +132,7 @@
  * Object. Named attributes are set with {@link #setAttribute(String, Object)}
  * and retrieved with {@link #getAttribute(String)}.</li>
  * <li><strong>Message arguments</strong> are used in combination with
- * JSPWiki's {@link com.ecyrd.jspwiki.i18n.InternationalizationManager} to
+ * JSPWiki's {@link org.apache.wiki.i18n.InternationalizationManager} to
  * create language-independent user interface messages. The message argument
  * array is retrieved via {@link #getMessageArguments()}; the first two array
  * elements will always be these: a String representing work flow owner's name,
@@ -834,7 +834,7 @@
     /**
      * Fires a WorkflowEvent of the provided type to all registered listeners.
      *
-     * @see com.ecyrd.jspwiki.event.WorkflowEvent
+     * @see org.apache.wiki.event.WorkflowEvent
      * @param type
      *            the event type to be fired
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowBuilder.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowBuilder.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowBuilder.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,15 @@
     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.HashMap;
 import java.util.Map;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
 
-import com.ecyrd.jspwiki.WikiEngine;
 
 /**
  * Factory class that creates common Workflow instances such as a standard approval workflow.
@@ -65,8 +65,8 @@
 
     /**
      * <p>Builds an approval workflow that requests approval from a named
-     * user, {@link com.ecyrd.jspwiki.auth.authorize.Group} or
-     * {@link com.ecyrd.jspwiki.auth.authorize.Role} before running a Task.</p>
+     * user, {@link org.apache.wiki.auth.authorize.Group} or
+     * {@link org.apache.wiki.auth.authorize.Role} before running a Task.</p>
      * <p>The Principal who approves the activity is determined by looking up
      * the property <code>jspwiki.approver.<var>workflowApproverKey</var></code>
      * in <code>jspwiki.properties</code>. If that Principal resolves to a known user, Group

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowManager.java Sun Feb  1 18:04:05 2009
@@ -18,19 +18,19 @@
     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.*;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.acl.UnresolvedPrincipal;
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WorkflowEvent;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.acl.UnresolvedPrincipal;
-import com.ecyrd.jspwiki.event.WikiEvent;
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WorkflowEvent;
 
 /**
  * <p>
@@ -115,7 +115,7 @@
      * is <code>jspwiki.approver.workflow.saveWikiPage=Admin</code>,
      * the Decision's message key is <code>workflow.saveWikiPage</code>.
      * The Principal <code>Admin</code> will be resolved via
-     * {@link com.ecyrd.jspwiki.auth.AuthorizationManager#resolvePrincipal(String)}.
+     * {@link org.apache.wiki.auth.AuthorizationManager#resolvePrincipal(String)}.
      * @param engine the wiki engine to associate with this WorkflowManager
      * @param props the wiki engine's properties
      */
@@ -239,7 +239,7 @@
     /**
      * Returns the current workflows a wiki session owns. These are workflows whose
      * {@link Workflow#getOwner()} method returns a Principal also possessed by the
-     * wiki session (see {@link com.ecyrd.jspwiki.WikiSession#getPrincipals()}). If the
+     * wiki session (see {@link org.apache.wiki.WikiSession#getPrincipals()}). If the
      * wiki session is not authenticated, this method returns an empty Collection.
      * @param session the wiki session
      * @return the collection workflows the wiki session owns, which may be empty
@@ -267,11 +267,11 @@
     }
 
     /**
-     * Listens for {@link com.ecyrd.jspwiki.event.WorkflowEvent} objects emitted
+     * Listens for {@link org.apache.wiki.event.WorkflowEvent} objects emitted
      * by Workflows. In particular, this method listens for
-     * {@link com.ecyrd.jspwiki.event.WorkflowEvent#CREATED},
-     * {@link com.ecyrd.jspwiki.event.WorkflowEvent#ABORTED} and
-     * {@link com.ecyrd.jspwiki.event.WorkflowEvent#COMPLETED} events. If a
+     * {@link org.apache.wiki.event.WorkflowEvent#CREATED},
+     * {@link org.apache.wiki.event.WorkflowEvent#ABORTED} and
+     * {@link org.apache.wiki.event.WorkflowEvent#COMPLETED} events. If a
      * workflow is created, it is automatically added to the cache. If one is
      * aborted or completed, it is automatically removed.
      * @param event the event passed to this listener

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java Sun Feb  1 18:04:05 2009
@@ -18,19 +18,19 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
 
 import java.security.Permission;
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.WikiPermission;
 import org.apache.xmlrpc.AuthenticationFailed;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.AuthorizationManager;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
 
 /**
  *  Provides definitions for RPC handler routines.
@@ -105,7 +105,7 @@
 
     /**
      *  Checks whether the current user has permission to perform the RPC action; 
-     *  throws an exception if not allowed by {@link com.ecyrd.jspwiki.auth.AuthorizationManager}.
+     *  throws an exception if not allowed by {@link org.apache.wiki.auth.AuthorizationManager}.
      *  
      *  @param perm the Permission to check
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java Sun Feb  1 18:04:05 2009
@@ -18,32 +18,32 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
 
 import java.io.ByteArrayInputStream;
 import java.util.*;
 
 import javax.security.auth.login.LoginException;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.PageTimeComparator;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.plugin.WeblogEntryPlugin;
+import org.apache.wiki.plugin.WeblogPlugin;
+import org.apache.wiki.providers.ProviderException;
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.ecyrd.jspwiki.PageTimeComparator;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.AuthorizationManager;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.plugin.WeblogEntryPlugin;
-import com.ecyrd.jspwiki.plugin.WeblogPlugin;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Provides handlers for all RPC routines of the MetaWeblog API.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java Sun Feb  1 18:04:05 2009
@@ -18,22 +18,22 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
 
 import java.io.UnsupportedEncodingException;
 import java.util.*;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.util.TextUtil;
 
-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.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.TextUtil;
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
 
 /**
  *  Provides handlers for all RPC routines.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java Sun Feb  1 18:04:05 2009
@@ -18,19 +18,19 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
 
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.LinkCollector;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.auth.permissions.PermissionFactory;
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.ecyrd.jspwiki.LinkCollector;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
 
 /**
  *  Provides handlers for all RPC routines.  These routines are used by

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCServlet.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCServlet.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.xmlrpc;
+package org.apache.wiki.xmlrpc;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -32,14 +32,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
 import org.apache.xmlrpc.*;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
 
 /**
  *  Handles all incoming servlet requests for XML-RPC calls.
@@ -92,7 +92,7 @@
         String handlerName = config.getInitParameter( "handler" );
         String prefix      = config.getInitParameter( "prefix" );
 
-        if( handlerName == null ) handlerName = "com.ecyrd.jspwiki.xmlrpc.RPCHandler";
+        if( handlerName == null ) handlerName = "org.apache.wiki.xmlrpc.RPCHandler";
         if( prefix == null )      prefix = XMLRPC_PREFIX;
 
         try
@@ -103,7 +103,7 @@
             // FIXME: The metaweblog API should be possible to turn off.
             //
             initHandler( "metaWeblog",
-                         "com.ecyrd.jspwiki.xmlrpc.MetaWeblogHandler" );
+                         "org.apache.wiki.xmlrpc.MetaWeblogHandler" );
         }
         catch( Exception e )
         {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java Sun Feb  1 18:04:05 2009
@@ -18,9 +18,9 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.xmlrpc;
+package org.apache.wiki.xmlrpc;
 
-import com.ecyrd.jspwiki.WikiContext;
+import org.apache.wiki.WikiContext;
 
 /**
  *  Any wiki RPC handler should implement this so that they can be properly

Modified: incubator/jspwiki/trunk/src/wikipages/de/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/de/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/de/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/de/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 Dieser Server befindet sich in der Zeitzone ''[{INSERT CurrentTimePlugin format=zzzz}]'', wo es momentan der [{INSERT CurrentTimePlugin format='dd. MMMM yyyy \'um\' HH:mm \'Uhr\''}] ist.
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/de/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/de/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/de/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/de/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 Dieser Server befindet sich in der Zeitzone ''[{INSERT CurrentTimePlugin format=zzzz}]'', wo es momentan der [{INSERT CurrentTimePlugin format='dd. MMMM yyyy \'um\' HH:mm \'Uhr\''}] ist.
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/de/UndefinedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/de/UndefinedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/de/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/de/UndefinedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 Folgende Seiten wurden referenziert, aber bisher noch nicht erstellt. Erstelle doch einfach ein paar!
 
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
 
 (Zurück zur [Startseite|Main])

Modified: incubator/jspwiki/trunk/src/wikipages/de/UnusedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/de/UnusedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/de/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/de/UnusedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 Folgende Seiten werden momentan nicht benutzt, das heißt, es führt kein Link auf diese Seiten (außer von automatisch generierten Seiten aus).
 
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]
 
 (Zurück zur [Startseite|Main])

Modified: incubator/jspwiki/trunk/src/wikipages/en/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 These are all of the changes made to these pages.  A much shorter list is available in [RecentChanges].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/en/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 This server lives on [{INSERT CurrentTimePlugin format=zzzz}] and the time here is [{INSERT CurrentTimePlugin format='HH:mm \'on\' dd-MMM-yyyy'}].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/en/UndefinedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/UndefinedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/UndefinedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,6 +1,6 @@
 Here are the pages that have not yet been created.  Why don't you go and create
 a few?
 
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
 
 (Back to [Main]).

Modified: incubator/jspwiki/trunk/src/wikipages/en/UnusedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/UnusedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/UnusedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 These pages are lone pages that are not accessible from any page (except those that are automatically generated).
 
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/es/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/es/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/es/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/es/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Estos son todos los cambios hechos a las páginas.  Una lista bastante más reducida está disponible en [Cambios Recientes|RecentChanges].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/es/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/es/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/es/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/es/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 Este servidor vive en [{INSERT CurrentTimePlugin format=zzzz}] y la hora aquí es [{INSERT CurrentTimePlugin format='HH:mm \'a\' dd-MMM-yyyy'}].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/es/UndefinedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/es/UndefinedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/es/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/es/UndefinedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,6 +1,6 @@
 Aquí está el listado de las páginas que aún no han sido creadas.  ¿Por qué no vas y creas
 unas cuantas?
 
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
 
 (Vuelta a la página [Principal|Main]).

Modified: incubator/jspwiki/trunk/src/wikipages/es/UnusedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/es/UnusedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/es/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/es/UnusedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Estás páginas no son accesibles desde ninguna otra página (excepto aquellas que son generadas automáticamente).
 
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/fr/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fr/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fr/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/fr/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Voici la liste complète de tous les changements. La page des [derniers changements|RecentChanges] en propose une liste beaucoup plus courte.
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/fr/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/fr/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/fr/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/fr/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 Ce serveur tourne sur le fuseau horaire «[{INSERT CurrentTimePlugin format=zzzz}]» et il est [{INSERT CurrentTimePlugin format='HH:mm \', le\' dd-MMM-yyyy'}].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/it/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/it/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/it/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/it/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Queste sono tutte le modifiche fatte a queste pagine. Una lista più concisa è disponibile sulla pagina: [cambiamenti recenti | RecentChanges].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/it/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/it/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/it/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/it/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 Questo server assume la time zone [{INSERT CurrentTimePlugin format=zzzz}] e l'orario qui risulta [{INSERT CurrentTimePlugin format='HH:mm \'on\' dd-MMM-yyyy'}].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/it/UndefinedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/it/UndefinedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/it/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/it/UndefinedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 Queste sono le pagine che sono state collegate ma non ancora create. Perchè non le create?
 
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
 
 (Torna alla [pagina principale | Main]).

Modified: incubator/jspwiki/trunk/src/wikipages/it/UnusedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/it/UnusedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/it/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/it/UnusedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Queste sono le pagine non collegate a nessun'altra pagina (escluse quelle create automaticamente).
 
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/nl/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/nl/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/nl/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/nl/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Dit zijn alle wijzigingen die op deze pagina's zijn gemaakt. Een betere lijst is beschikbaar op [RecentChanges].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/nl/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/nl/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/nl/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/nl/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -3,4 +3,4 @@
 This server lives on [{INSERT CurrentTimePlugin format=zzzz}] and the time here is [{INSERT CurrentTimePlugin format='HH:mm \'on\' dd-MMM-yyyy'}].
 De server bevindt zich op [{INSERT CurrentTimePlugin format=zzzz}] en het is hier nu [{INSERT CurrentTimePlugin format='HH:mm \'on\' dd-MMM-yyyy'}].
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/nl/UndefinedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/nl/UndefinedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/nl/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/nl/UndefinedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 Hier zijn de pagina's die nog niet zijn gemaakt. Waarom maak je er niet een paar ?
 
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
 
 (Terug naar [Main]).

Modified: incubator/jspwiki/trunk/src/wikipages/nl/UnusedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/nl/UnusedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/nl/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/nl/UnusedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 Deze pagina's zijn zelfstandige pagina's die niet toegankelijk zijn van welke pagina dan ook (behalve die automatisch worden gegenereerd).
 
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/zh_CN/FullRecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/zh_CN/FullRecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/zh_CN/FullRecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/zh_CN/FullRecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 这些是对所有页面做的修改。短一些的列表可以在 [RecentChanges] 中找到。
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}]

Modified: incubator/jspwiki/trunk/src/wikipages/zh_CN/RecentChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/zh_CN/RecentChanges.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/zh_CN/RecentChanges.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/zh_CN/RecentChanges.txt Sun Feb  1 18:04:05 2009
@@ -2,4 +2,4 @@
 
 此服务器所在时区为 [{INSERT CurrentTimePlugin format=zzzz}]，目前的时间是 [{INSERT CurrentTimePlugin format='yyyy-MM-dd HH:mm'}]。
 
-[{INSERT com.ecyrd.jspwiki.plugin.RecentChangesPlugin since=30}]
+[{INSERT org.apache.wiki.plugin.RecentChangesPlugin since=30}]

Modified: incubator/jspwiki/trunk/src/wikipages/zh_CN/UndefinedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/zh_CN/UndefinedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/zh_CN/UndefinedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/zh_CN/UndefinedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 这些是还没有创建的页面。为何不去创建一些页面呢？
 
-[{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UndefinedPagesPlugin}]
 
 （返回[主页|Main]）

Modified: incubator/jspwiki/trunk/src/wikipages/zh_CN/UnusedPages.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/zh_CN/UnusedPages.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/zh_CN/UnusedPages.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/zh_CN/UnusedPages.txt Sun Feb  1 18:04:05 2009
@@ -1,3 +1,3 @@
 这些是没有从任何页面（自动生成的页面除外）访问的页面。
 
-[{INSERT com.ecyrd.jspwiki.plugin.UnusedPagesPlugin}]
+[{INSERT org.apache.wiki.plugin.UnusedPagesPlugin}]

Modified: incubator/jspwiki/trunk/tests/etc/TestPlugins.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/TestPlugins.txt?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jspwiki/trunk/tests/etc/filters.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/filters.xml?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/filters.xml (original)
+++ incubator/jspwiki/trunk/tests/etc/filters.xml Sun Feb  1 18:04:05 2009
@@ -3,11 +3,11 @@
 <pagefilters>
 
    <filter>
-      <class>com.ecyrd.jspwiki.filters.ProfanityFilter</class>
+      <class>org.apache.wiki.filters.ProfanityFilter</class>
    </filter>
    
    <filter>
-      <class>com.ecyrd.jspwiki.filters.TestFilter</class>
+      <class>org.apache.wiki.filters.TestFilter</class>
 
       <param>
          <name>foobar</name>

Modified: incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml (original)
+++ incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml Sun Feb  1 18:04:05 2009
@@ -9,7 +9,7 @@
         <stylesheet>foo2.css</stylesheet>
         <alias>samplealias2</alias>
     </plugin>
-    <plugin class="com.ecyrd.jspwiki.plugin.SamplePlugin">
+    <plugin class="org.apache.wiki.plugin.SamplePlugin">
         <author>Janne Jalkanen</author>
         <script>foo.js</script>
         <stylesheet>foo.css</stylesheet>

Modified: incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy Sun Feb  1 18:04:05 2009
@@ -1,15 +1,15 @@
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "All" {
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "login";
+grant principal org.apache.wiki.auth.authorize.Role "All" {
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "login";
 };
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Authenticated" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "view";
+grant principal org.apache.wiki.auth.authorize.Role "Authenticated" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "view";
 };
 
-grant principal com.ecyrd.jspwiki.auth.WikiPrincipal "Janne Jalkanen" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "edit,delete";
+grant principal org.apache.wiki.auth.WikiPrincipal "Janne Jalkanen" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "edit,delete";
 };
 
 grant principal "Bob" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "edit,delete";
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "edit,delete";
 };

Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.policy
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.policy?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.policy (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.policy Sun Feb  1 18:04:05 2009
@@ -30,11 +30,11 @@
 // If that seems too loose for your needs, you can restrict page-viewing
 // privileges by moving the PagePermission 'view' grant to one of the other blocks.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "All" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "view";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "editPreferences";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "editProfile";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "login";
+grant principal org.apache.wiki.auth.authorize.Role "All" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "view";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "editPreferences";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "editProfile";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "login";
 };
 
 
@@ -45,9 +45,9 @@
 // lines containing the "edit" and "createPages" permissions; this will make
 // the wiki read-only for anonymous users.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Anonymous" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "edit";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "createPages";
+grant principal org.apache.wiki.auth.authorize.Role "Anonymous" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "edit";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages";
 };
 
 
@@ -55,10 +55,10 @@
 // be someone (via their cookie) to create, edit and comment on all pages.
 // They can also view the membership list of groups.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Asserted" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "edit";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "createPages";
-    permission com.ecyrd.jspwiki.auth.permissions.GroupPermission "*:*", "view";
+grant principal org.apache.wiki.auth.authorize.Role "Asserted" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "edit";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages";
+    permission org.apache.wiki.auth.permissions.GroupPermission "*:*", "view";
 };
 
 
@@ -67,11 +67,11 @@
 // wiki groups; and rename existing pages. Authenticated users can also
 // edit groups they are members of.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Authenticated" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "modify,rename";
-    permission com.ecyrd.jspwiki.auth.permissions.GroupPermission "*:*", "view";
-    permission com.ecyrd.jspwiki.auth.permissions.GroupPermission "*:<groupmember>", "edit";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "createPages,createGroups";
+grant principal org.apache.wiki.auth.authorize.Role "Authenticated" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "modify,rename";
+    permission org.apache.wiki.auth.permissions.GroupPermission "*:*", "view";
+    permission org.apache.wiki.auth.permissions.GroupPermission "*:<groupmember>", "edit";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages,createGroups";
 };
 
 
@@ -83,9 +83,9 @@
 // the wiki group "Admin" (stored by default in wiki page GroupAdmin)
 // and the container role "Admin" (managed by the web container).
 
-grant principal com.ecyrd.jspwiki.auth.GroupPrincipal "Admin" {
-    permission com.ecyrd.jspwiki.auth.permissions.AllPermission "*";
+grant principal org.apache.wiki.auth.GroupPrincipal "Admin" {
+    permission org.apache.wiki.auth.permissions.AllPermission "*";
 };
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Admin" {
-    permission com.ecyrd.jspwiki.auth.permissions.AllPermission "*";
+grant principal org.apache.wiki.auth.authorize.Role "Admin" {
+    permission org.apache.wiki.auth.permissions.AllPermission "*";
 };

Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl Sun Feb  1 18:04:05 2009
@@ -7,7 +7,7 @@
 #    RCSFileProvider for simple RCS-based file storage
 #    FileSystemProvider for simple pure file storage with no version information
 #
-jspwiki.pageProvider = com.ecyrd.jspwiki.providers.FileSystemProvider
+jspwiki.pageProvider = org.apache.wiki.providers.FileSystemProvider
 
 jspwiki.usePageCache = true
 #
@@ -33,7 +33,7 @@
 jspwiki.baseURL = http://localhost/
 jspwiki.referenceStyle = relative
 jspwiki.searchProvider = BasicSearchProvider
-jspwiki.authorizer=com.ecyrd.jspwiki.TestAuthorizer
+jspwiki.authorizer=org.apache.wiki.TestAuthorizer
 
 #
 #  Special page references.
@@ -71,11 +71,11 @@
 # Security: use standard providers for user/group auth, user management
 # and ACLs. Use a test userdatabase for storing users.
 #
-jspwiki.aclManager          = com.ecyrd.jspwiki.auth.acl.DefaultAclManager
-#jspwiki.authorizer          = com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer
-jspwiki.groupdatabase = com.ecyrd.jspwiki.auth.authorize.XMLGroupDatabase
+jspwiki.aclManager          = org.apache.wiki.auth.acl.DefaultAclManager
+#jspwiki.authorizer          = org.apache.wiki.auth.authorize.WebContainerAuthorizer
+jspwiki.groupdatabase = org.apache.wiki.auth.authorize.XMLGroupDatabase
 jspwiki.xmlGroupDatabaseFile = tests/etc/groupdatabase.xml
-jspwiki.userdatabase        = com.ecyrd.jspwiki.auth.user.XMLUserDatabase
+jspwiki.userdatabase        = org.apache.wiki.auth.user.XMLUserDatabase
 jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
 jspwiki.admin.user = admin
 

Modified: incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl Sun Feb  1 18:04:05 2009
@@ -50,10 +50,10 @@
 # Security: use standard providers for user/group auth, user management
 # and ACLs. Use a test userdatabase for storing users.
 #
-jspwiki.aclManager          = com.ecyrd.jspwiki.auth.acl.DefaultAclManager
-jspwiki.authorizer          = com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer
-jspwiki.groupManager        = com.ecyrd.jspwiki.auth.authorize.DefaultGroupManager
-jspwiki.userdatabase        = com.ecyrd.jspwiki.auth.user.XMLUserDatabase
+jspwiki.aclManager          = org.apache.wiki.auth.acl.DefaultAclManager
+jspwiki.authorizer          = org.apache.wiki.auth.authorize.WebContainerAuthorizer
+jspwiki.groupManager        = org.apache.wiki.auth.authorize.DefaultGroupManager
+jspwiki.userdatabase        = org.apache.wiki.auth.user.XMLUserDatabase
 jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
 jspwiki.admin.user = admin
 

Modified: incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl Sun Feb  1 18:04:05 2009
@@ -52,10 +52,10 @@
 # Security: use standard providers for user/group auth, user management
 # and ACLs. Use a test userdatabase for storing users.
 #
-jspwiki.aclManager          = com.ecyrd.jspwiki.auth.acl.DefaultAclManager
-jspwiki.authorizer          = com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer
-jspwiki.groupManager        = com.ecyrd.jspwiki.auth.authorize.DefaultGroupManager
-jspwiki.userdatabase        = com.ecyrd.jspwiki.auth.user.XMLUserDatabase
+jspwiki.aclManager          = org.apache.wiki.auth.acl.DefaultAclManager
+jspwiki.authorizer          = org.apache.wiki.auth.authorize.WebContainerAuthorizer
+jspwiki.groupManager        = org.apache.wiki.auth.authorize.DefaultGroupManager
+jspwiki.userdatabase        = org.apache.wiki.auth.user.XMLUserDatabase
 jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
 jspwiki.admin.user = admin
 

Modified: incubator/jspwiki/trunk/tests/java/SamplePlugin2.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/SamplePlugin2.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/SamplePlugin2.java (original)
+++ incubator/jspwiki/trunk/tests/java/SamplePlugin2.java Sun Feb  1 18:04:05 2009
@@ -20,11 +20,11 @@
  */
 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.WikiPlugin;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
 
 /**
  *  Implements a simple plugin that just returns its text.

Modified: incubator/jspwiki/trunk/tests/java/TranslationsCheck.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/TranslationsCheck.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/TranslationsCheck.java (original)
+++ incubator/jspwiki/trunk/tests/java/TranslationsCheck.java Sun Feb  1 18:04:05 2009
@@ -21,7 +21,8 @@
 import java.io.*;
 import java.util.*;
 
-import com.ecyrd.jspwiki.Release;
+import org.apache.wiki.Release;
+
 
 /**
  * Simple utility that shows you a sorted list of property differences between

Modified: incubator/jspwiki/trunk/tests/java/com/foo/SamplePlugin3.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/com/foo/SamplePlugin3.java?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/foo/SamplePlugin3.java (original)
+++ incubator/jspwiki/trunk/tests/java/com/foo/SamplePlugin3.java Sun Feb  1 18:04:05 2009
@@ -22,11 +22,11 @@
 
 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.WikiPlugin;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
 
 /**
  *  Implements a simple plugin that just returns its text.

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/AllTests.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/AllTests.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -48,27 +48,27 @@
         // suite.addTest( TranslatorReaderTest.suite() );
         suite.addTest( WikiSessionTest.suite() );
         suite.addTest( WikiEngineTest.suite() );
-        suite.addTest( com.ecyrd.jspwiki.action.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.content.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.attachment.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.auth.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.dav.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.diff.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.filters.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.htmltowiki.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.parser.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.plugin.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.providers.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.render.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.rss.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.search.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.ui.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.url.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.util.AllTests.suite() );
+        suite.addTest( org.apache.wiki.action.AllTests.suite() );
+        suite.addTest( org.apache.wiki.content.AllTests.suite() );
+        suite.addTest( org.apache.wiki.attachment.AllTests.suite() );
+        suite.addTest( org.apache.wiki.auth.AllTests.suite() );
+        suite.addTest( org.apache.wiki.dav.AllTests.suite() );
+        suite.addTest( org.apache.wiki.diff.AllTests.suite() );
+        suite.addTest( org.apache.wiki.filters.AllTests.suite() );
+        suite.addTest( org.apache.wiki.htmltowiki.AllTests.suite() );
+        suite.addTest( org.apache.wiki.parser.AllTests.suite() );
+        suite.addTest( org.apache.wiki.plugin.AllTests.suite() );
+        suite.addTest( org.apache.wiki.providers.AllTests.suite() );
+        suite.addTest( org.apache.wiki.render.AllTests.suite() );
+        suite.addTest( org.apache.wiki.rss.AllTests.suite() );
+        suite.addTest( org.apache.wiki.search.AllTests.suite() );
+        suite.addTest( org.apache.wiki.ui.AllTests.suite() );
+        suite.addTest( org.apache.wiki.url.AllTests.suite() );
+        suite.addTest( org.apache.wiki.util.AllTests.suite() );
         // These are not runnable without a running tomcat
-        //suite.addTest( com.ecyrd.jspwiki.web.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.workflow.AllTests.suite() );
-        suite.addTest( com.ecyrd.jspwiki.xmlrpc.AllTests.suite() );
+        //suite.addTest( org.apache.wiki.web.AllTests.suite() );
+        suite.addTest( org.apache.wiki.workflow.AllTests.suite() );
+        suite.addTest( org.apache.wiki.xmlrpc.AllTests.suite() );
         
         return suite;
     }

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/FileUtilTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/FileUtilTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/FileUtilTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/FileUtilTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/FileUtilTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/FileUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/FileUtilTest.java Sun Feb  1 18:04:05 2009
@@ -19,12 +19,13 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import junit.framework.*;
 import java.io.*;
 
-import com.ecyrd.jspwiki.util.FileUtil;
+import org.apache.wiki.util.FileUtil;
+
 
 public class FileUtilTest extends TestCase
 {

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/PageManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PageManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/PageManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/PageManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PageManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PageManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/PageManagerTest.java Sun Feb  1 18:04:05 2009
@@ -19,16 +19,17 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import java.util.Properties;
 
+import org.apache.wiki.PageManager;
+import org.apache.wiki.providers.CachingProvider;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.ecyrd.jspwiki.PageManager;
-import com.ecyrd.jspwiki.providers.CachingProvider;
 
 public class PageManagerTest extends TestCase
 {

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PropertyReaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PropertyReaderTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PropertyReaderTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java Sun Feb  1 18:04:05 2009
@@ -18,10 +18,12 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import java.util.Properties;
 
+import org.apache.wiki.PropertyReader;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReferenceManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReferenceManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReferenceManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import junit.framework.*;
 import java.util.*;
 import java.io.*;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.ReferenceManager;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.providers.FileSystemProvider;
 
-import com.ecyrd.jspwiki.providers.FileSystemProvider;
 
 /**
  *  @author Torsten Hildebrandt.

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReleaseTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReleaseTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReleaseTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReleaseTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReleaseTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReleaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReleaseTest.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;
+package org.apache.wiki;
+
+import org.apache.wiki.Release;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestAuthorizer.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestAuthorizer.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestAuthorizer.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestAuthorizer.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestAuthorizer.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestAuthorizer.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestAuthorizer.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,18 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import java.security.Principal;
 import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.authorize.WebAuthorizer;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.authorize.WebAuthorizer;
+
 
 /**
  * A very fast authorizer that does almost nothing. The WebContainerAuthorizer module
@@ -87,7 +90,7 @@
      * Returns <code>true</code> if the HTTP request contains 
      * a particular role principal. Delegates to
      * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}.
-     * @see com.ecyrd.jspwiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, java.security.Principal)
+     * @see org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, java.security.Principal)
      */
     public boolean isUserInRole( HttpServletRequest request, Principal role )
     {

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestEngine.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestEngine.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
@@ -36,26 +36,30 @@
 import net.sourceforge.stripes.mock.MockRoundtrip;
 import net.sourceforge.stripes.mock.MockServletContext;
 
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.action.WikiActionBean;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.SessionMonitor;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.AbstractFileProvider;
+import org.apache.wiki.providers.BasicAttachmentProvider;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.ui.WikiServletFilter;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.action.WikiActionBean;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.SessionMonitor;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.content.ContentManager;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.providers.AbstractFileProvider;
-import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
-import com.ecyrd.jspwiki.providers.FileSystemProvider;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.ui.WikiServletFilter;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  <p>Simple test engine that always assumes pages are found. The version of TestEngine that is part of JSPWiki 3.0
@@ -141,7 +145,7 @@
         
         // Stash the WikiEngine in the servlet context
         ServletContext servletContext = this.getServletContext();
-        servletContext.setAttribute("com.ecyrd.jspwiki.WikiEngine", this);
+        servletContext.setAttribute("org.apache.wiki.WikiEngine", this);
     }
     
     /**
@@ -406,13 +410,13 @@
     private static Properties cleanTestProps( Properties props )
     {
         props.put( AuthenticationManager.PROP_LOGIN_THROTTLING, "false" );
-        props.put( WikiEngine.PROP_URLCONSTRUCTOR, "com.ecyrd.jspwiki.url.DefaultURLConstructor" );
+        props.put( WikiEngine.PROP_URLCONSTRUCTOR, "org.apache.wiki.url.DefaultURLConstructor" );
         return props;
     }
 
     /**
      * Creates a guest "round trip" object that initializes itself with the TestEngine's mock servlet context,
-     * plus a new mock request, mock response and action bean of type {@link com.ecyrd.jspwiki.action.ViewActionBean}.
+     * plus a new mock request, mock response and action bean of type {@link org.apache.wiki.action.ViewActionBean}.
      * This method is the preferred way to instantiate request and response objects, which can be
      * obtained by calling {@link net.sourceforge.stripes.mock.MockRoundtrip#getRequest()} and
      * {@link net.sourceforge.stripes.mock.MockRoundtrip#getResponse()}.
@@ -484,11 +488,11 @@
         
         // Add extension classes
         Map<String,String> filterParams = new HashMap<String,String>();
-        filterParams.put("ActionResolver.Packages", "com.ecyrd.jspwiki.action");
-        filterParams.put("Extension.Packages", "com.ecyrd.jspwiki.ui.stripes");
+        filterParams.put("ActionResolver.Packages", "org.apache.wiki.action");
+        filterParams.put("Extension.Packages", "org.apache.wiki.ui.stripes");
         
         // Add the exception handler class
-        filterParams.put( "ExceptionHandler.Class", "com.ecyrd.jspwiki.ui.stripes.WikiExceptionHandler" );
+        filterParams.put( "ExceptionHandler.Class", "org.apache.wiki.ui.stripes.WikiExceptionHandler" );
         
         // Return the configured servlet context
         servletContext.addFilter(StripesFilter.class, "StripesFilter", filterParams);

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJDBCDataSource.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJDBCDataSource.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJDBCDataSource.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.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;
+package org.apache.wiki;
 
 import java.io.File;
 import java.io.FileInputStream;

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJNDIContext.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJNDIContext.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJNDIContext.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJNDIContext.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJNDIContext.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJNDIContext.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJNDIContext.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;
+package org.apache.wiki;
 
 import java.util.HashMap;
 import java.util.Hashtable;

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TextUtilTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TextUtilTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TextUtilTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/TextUtilTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TextUtilTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TextUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TextUtilTest.java Sun Feb  1 18:04:05 2009
@@ -19,12 +19,13 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import junit.framework.*;
 import java.util.*;
 
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.util.TextUtil;
+
 
 public class TextUtilTest extends TestCase
 {

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/Util.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/Util.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/Util.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.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;
+package org.apache.wiki;
 
 import java.util.*;
 

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java Sun Feb  1 18:04:05 2009
@@ -19,20 +19,24 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
 
+import org.apache.wiki.NoSuchVariableException;
+import org.apache.wiki.VariableManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.preferences.Preferences.TimeFormat;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.preferences.Preferences;
-import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
 
 public class VariableManagerTest extends TestCase
 {

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiEngineTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiEngineTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Sun Feb  1 18:04:05 2009
@@ -19,20 +19,21 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import junit.framework.*;
 import java.io.*;
 import java.util.*;
 
-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.*;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.providers.*;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.providers.*;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
-import com.ecyrd.jspwiki.attachment.*;
-import com.ecyrd.jspwiki.content.WikiName;
 
 public class WikiEngineTest extends TestCase
 {
@@ -356,7 +357,7 @@
 
     public void testLatestGet() throws Exception
     {
-        props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+        props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.VerySimpleProvider" );
         props.setProperty( "jspwiki.usePageCache", "false" );
 
         m_engine.shutdown();
@@ -373,7 +374,7 @@
 
     public void testLatestGet2() throws Exception
     {
-            props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+            props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.VerySimpleProvider" );
             props.setProperty( "jspwiki.usePageCache", "false" );
 
             m_engine.shutdown();
@@ -390,7 +391,7 @@
 
     public void testLatestGet3() throws Exception
     {
-            props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+            props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.VerySimpleProvider" );
             props.setProperty( "jspwiki.usePageCache", "false" );
 
             m_engine.shutdown();
@@ -407,7 +408,7 @@
 
     public void testLatestGet4() throws Exception
     {
-        props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+        props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.VerySimpleProvider" );
         props.setProperty( "jspwiki.usePageCache", "true" );
 
         m_engine.shutdown();

Copied: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiSessionTest.java (from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiSessionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiSessionTest.java?p2=incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiSessionTest.java&p1=incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiSessionTest.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiSessionTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiSessionTest.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;
+package org.apache.wiki;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -37,15 +37,17 @@
 import net.sourceforge.stripes.mock.*;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.Users;
+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.CookieAuthenticationLoginModule;
+import org.apache.wiki.ui.WikiServletFilter;
 
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
-import com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule;
-import com.ecyrd.jspwiki.ui.WikiServletFilter;
 
 public class WikiSessionTest extends TestCase
 {
@@ -350,7 +352,7 @@
     {
         // Create a mock servlet context and stash the wiki engine in it
         ServletContext servletCtx = new MockServletContext( "JSPWiki" );
-        servletCtx.setAttribute( "com.ecyrd.jspwiki.WikiEngine", engine );
+        servletCtx.setAttribute( "org.apache.wiki.WikiEngine", engine );
         
         // Create a mock filter configuration and add the servlet context we just created
         MockFilterConfig filterConfig = new MockFilterConfig();

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/AllTests.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/AllTests.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.    
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java Sun Feb  1 18:04:05 2009
@@ -18,25 +18,27 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.util.Properties;
 
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.action.GroupActionBean;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.SessionMonitor;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupDatabase;
+import org.apache.wiki.auth.authorize.GroupManager;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import net.sourceforge.stripes.mock.MockRoundtrip;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.SessionMonitor;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupDatabase;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
 
 public class GroupActionBeanTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java Sun Feb  1 18:04:05 2009
@@ -18,24 +18,26 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.util.Properties;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.action.LoginActionBean;
+import org.apache.wiki.auth.SessionMonitor;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import net.sourceforge.stripes.mock.MockRoundtrip;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.SessionMonitor;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
 
 public class LoginActionBeanTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java Sun Feb  1 18:04:05 2009
@@ -18,11 +18,14 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.util.Properties;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.action.RenameActionBean;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.Users;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -30,8 +33,6 @@
 import net.sourceforge.stripes.mock.MockRoundtrip;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.auth.Users;
 
 public class RenameActionBeanTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java Sun Feb  1 18:04:05 2009
@@ -18,12 +18,18 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.util.Properties;
 
 import javax.servlet.http.Cookie;
 
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.action.UserPreferencesActionBean;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -31,10 +37,6 @@
 import net.sourceforge.stripes.mock.MockHttpServletResponse;
 import net.sourceforge.stripes.mock.MockRoundtrip;
 
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.Users;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
 
 public class UserPreferencesActionBeanTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java Sun Feb  1 18:04:05 2009
@@ -18,10 +18,17 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.util.Properties;
 
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.action.UserProfileActionBean;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+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;
@@ -29,11 +36,6 @@
 import net.sourceforge.stripes.mock.MockRoundtrip;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
 
 public class UserProfileActionBeanTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.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.action;
+package org.apache.wiki.action;
 
 import java.util.Properties;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.action.ViewActionBean;
+import org.apache.wiki.api.WikiPage;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import net.sourceforge.stripes.mock.MockRoundtrip;
 
-import com.ecyrd.jspwiki.TestEngine;
 
 public class ViewActionBeanTest extends TestCase
 {