jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r739802 [4/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/ sr...
Date Sun, 01 Feb 2009 18:04:50 GMT
Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.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.IOException;
@@ -37,52 +37,52 @@
 import net.sourceforge.stripes.action.RedirectResolution;
 
 import org.apache.commons.lang.time.StopWatch;
-import org.apache.jspwiki.api.FilterException;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
-
-import com.ecyrd.jspwiki.action.WikiActionBean;
-import com.ecyrd.jspwiki.action.WikiContextFactory;
-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.UserManager;
-import com.ecyrd.jspwiki.auth.acl.AclManager;
-import com.ecyrd.jspwiki.auth.acl.DefaultAclManager;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.content.ContentManager;
-import com.ecyrd.jspwiki.content.PageRenamer;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.diff.DifferenceManager;
-import com.ecyrd.jspwiki.event.WikiEngineEvent;
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WikiEventManager;
-import com.ecyrd.jspwiki.filters.FilterManager;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
-import com.ecyrd.jspwiki.plugin.PluginManager;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.providers.WikiPageProvider;
-import com.ecyrd.jspwiki.render.RenderingManager;
-import com.ecyrd.jspwiki.rss.RSSGenerator;
-import com.ecyrd.jspwiki.rss.RSSThread;
-import com.ecyrd.jspwiki.search.SearchManager;
-import com.ecyrd.jspwiki.ui.EditorManager;
-import com.ecyrd.jspwiki.ui.TemplateManager;
-import com.ecyrd.jspwiki.ui.admin.AdminBeanManager;
-import com.ecyrd.jspwiki.ui.progress.ProgressManager;
-import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
-import com.ecyrd.jspwiki.ui.stripes.WikiInterceptor;
-import com.ecyrd.jspwiki.url.URLConstructor;
-import com.ecyrd.jspwiki.util.ClassUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
-import com.ecyrd.jspwiki.util.WatchDog;
-import com.ecyrd.jspwiki.workflow.*;
+import org.apache.wiki.action.WikiActionBean;
+import org.apache.wiki.action.WikiContextFactory;
+import org.apache.wiki.api.FilterException;
+import org.apache.wiki.api.WikiException;
+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.UserManager;
+import org.apache.wiki.auth.acl.AclManager;
+import org.apache.wiki.auth.acl.DefaultAclManager;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.content.PageRenamer;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.diff.DifferenceManager;
+import org.apache.wiki.event.WikiEngineEvent;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiEventManager;
+import org.apache.wiki.filters.FilterManager;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.plugin.PluginManager;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.providers.WikiPageProvider;
+import org.apache.wiki.render.RenderingManager;
+import org.apache.wiki.rss.RSSGenerator;
+import org.apache.wiki.rss.RSSThread;
+import org.apache.wiki.search.SearchManager;
+import org.apache.wiki.ui.EditorManager;
+import org.apache.wiki.ui.TemplateManager;
+import org.apache.wiki.ui.admin.AdminBeanManager;
+import org.apache.wiki.ui.progress.ProgressManager;
+import org.apache.wiki.ui.stripes.WikiActionBeanContext;
+import org.apache.wiki.ui.stripes.WikiInterceptor;
+import org.apache.wiki.url.URLConstructor;
+import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.TextUtil;
+import org.apache.wiki.util.WatchDog;
+import org.apache.wiki.workflow.*;
+
 
 /**
  *  Provides Wiki services to the JSP page.
@@ -100,7 +100,7 @@
  */
 public class WikiEngine
 {
-    private static final String ATTR_WIKIENGINE = "com.ecyrd.jspwiki.WikiEngine";
+    private static final String ATTR_WIKIENGINE = "org.apache.wiki.WikiEngine";
 
     private static final Logger log = LoggerFactory.getLogger(WikiEngine.class);
 
@@ -519,7 +519,7 @@
             //  Initialize the WikiContextFactory -- this MUST be done after setting the baseURL
             m_contextFactory  = new WikiContextFactory( this, props );
             
-            Class urlclass = ClassUtil.findClass( "com.ecyrd.jspwiki.url",
+            Class urlclass = ClassUtil.findClass( "org.apache.wiki.url",
                     TextUtil.getStringProperty( props, PROP_URLCONSTRUCTOR, "DefaultURLConstructor" ) );
             m_urlConstructor = (URLConstructor) urlclass.newInstance();
             m_urlConstructor.initialize( this, props );
@@ -1071,7 +1071,7 @@
      *  <p>If the page is a special page, then returns a direct URL
      *  to that page.  Otherwise returns <code>null</code>.
      *  This method delegates requests to
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#getSpecialPageResolution(String)}.
+     *  {@link org.apache.wiki.action.WikiContextFactory#getSpecialPageResolution(String)}.
      *  </p>
      *  <p>
      *  Special pages are defined in jspwiki.properties using the jspwiki.specialPage
@@ -1256,7 +1256,7 @@
      *  Returns the correct page name, or null, if no such
      *  page can be found.  Aliases are considered. This
      *  method simply delegates to
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#getFinalPageName(String)}.
+     *  {@link org.apache.wiki.action.WikiContextFactory#getFinalPageName(String)}.
      *  @since 2.0
      *  @param page Page name.
      *  @return The rewritten page name, or null, if the page does not exist.
@@ -1325,7 +1325,7 @@
     }
 
     /**
-     * Returns the {@link com.ecyrd.jspwiki.workflow.WorkflowManager} associated with this
+     * Returns the {@link org.apache.wiki.workflow.WorkflowManager} associated with this
      * WikiEngine. If the WIkiEngine has not been initialized, this method will return
      * <code>null</code>.
      * @return the task queue
@@ -1709,10 +1709,10 @@
      *  Writes the WikiText of a page into the
      *  page repository. If the <code>jspwiki.properties</code> file contains
      *  the property <code>jspwiki.approver.workflow.saveWikiPage</code> and
-     *  its value resolves to a valid user, {@link com.ecyrd.jspwiki.auth.authorize.Group}
-     *  or {@link com.ecyrd.jspwiki.auth.authorize.Role}, this method will
-     *  place a {@link com.ecyrd.jspwiki.workflow.Decision} in the approver's
-     *  workflow inbox and throw a {@link com.ecyrd.jspwiki.workflow.DecisionRequiredException}.
+     *  its value resolves to a valid user, {@link org.apache.wiki.auth.authorize.Group}
+     *  or {@link org.apache.wiki.auth.authorize.Role}, this method will
+     *  place a {@link org.apache.wiki.workflow.Decision} in the approver's
+     *  workflow inbox and throw a {@link org.apache.wiki.workflow.DecisionRequiredException}.
      *  If the submitting user is authenticated and the page save is rejected,
      *  a notification will be placed in the user's decision queue.
      *
@@ -1721,9 +1721,9 @@
      *  @param text    The Wiki markup for the page.
      *  @throws WikiException if the save operation encounters an error during the
      *  save operation. If the page-save operation requires approval, the exception will
-     *  be of type {@link com.ecyrd.jspwiki.workflow.DecisionRequiredException}. Individual
-     *  PageFilters, such as the {@link com.ecyrd.jspwiki.filters.SpamFilter} may also
-     *  throw a {@link com.ecyrd.jspwiki.filters.RedirectException}.
+     *  be of type {@link org.apache.wiki.workflow.DecisionRequiredException}. Individual
+     *  PageFilters, such as the {@link org.apache.wiki.filters.SpamFilter} may also
+     *  throw a {@link org.apache.wiki.filters.RedirectException}.
      */
     public void saveText( WikiContext context, String text )
         throws WikiException
@@ -2155,34 +2155,34 @@
      *  <p>Factory method to create a named WikiContext from a supplied HTTP request.
      *  This method is designed to be called <em>only</em> from within JSP scriptlets;
      *  core classes in JSPWiki itself are expected to use either
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)}
+     *  {@link org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)}
      *  or
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage)}
+     *  {@link org.apache.wiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage)}
      *  instead.</p>
-     *  <p>Note to JSP authors: JSPs that are bound to a {@link com.ecyrd.jspwiki.action.WikiActionBean}
+     *  <p>Note to JSP authors: JSPs that are bound to a {@link org.apache.wiki.action.WikiActionBean}
      *  and/or contain a <code>&lt;stripes:useActionBean&gt;</code> tag will automatically
-     *  cause a WikiActionBean and {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext}
+     *  cause a WikiActionBean and {@link org.apache.wiki.ui.stripes.WikiActionBeanContext}
      *  (a WikiContext object) to be created and bound in request scope. This WikiContext
      *  instance will already exist by the time this method is called. So that the Stripes-provided
      *  WikiContext is not overwritten inadvertently, this method uses the following algorithm
      *  to safely return the WikiContext:</p>
      *  <ul>
      *  <li>If the request scope is non-null, it is examined for the presence of an ActionBean bound using the
-     *  key {@link com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#ATTR_ACTIONBEAN})</li>
+     *  key {@link org.apache.wiki.ui.stripes.WikiInterceptor#ATTR_ACTIONBEAN})</li>
      *  <li>If an ActionBean is found, its WikiActionBeanContext is returned
-     *  (via {@link com.ecyrd.jspwiki.action.WikiActionBean#getContext()}</li>
+     *  (via {@link org.apache.wiki.action.WikiActionBean#getContext()}</li>
      *  <li>Otherwise, a new WikiContext is created by delegating to
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)}</li>
+     *  {@link org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)}</li>
      *  </ul>
      *  <p>JSPs that are bound to WikiActionBeans can also recover the Stripes-stashed
      *  WikiActionBean by calling
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#findContext(javax.servlet.jsp.PageContext)}
+     *  {@link org.apache.wiki.action.WikiContextFactory#findContext(javax.servlet.jsp.PageContext)}
      *  instead of this method.</p>
      *  @param request the HTTP request
      *  @param requestContext the named context to use
      *  @return the WikiActionBeanContext previously stashed by Stripes, or a new WikiContext if one was not found
-     *  @see com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)
-     *  @see com.ecyrd.jspwiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage)
+     *  @see org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)
+     *  @see org.apache.wiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage)
      *  @since 2.1.15.
      *  @deprecated this method is retained for backwards compatibility with JSPs
      */

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

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java Sun Feb  1 18:04:05 2009
@@ -18,16 +18,18 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package com.ecyrd.jspwiki;
+package org.apache.wiki;
 
 import javax.servlet.*;
 import javax.servlet.http.*;
+
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.url.DefaultURLConstructor;
+
 import java.io.*;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.url.DefaultURLConstructor;
 
 /**
  *  This provides a master servlet for dealing with short urls.  It mostly does
@@ -61,7 +63,7 @@
      * Destroys the WikiServlet; called by the servlet container
      * when shutting down the webapp. This method calls the
      * protected method {@link WikiEngine#shutdown()}, which
-     * sends {@link com.ecyrd.jspwiki.event.WikiEngineEvent#SHUTDOWN}
+     * sends {@link org.apache.wiki.event.WikiEngineEvent#SHUTDOWN}
      * events to registered listeners.
      * @see javax.servlet.GenericServlet#destroy()
      */

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.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.security.AccessControlException;
 import java.security.Principal;
@@ -29,18 +29,19 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.auth.*;
+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.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiSecurityEvent;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
-import com.ecyrd.jspwiki.auth.*;
-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.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.event.WikiEvent;
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WikiSecurityEvent;
 
 /**
  * <p>Represents a long-running wiki session, with an associated user Principal,
@@ -61,14 +62,14 @@
  * <p>To keep track of the Principals each user posseses, each WikiSession
  * stores a JAAS Subject. Various login processes add or remove Principals
  * when users authenticate or log out.</p>
- * <p>WikiSession implements the {@link com.ecyrd.jspwiki.event.WikiEventListener}
+ * <p>WikiSession implements the {@link org.apache.wiki.event.WikiEventListener}
  * interface and listens for group add/change/delete events fired by
  * event sources the WikiSession is registered with. Normally,
- * {@link com.ecyrd.jspwiki.auth.AuthenticationManager} registers each WikiSession
- * with the {@link com.ecyrd.jspwiki.auth.authorize.GroupManager}
+ * {@link org.apache.wiki.auth.AuthenticationManager} registers each WikiSession
+ * with the {@link org.apache.wiki.auth.authorize.GroupManager}
  * so it can catch group events. Thus, when a user is added to a
- * {@link com.ecyrd.jspwiki.auth.authorize.Group}, a corresponding
- * {@link com.ecyrd.jspwiki.auth.GroupPrincipal} is injected into
+ * {@link org.apache.wiki.auth.authorize.Group}, a corresponding
+ * {@link org.apache.wiki.auth.GroupPrincipal} is injected into
  * the Subject's Principal set. Likewise, when the user is removed from
  * the Group or the Group is deleted, the GroupPrincipal is removed
  * from the Subject. The effect that this strategy produces is extremely
@@ -195,9 +196,9 @@
      * true if any of these conditions are true:</p>
      * <ul>
      *   <li>The session's Principal set contains
-     *       {@link com.ecyrd.jspwiki.auth.authorize.Role#ANONYMOUS}</li>
+     *       {@link org.apache.wiki.auth.authorize.Role#ANONYMOUS}</li>
      *   <li>The session's Principal set contains
-     *       {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}</li>
+     *       {@link org.apache.wiki.auth.WikiPrincipal#GUEST}</li>
      *   <li>The Principal returned by {@link #getUserPrincipal()} evaluates
      *       to an IP address.</li>
      * </ul>
@@ -221,7 +222,7 @@
      * <code>LOGIN_NAME</code>; the first one found is the login principal.
      * If one is not found, this method returns the first principal that isn't
      * of type Role or GroupPrincipal. If neither of these conditions hold, this method returns
-     * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}.
+     * {@link org.apache.wiki.auth.WikiPrincipal#GUEST}.
      * @return the login Principal. If it is a PrincipalWrapper containing an
      * externally-provided Principal, the object returned is the Principal, not
      * the wrapper around it.
@@ -241,7 +242,7 @@
      *       collection that that isn't of type Role or GroupPrincipal is the primary.</li>
      * </ol>
      * If no primary user Principal is found, this method returns
-     * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}.
+     * {@link org.apache.wiki.auth.WikiPrincipal#GUEST}.
      * @return the primary user Principal
      */
     public final Principal getUserPrincipal()
@@ -357,7 +358,7 @@
      * are those in the Subject's principal collection that aren't of type Role or
      * of type GroupPrincipal. This is a defensive copy.
      * @return Returns the user principal
-     * @see com.ecyrd.jspwiki.auth.AuthenticationManager#isUserPrincipal(Principal)
+     * @see org.apache.wiki.auth.AuthenticationManager#isUserPrincipal(Principal)
      */
     public final Principal[] getPrincipals()
     {
@@ -438,7 +439,7 @@
      * Listens for WikiEvents generated by source objects such as the
      * GroupManager. This method adds Principals to the private Subject managed
      * by the WikiSession.
-     * @see com.ecyrd.jspwiki.event.WikiEventListener#actionPerformed(com.ecyrd.jspwiki.event.WikiEvent)
+     * @see org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent)
      * {@inheritDoc}
      */
     public final void actionPerformed( WikiEvent event )
@@ -624,7 +625,7 @@
      * each Principal. If the user is a member of the group, an equivalent
      * GroupPrincipal is injected into the user's principal set. Existing
      * GroupPrincipals are flushed and replaced. This method should generally be
-     * called after a user's {@link com.ecyrd.jspwiki.auth.user.UserProfile} is
+     * called after a user's {@link org.apache.wiki.auth.user.UserProfile} is
      * saved. If the wiki session is null, or there is no matching user profile,
      * the method returns silently.
      */
@@ -753,7 +754,7 @@
 
     /**
      * Static factory method that creates a new "guest" session containing a single
-     * user Principal {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST},
+     * user Principal {@link org.apache.wiki.auth.WikiPrincipal#GUEST},
      * plus the role principals {@link Role#ALL} and
      * {@link Role#ANONYMOUS}. This method also adds the session as a listener
      * for GroupManager, AuthenticationManager and UserManager events.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.ui.stripes.WikiActionBeanContext;
 
 import net.sourceforge.stripes.action.ActionBeanContext;
 
-import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
 
 /**
  * <p>
- * Abstract ActionBean superclass for all wiki actions, such as page actions ({@link com.ecyrd.jspwiki.WikiContext}
+ * Abstract ActionBean superclass for all wiki actions, such as page actions ({@link org.apache.wiki.WikiContext}
  * and subclasses), group actions (e.g., {@link GroupActionBean}), user
  * actions (e.g., {@link UserPreferencesActionBean}) and others.
  * </p>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,22 +19,22 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import net.sourceforge.stripes.validation.Validate;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.api.WikiPage;
 
 /**
  * Abstract {@link WikiActionBean} subclass used by all ActionBeans that use and
- * process {@link org.apache.jspwiki.api.WikiPage} objects bound to the
+ * process {@link org.apache.wiki.api.WikiPage} objects bound to the
  * <code>page</code> request parameter. In particular, this subclass contains
  * special processing logic that ensures that, the <code>page</code>
  * properties of this object and its related
- * {@link com.ecyrd.jspwiki.WikiContext} are set to the same value. When
+ * {@link org.apache.wiki.WikiContext} are set to the same value. When
  * {@link #setPage(WikiPage)} is called by, for example, the Stripes controller,
  * the underlying
- * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)}
+ * {@link org.apache.wiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)}
  * method is called also.
  */
 public class AbstractPageActionBean extends AbstractActionBean
@@ -54,7 +54,7 @@
     /**
      * Sets the WikiPage property for this ActionBean, and also sets the
      * WikiActionBeanContext's page property to the same value by calling
-     * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)}.
+     * {@link org.apache.wiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)}.
      * 
      * @param page the wiki page.
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,20 +19,21 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.util.List;
 
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+
 import net.sourceforge.stripes.action.*;
 import net.sourceforge.stripes.validation.EmailTypeConverter;
 import net.sourceforge.stripes.validation.Validate;
 import net.sourceforge.stripes.validation.ValidateNestedProperties;
 
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 /**
  * Manages the administration of UserProfiles, from the Administer Profiles

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,17 +19,18 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.DefaultHandler;
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding("/attach/{page}/{attachment}")
 public class AttachActionBean extends AbstractPageActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding("/Comment.jsp")
 public class CommentActionBean extends AbstractPageActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding("/Delete.jsp")
 public class DeleteActionBean extends AbstractPageActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,19 +19,20 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.filters.SpamFilter;
+import org.apache.wiki.ui.EditorManager;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+
 import net.sourceforge.stripes.action.*;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.filters.SpamFilter;
-import com.ecyrd.jspwiki.ui.EditorManager;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @HttpCache( allow = false )
 @UrlBinding( "/Edit.jsp" )

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,9 +19,9 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.*;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,31 +19,32 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.WikiSecurityException;
+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.GroupPermission;
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.LineDelimitedTypeConverter;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+
 import net.sourceforge.stripes.action.*;
 import net.sourceforge.stripes.exception.StripesRuntimeException;
 import net.sourceforge.stripes.validation.*;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-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.GroupPermission;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.ui.stripes.LineDelimitedTypeConverter;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 /**
  * <p>
  * Views, creates, modifies and deletes
- * {@link com.ecyrd.jspwiki.auth.authorize.Group} objects. The event handler
+ * {@link org.apache.wiki.auth.authorize.Group} objects. The event handler
  * methods are the following:
  * </p>
  * <ul>
@@ -60,12 +61,12 @@
  * {@link #setGroup(Group)}. Normally, this is set automatically by the Stripes
  * controller, which extracts the parameter <code>group</code> from the HTTP
  * request and converts it into a Group via
- * {@link com.ecyrd.jspwiki.ui.stripes.GroupTypeConverter}.
+ * {@link org.apache.wiki.ui.stripes.GroupTypeConverter}.
  * </p>
  * <p>
  * All of the event handlers require the user to possess an appropriate
- * {@link com.ecyrd.jspwiki.auth.permissions.GroupPermission} to execute. See
- * each handler method's {@link com.ecyrd.jspwiki.ui.stripes.HandlerPermission}
+ * {@link org.apache.wiki.auth.permissions.GroupPermission} to execute. See
+ * each handler method's {@link org.apache.wiki.ui.stripes.HandlerPermission}
  * for details.
  * </p>
  */
@@ -136,7 +137,7 @@
      * Saves an existing wiki Group. The members of the group to be saved are
      * returned by the method {@link #getMembers()}; these members are usually
      * set automatically by the
-     * {@link com.ecyrd.jspwiki.ui.stripes.PrincipalTypeConverter}.
+     * {@link org.apache.wiki.ui.stripes.PrincipalTypeConverter}.
      * 
      * @return {@link net.sourceforge.stripes.action.ForwardResolution} to the
      *         view page.
@@ -156,9 +157,9 @@
      * Saves a new wiki Group. The members of the group to be saved are returned
      * by the method {@link #getMembers()}; these members are usually set
      * automatically by the
-     * {@link com.ecyrd.jspwiki.ui.stripes.PrincipalTypeConverter}. This method
+     * {@link org.apache.wiki.ui.stripes.PrincipalTypeConverter}. This method
      * functions identically to {@link #save()} except that the
-     * {@link com.ecyrd.jspwiki.auth.permissions.GroupPermission} required to
+     * {@link org.apache.wiki.auth.permissions.GroupPermission} required to
      * execute it is different.
      * 
      * @return {@link net.sourceforge.stripes.action.ForwardResolution} to the

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,19 +19,20 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.security.Permission;
 
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.UserManager;
+import org.apache.wiki.auth.permissions.AllPermission;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.ui.Installer;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+
 import net.sourceforge.stripes.action.*;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.UserManager;
-import com.ecyrd.jspwiki.auth.permissions.AllPermission;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.ui.Installer;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding( "/Install.jsp" )
 public class InstallActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.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 java.security.Principal;
 import java.text.MessageFormat;
@@ -33,26 +33,27 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+import org.apache.wiki.auth.login.CookieAuthenticationLoginModule;
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.util.MailUtil;
+import org.apache.wiki.util.TextUtil;
+
 import net.sourceforge.stripes.action.*;
 import net.sourceforge.stripes.util.UrlBuilder;
 import net.sourceforge.stripes.validation.*;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
-import com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
-import com.ecyrd.jspwiki.util.MailUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 @UrlBinding( "/Login.action" )
 public class LoginActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,9 +19,9 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.*;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding("/NewBlogEntry.jsp")
 public class NewBlogEntryActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding("/NewPage.jsp")
 public class NewPageActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,9 +19,9 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.DefaultHandler;
 import net.sourceforge.stripes.action.HandlesEvent;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding( "/PageModified.jsp" )
 public class PageModifiedActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding( "/rss.jsp" )
 public class RSSActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,12 +19,18 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.RedirectResolution;
@@ -32,16 +38,10 @@
 import net.sourceforge.stripes.action.UrlBinding;
 import net.sourceforge.stripes.validation.*;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 /**
  * <p>
- * Renames a {@link org.apache.jspwiki.api.WikiPage}. This ActionBean parses and extracts two request
+ * Renames a {@link org.apache.wiki.api.WikiPage}. This ActionBean parses and extracts two request
  * parameters:
  * </p>
  * <h3>Request parameters</h3>
@@ -114,7 +114,7 @@
     /**
      * Handler method that renames the current wiki page. If the rename
      * operation does not succeed for any reason, this method throws a
-     * {@link org.apache.jspwiki.api.WikiException}.
+     * {@link org.apache.wiki.api.WikiException}.
      * 
      * @return a redirection to the renamed wiki page
      * @throws WikiException if the page cannot be renamed

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,9 +19,9 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.*;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,15 +19,16 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
+
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 @UrlBinding( "/Upload.jsp" )
 public class UploadActionBean extends AbstractActionBean

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.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 java.security.Principal;
 import java.util.Locale;
@@ -28,21 +28,22 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.ui.EditorManager;
+import org.apache.wiki.ui.TemplateManager;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiActionBeanContext;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+
 import net.sourceforge.stripes.action.*;
 import net.sourceforge.stripes.controller.LifecycleStage;
 import net.sourceforge.stripes.validation.Validate;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.preferences.Preferences;
-import com.ecyrd.jspwiki.ui.EditorManager;
-import com.ecyrd.jspwiki.ui.TemplateManager;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 /**
  * @author Andrew Jaquith
@@ -184,10 +185,10 @@
     /**
      * Pre-action that loads the available set of skins, languages, time formats
      * and time zones based on the current template returned by
-     * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#getTemplate()}.
+     * {@link org.apache.wiki.ui.stripes.WikiActionBeanContext#getTemplate()}.
      * It also pre-populates the form values with the preferences stored in the
      * session attribute
-     * {@link com.ecyrd.jspwiki.preferences.Preferences#SESSIONPREFS}.
+     * {@link org.apache.wiki.preferences.Preferences#SESSIONPREFS}.
      * 
      * @return always returns <code>null</code>
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,29 +19,30 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import java.security.Principal;
 
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.UserManager;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+import org.apache.wiki.auth.permissions.WikiPermission;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiActionBeanContext;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.workflow.DecisionRequiredException;
+
 import net.sourceforge.stripes.action.*;
 import net.sourceforge.stripes.controller.LifecycleStage;
 import net.sourceforge.stripes.validation.*;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.UserManager;
-import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
-import com.ecyrd.jspwiki.workflow.DecisionRequiredException;
 
 /**
  * @author Andrew Jaquith

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,23 +19,23 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
 import net.sourceforge.stripes.action.*;
 import net.sourceforge.stripes.controller.LifecycleStage;
 import net.sourceforge.stripes.validation.ValidationError;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.content.ContentManager;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.content.ContentManager;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
 
 /**
  * Displays the wiki page a users requested, resolving special page names and
@@ -64,7 +64,7 @@
      * for one, or a "special page" reference. This method considers
      * special page names from <code>jspwiki.properties</code>, and possible aliases.
      * To determine whether the page is a special page, this method calls
-     *  {@link com.ecyrd.jspwiki.action.WikiContextFactory#getSpecialPageResolution(String)}.
+     *  {@link org.apache.wiki.action.WikiContextFactory#getSpecialPageResolution(String)}.
      *  @return a {@link net.sourceforge.stripes.action.RedirectResolution} to the special
      *  page's real URL, if a special page was specified, or <code>null</code> otherwise
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,9 +19,9 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
-import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
+import org.apache.wiki.ui.stripes.WikiActionBeanContext;
 
 import net.sourceforge.stripes.action.ActionBean;
 import net.sourceforge.stripes.action.ActionBeanContext;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.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 java.lang.reflect.Method;
 import java.net.URI;
@@ -39,22 +39,22 @@
 import net.sourceforge.stripes.mock.MockHttpSession;
 import net.sourceforge.stripes.util.ResolverUtil;
 
-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.auth.SessionMonitor;
+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.parser.MarkupParser;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.tags.WikiTagBase;
+import org.apache.wiki.ui.stripes.HandlerInfo;
+import org.apache.wiki.ui.stripes.WikiActionBeanContext;
+import org.apache.wiki.url.StripesURLConstructor;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.SessionMonitor;
-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.parser.MarkupParser;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.tags.WikiTagBase;
-import com.ecyrd.jspwiki.ui.stripes.HandlerInfo;
-import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext;
-import com.ecyrd.jspwiki.url.StripesURLConstructor;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * <p>
@@ -83,7 +83,7 @@
     public static final String ATTR_WIKISESSION = "wikiSession";
 
     /** Default list of packages to search for WikiActionBean implementations. */
-    public static final String DEFAULT_ACTIONBEAN_PACKAGES = "com.ecyrd.jspwiki.action";
+    public static final String DEFAULT_ACTIONBEAN_PACKAGES = "org.apache.wiki.action";
 
     /**
      * Property in jspwiki.properties that specifies packages to search for
@@ -102,7 +102,7 @@
      * This method can be used to find the WikiContext programmatically from a
      * JSP PageContext. We check the request context. The wiki context, if it
      * exists, is looked up using the key
-     * {@link com.ecyrd.jspwiki.tags.WikiTagBase#ATTR_CONTEXT}.
+     * {@link org.apache.wiki.tags.WikiTagBase#ATTR_CONTEXT}.
      * 
      * @since 2.4
      * @param pageContext the JSP page context
@@ -119,7 +119,7 @@
      * <p>
      * Saves the supplied WikiContext, and the related WikiEngine and
      * WikiSession, in request scope. The WikiContext is saved as an attribute
-     * named {@link com.ecyrd.jspwiki.tags.WikiTagBase#ATTR_CONTEXT}. The
+     * named {@link org.apache.wiki.tags.WikiTagBase#ATTR_CONTEXT}. The
      * WikiEngine is also saved as {@link #ATTR_WIKIENGINE}, and the
      * WikiSession as {@link #ATTR_WIKISESSION}. Among other things, by saving
      * these items as attributes, they can be accessed via JSP Expression
@@ -129,7 +129,7 @@
      * Note: when the WikiContext is saved, it will be guaranteed to have a
      * non-null WikiPage. If the context as supplied has a WikiPage that is
      * <code>null</code>, the
-     * {@link com.ecyrd.jspwiki.WikiEngine#getFrontPage()} will be consulted,
+     * {@link org.apache.wiki.WikiEngine#getFrontPage()} will be consulted,
      * and that page will be used.
      * </p>
      * 
@@ -203,7 +203,7 @@
      * Looks up and returns the correct HandlerInfo class corresponding to a
      * supplied wiki context. The supplied context name is matched against the
      * values annotated using
-     * {@link com.ecyrd.jspwiki.ui.stripes.WikiRequestContext}. If a match is not
+     * {@link org.apache.wiki.ui.stripes.WikiRequestContext}. If a match is not
      * found, this method throws an IllegalArgumentException.
      * 
      * @param requestContext the context to look up

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java Sun Feb  1 18:04:05 2009
@@ -19,11 +19,11 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.action;
+package org.apache.wiki.action;
 
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.ui.stripes.HandlerPermission;
-import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.ui.stripes.HandlerPermission;
+import org.apache.wiki.ui.stripes.WikiRequestContext;
 
 import net.sourceforge.stripes.action.*;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html Sun Feb  1 18:04:05 2009
@@ -36,7 +36,7 @@
 		href="http://stripes.sourceforge.net/docs/current/taglib/stripes/useActionBean.html">&lt;stripes:useActionBean&gt;</a></code>
 	tags to every top-level JSP. Retrieve the ActionBean later in content
 	JSPs via {@link
-	com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#findActionBean(ServletRequest)}.&nbsp;<a
+	org.apache.wiki.ui.stripes.WikiInterceptor#findActionBean(ServletRequest)}.&nbsp;<a
 		href="#2"><small>More...</small></a></li>
 	<li>In JSPs, use EL syntax to access properties of the current
 	WikiActionBean; for example, <code>&lt;c:out
@@ -72,7 +72,7 @@
 called <em>events</em> that correspond to the values that old-style
 JSPWiki templates stored in their "action" form parameters. JSPWiki
 provides an implementation of ActionBean called {@link
-com.ecyrd.jspwiki.action.WikiActionBean}. Every ActionBean used in
+org.apache.wiki.action.WikiActionBean}. Every ActionBean used in
 JSPWiki subclasses it.</p>
 
 <p>In the Stripes framework, every ActionBean contains a reference
@@ -83,18 +83,18 @@
 ActionBean was invoked. The ActionBeanContext is obtained by calling
 {@link net.sourceforge.stripes.action.ActionBean#getContext()}. JSPWiki
 3.0 provides an implementation of ActionBeanContext called {@link
-com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext}.
+org.apache.wiki.ui.stripes.WikiActionBeanContext}.
 WikiActionBeanContext contains accessors for things needed by JSPWiki,
 such as {@link
-com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#getEngine()} and
+org.apache.wiki.ui.stripes.WikiActionBeanContext#getEngine()} and
 {@link
-com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#getWikiSession()}.</p>
+org.apache.wiki.ui.stripes.WikiActionBeanContext#getWikiSession()}.</p>
 <p>WikiActionBeanContext also implements the {@link
-com.ecyrd.jspwiki.WikiContext} interface, so any methods that
+org.apache.wiki.WikiContext} interface, so any methods that
 normally operate on WikiContext will work with WikiActionBeanContext
 also.
 <em>Note: WikiActionBean method {@link
-com.ecyrd.jspwiki.action.WikiActionBean#getContext()} uses a covariant
+org.apache.wiki.action.WikiActionBean#getContext()} uses a covariant
 return type to indicate a WikiActionBeanContext is always returned.
 Thus, callers do not need to typecheck the return value because the
 ActionBeanContext will always be a WikiActionBeanContext.</em>
@@ -123,7 +123,7 @@
 responsibility for parsing and validating all of these parameters reside
 with Stripes. What happens is that when <code>Edit.jsp</code> is
 rendered, Stripes instantiates a corresponding WikiActionBean subclass
-called {@link com.ecyrd.jspwiki.action.EditActionBean} and automatically
+called {@link org.apache.wiki.action.EditActionBean} and automatically
 calls the correct accessors. In this example, the getters/setters look
 like this:</p>
 
@@ -157,10 +157,10 @@
 type that Stripes knows how to convert, such as <code>int</code>, <code>long</code>,
 <code>Date</code>, <code>String</code>, <code>BigDecimal</code> and
 others, or JSPWiki-specific types we've built converters for: WikiPage
-(via {@link com.ecyrd.jspwiki.ui.stripes.WikiPageTypeConverter}), Group
-(via {@link com.ecyrd.jspwiki.ui.stripes.GroupTypeConverter}, and
+(via {@link org.apache.wiki.ui.stripes.WikiPageTypeConverter}), Group
+(via {@link org.apache.wiki.ui.stripes.GroupTypeConverter}, and
 Principal (via {@link
-com.ecyrd.jspwiki.ui.stripes.PrincipalTypeConverter}).</blockquote>
+org.apache.wiki.ui.stripes.PrincipalTypeConverter}).</blockquote>
 
 <h3><a name="bindings">Bindings ActionBeans to URLs</a></h3>
 <p>All of this sounds great, but all of this assumes that somebody
@@ -177,22 +177,22 @@
 <p>
 <blockquote><code>&lt;<a
 	href="http://stripes.sourceforge.net/docs/current/taglib/stripes/useActionBean.html">stripes:useActionBean</a>
-beanclass="com.ecyrd.jspwiki.action.<em>foo</em>ActionBean"/&gt;</code></blockquote>
+beanclass="org.apache.wiki.action.<em>foo</em>ActionBean"/&gt;</code></blockquote>
 <p>... where <em>foo</em> corresponds to a named action, such as <code>View</code>
 (for viewing wiki pages) and <code>UserProfile</code> (for editing a
 user's profile). For example, the page-editing JSP, <code>Edit.jsp</code>,
 contains this line:</p>
 
 <blockquote><code>&lt;stripes:useActionBean
-beanclass="com.ecyrd.jspwiki.action.EditActionBean"/&gt;</code></blockquote>
+beanclass="org.apache.wiki.action.EditActionBean"/&gt;</code></blockquote>
 
 <p>See this package for a complete list of WikiActionBeans used in
 JSPWiki 3.0. By convention, every top-level JSP in JSPWiki 3.0 <em>must</em>
 include a <code>&lt;stripes:useActionBean&gt;</code> tag at the top of
 their pages. This does three things: first, it guarantees that the
-specified {@link com.ecyrd.jspwiki.action.EditActionBean} will be
+specified {@link org.apache.wiki.action.EditActionBean} will be
 injected into into PageContext scope with the well-known name {@link
-com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#ATTR_ACTIONBEAN}
+org.apache.wiki.ui.stripes.WikiInterceptor#ATTR_ACTIONBEAN}
 ("wikiActionBean"). Second, it also means that JSTL expression language
 (EL) markup can access the WikiActionBean directly, for example, <code>${wikiActionBean.changenote}</code>.
 Third, it ensures that all of the request parameters we expect will be
@@ -220,14 +220,14 @@
 <blockquote><a name="2" /><strong>Guideline #2
 for JSPWiki developers</strong>: JSPs should not attempt to instantiate
 WikiContexts directly. Instead, they <em>must</em> include a <code>&lt;stripes:useActionBean
-beanclass="com.ecyrd.jspwiki.action.<em>foo</em>Bean" event="foo"
+beanclass="org.apache.wiki.action.<em>foo</em>Bean" event="foo"
 id="wikiActionBean" /&gt;</code> element that tells JSPWiki which
 WikiActionBean to use, and the event it should fire. For example, <code>&lt;stripes:useActionBean
-beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit"
+beanclass="org.apache.wiki.action.EditActionBean" event="edit"
 id="wikiActionBean"/&gt;</code> tells a JSPWiki to automatically instantiate an
 EditActionBean and place it in page scope. To retrieve the
 WikiActionBean later, call {@link
-com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#findActionBean(ServletRequest)}.</blockquote>
+org.apache.wiki.ui.stripes.WikiInterceptor#findActionBean(ServletRequest)}.</blockquote>
 
 <p><strong>Automatic binding to <code>.action</code> URLs</strong></p>
 <p>In addition to the manual method for binding WikiActionBeans to
@@ -245,7 +245,7 @@
 special class-level annotation, {@link
 net.sourceforge.stripes.action.UrlBinding}, that specifies the mapping.
 By convention, this is how we do things in JSPWiki 3.0. For example, the
-{@link com.ecyrd.jspwiki.action.ViewActionBean} class contains this
+{@link org.apache.wiki.action.ViewActionBean} class contains this
 annotation:</p>
 
 <blockquote><code>@UrlBinding("/Wiki.action")</code></blockquote>
@@ -295,7 +295,7 @@
 ActionBean methods that have a special {@link
 net.sourceforge.stripes.action.HandlesEvent} annotation. For example,
 the user preferences code that previously created user name assertions
-now lives in {@link com.ecyrd.jspwiki.action.UserPreferencesActionBean},
+now lives in {@link org.apache.wiki.action.UserPreferencesActionBean},
 in a "handler method" called <code>createAssertedName()</code> that
 handles the event <code>createAssertedName</code>:</p>
 
@@ -315,7 +315,7 @@
 counterparts, tells Stripes what beans and events it should invoke. For
 example:</p>
 
-<pre>&lt;stripes:form id="preferences" beanclass="com.ecyrd.jspwiki.action.UserPreferencesBean" method="POST"&gt;
+<pre>&lt;stripes:form id="preferences" beanclass="org.apache.wiki.action.UserPreferencesBean" method="POST"&gt;
   ...
   (form markup)
   ...
@@ -357,7 +357,7 @@
 	href="http://stripes.sourceforge.net/docs/current/taglib/stripes/option.html">&lt;stripes:option&gt;</a></code>).
 With one or two exceptions, these tags are identical to their HTML
 equivalents, and contain a few extra attributes used by Stripes. The
-package {@link com.ecyrd.jspwiki.ui.migrator} contains a full set of
+package {@link org.apache.wiki.ui.migrator} contains a full set of
 utility classes that can automatically make these changes for you.</blockquote>
 
 <h3><a name="validation">Form validation</a></h3>
@@ -369,7 +369,7 @@
 can also contain a {@link net.sourceforge.stripes.validation.Validate}
 annotation that indicates whether values are required, and what their
 acceptable lengths or constraints might be. For example, consider {@link
-com.ecyrd.jspwiki.action.UserProfileActionBean}, a WikiActionBean that
+org.apache.wiki.action.UserProfileActionBean}, a WikiActionBean that
 allows users to edit their user profile information. The <code>fullname</code>
 field has this annotation right above the setter:</p>
 
@@ -425,7 +425,7 @@
 <p>In JSPWiki 3.0, these activities fall into the category of
 "processing logic" -- the type of code that gets put into WikiActionBean
 events. In this particular case, the code moves into a Stripes event
-handler method in the {@link com.ecyrd.jspwiki.action.EditActionBean}
+handler method in the {@link org.apache.wiki.action.EditActionBean}
 class that has an <code>@HandlesEvent</code> annotation with the name <code>save</code>.</p>
 
 <p>When a Stripes event handler method needs to redirect a user to

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/FilterException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/FilterException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/FilterException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/FilterException.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 /**
  *  A generic PageFilter exception.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/ModuleData.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/ModuleData.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/ModuleData.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/ModuleData.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.   
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PageFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PageFilter.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PageFilter.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PageFilter.java Sun Feb  1 18:04:05 2009
@@ -18,11 +18,12 @@
     specific language governing permissions and limitations
     under the License.   
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 import java.util.Properties;
 
-import com.ecyrd.jspwiki.WikiContext;
+import org.apache.wiki.WikiContext;
+
 
 
 /**

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PluginException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PluginException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PluginException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PluginException.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 /**
  *  Provides a generic PluginException.  This is the kind of

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/Release.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/Release.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.      
  */
 
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 /**
  *  Contains release and version information.  You may also invoke this
@@ -27,7 +27,7 @@
  *  is a handy way of checking which JSPWiki version you have - just type
  *  from a command line:
  *  <pre>
- *  % java -cp JSPWiki-api.jar org.apache.jspwiki.api.Release
+ *  % java -cp JSPWiki-api.jar org.apache.wiki.api.Release
  *  1.0
  *  </pre>
  */
@@ -70,7 +70,7 @@
      *  different command line tools.
      *  <P>Example:
      *  <PRE>
-     *  % java org.apache.jspwiki.api.Release
+     *  % java org.apache.wiki.api.Release
      *  1.0
      *  </PRE>
      *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiEngine.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiEngine.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.   
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 import java.util.Iterator;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiException.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 /**
  *  The main JSPWiki exception.  All JSPWiki exceptions thrown by JSPWiki

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java Sun Feb  1 18:04:05 2009
@@ -18,12 +18,13 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 import java.util.Date;
 import java.util.Map;
 
-import com.ecyrd.jspwiki.auth.acl.Acl;
+import org.apache.wiki.auth.acl.Acl;
+
 
 /**
  *  Simple wrapper class for the Wiki page attributes.  The Wiki page
@@ -60,8 +61,8 @@
     
     /**
      * Returns the full, qualified, name of the WikiPage that includes the wiki name.
-     * Used by the {@link com.ecyrd.jspwiki.ui.stripes.HandlerInfo} class and
-     * {@link com.ecyrd.jspwiki.ui.stripes.HandlerPermission} annotations.
+     * Used by the {@link org.apache.wiki.ui.stripes.HandlerInfo} class and
+     * {@link org.apache.wiki.ui.stripes.HandlerPermission} annotations.
      * @return the qualified page name, for example <code>mywiki:Main</code>
      */
     public String getQualifiedName();
@@ -166,7 +167,7 @@
      * persist the Acl itself to back-end storage or in page markup;
      * it merely sets the internal field that stores the Acl. To
      * persist the Acl, callers should invoke 
-     * {@link com.ecyrd.jspwiki.auth.acl.AclManager#setPermissions(WikiPage, Acl)}.
+     * {@link org.apache.wiki.auth.acl.AclManager#setPermissions(WikiPage, Acl)}.
      * @param acl The Acl to set
      */
     public void setAcl( Acl acl );

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPlugin.java Sun Feb  1 18:04:05 2009
@@ -18,11 +18,12 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 import java.util.Map;
 
-import com.ecyrd.jspwiki.WikiContext;
+import org.apache.wiki.WikiContext;
+
 
 /**
  *  Defines an interface for plugins.  Any instance of a wiki plugin

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiRenderer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiRenderer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiRenderer.java Sun Feb  1 18:04:05 2009
@@ -18,11 +18,12 @@
     specific language governing permissions and limitations
     under the License.   
  */
-package org.apache.jspwiki.api;
+package org.apache.wiki.api;
 
 import java.io.InputStream;
 
-import com.ecyrd.jspwiki.WikiContext;
+import org.apache.wiki.WikiContext;
+
 
 /**
  *  The WikiRenderer interface provides access to the JSPWiki rendering



Mime
View raw message