jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r739802 [9/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
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
-import com.ecyrd.jspwiki.WikiContext;
 
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.JspWriter;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
 import java.io.IOException;
 import java.io.Serializable;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CalendarTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CalendarTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CalendarTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CalendarTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
@@ -30,12 +30,12 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.http.HttpServletRequest;
 
-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.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 
 /**
@@ -99,7 +99,7 @@
      *  @param format The format in the SimpleDateFormat fashion.
      *  
      *  @see SimpleDateFormat
-     *  @see com.ecyrd.jspwiki.plugin.WeblogPlugin
+     *  @see org.apache.wiki.plugin.WeblogPlugin
      */
     public void setPageformat( String format )
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockInfo.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockInfo.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockInfo.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.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.tagext.TagExtraInfo;
 import javax.servlet.jsp.tagext.TagData;
@@ -37,7 +37,7 @@
     public VariableInfo[] getVariableInfo(TagData data)
     {
         VariableInfo[] var = { new VariableInfo( data.getAttributeString("id"),
-                                                 "com.ecyrd.jspwiki.PageLock",
+                                                 "org.apache.wiki.PageLock",
                                                  true,
                                                  VariableInfo.NESTED )
         };

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java Sun Feb  1 18:04:05 2009
@@ -18,18 +18,18 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.PageManager;
-import com.ecyrd.jspwiki.PageLock;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 import javax.servlet.http.HttpSession;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.PageLock;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
 
 /**
  *  Checks whether the page is locked for editing.  If the mode matches,

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckRequestContextTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckRequestContextTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckRequestContextTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckRequestContextTag.java Sun Feb  1 18:04:05 2009
@@ -18,20 +18,20 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Includes body, if the request context matches.  To understand more about
  *  RequestContexts, please look at the WikiContext class.
  *
  *  @since 2.0
- *  @see com.ecyrd.jspwiki.WikiContext
+ *  @see org.apache.wiki.WikiContext
  */
 public class CheckRequestContextTag
     extends WikiTagBase

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.InternalWikiException;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Does a version check on the page.  Mode is as follows:

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CommentLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CommentLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CommentLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CommentLinkTag.java Sun Feb  1 18:04:05 2009
@@ -18,16 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
 import javax.servlet.jsp.JspWriter;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.WikiPage;
 
-import com.ecyrd.jspwiki.InternalWikiException;
-import com.ecyrd.jspwiki.WikiContext;
 
 /**
  *  Writes a comment link.  Body of the link becomes the link text.

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ContentTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ContentTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ContentTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ContentTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.util.*;
 
@@ -26,8 +26,9 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.ServletException;
 
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.*;
+import org.apache.wiki.*;
+import org.apache.wiki.providers.ProviderException;
+
 
 /**
  *  Is used as a "super include" tag, which can include the proper context

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -34,8 +34,9 @@
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.TagSupport;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
 
 /**

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/DiffLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/DiffLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/DiffLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/DiffLinkTag.java Sun Feb  1 18:04:05 2009
@@ -18,14 +18,14 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
 
-import com.ecyrd.jspwiki.*;
 
 /**
  *  Writes a diff link.  Body of the link becomes the link text.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditLinkTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
 
 /**
  *  Writes an edit link.  Body of the link becomes the link text.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorInfo.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorInfo.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorInfo.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.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.tagext.TagExtraInfo;
 import javax.servlet.jsp.tagext.TagData;
@@ -35,7 +35,7 @@
     public VariableInfo[] getVariableInfo(TagData data)
     {
         VariableInfo[] var = { new VariableInfo( data.getAttributeString("id"),
-                                                 "com.ecyrd.jspwiki.ui.Editor",
+                                                 "org.apache.wiki.ui.Editor",
                                                  true,
                                                  VariableInfo.NESTED )
         };

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorTag.java Sun Feb  1 18:04:05 2009
@@ -18,17 +18,18 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.action.WikiContextFactory;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.ui.Editor;
-import com.ecyrd.jspwiki.ui.EditorManager;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.action.WikiContextFactory;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.ui.Editor;
+import org.apache.wiki.ui.EditorManager;
+
 
 /**
  *  Iterates through editors.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorTag.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
 import javax.servlet.ServletException;
 import javax.servlet.jsp.JspException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.ui.EditorManager;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.ui.EditorManager;
+
 
 /**
  *  Creates an editor component with all the necessary parts

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/FeedDiscoveryTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/FeedDiscoveryTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/FeedDiscoveryTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/FeedDiscoveryTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-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.plugin.WeblogPlugin;
+import org.apache.wiki.util.BlogUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.WeblogPlugin;
-import com.ecyrd.jspwiki.util.BlogUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Outputs links to all the site feeds and APIs this Wiki/blog supports.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HasAttachmentsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HasAttachmentsTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HasAttachmentsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HasAttachmentsTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Includes body if page has attachments.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorInfo.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorInfo.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorInfo.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.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.tagext.TagExtraInfo;
 import javax.servlet.jsp.tagext.TagData;
@@ -34,7 +34,7 @@
     public VariableInfo[] getVariableInfo(TagData data)
     {
         VariableInfo[] var = { new VariableInfo( data.getAttributeString("id"),
-                                                 "org.apache.jspwiki.api.WikiPage",
+                                                 "org.apache.wiki.api.WikiPage",
                                                  true,
                                                  VariableInfo.NESTED )
         };

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java Sun Feb  1 18:04:05 2009
@@ -18,21 +18,21 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Collection;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
-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.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Iterates through tags.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IfNoSearchResultsTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IfNoSearchResultsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IfNoSearchResultsTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Collection;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeResourcesTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeResourcesTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeResourcesTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeResourcesTag.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.tags;
+package org.apache.wiki.tags;
 
-import com.ecyrd.jspwiki.ui.TemplateManager;
+import org.apache.wiki.ui.TemplateManager;
 
 /**
  *  This tag is used to include any programmatic includes into the

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeTag.java Sun Feb  1 18:04:05 2009
@@ -18,14 +18,15 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspException;
 import javax.servlet.ServletException;
 
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  *  Includes an another JSP page, making sure that we actually pass

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertDiffTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertDiffTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertDiffTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertDiffTag.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+
 
 /**
  *  Writes difference between two pages using a HTML table.  If there is

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertPageTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertPageTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertPageTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertPageTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Renders WikiPage content.  For InsertPage tag and the InsertPage plugin

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -29,13 +29,13 @@
 import javax.servlet.jsp.tagext.TryCatchFinally;
 import javax.servlet.jsp.PageContext;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.action.WikiContextFactory;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.action.WikiContextFactory;
 
 /**
  *  Iterates through tags.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -29,14 +29,14 @@
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTag;
 
-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.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides a generic link tag for all kinds of linking

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToParentTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToParentTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToParentTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToParentTag.java Sun Feb  1 18:04:05 2009
@@ -18,13 +18,13 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
 
-import com.ecyrd.jspwiki.attachment.Attachment;
 
 /**
  *  Writes a link to a parent of a Wiki page.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.attachment.Attachment;
 
 /**
  *  Writes a link to a Wiki page.  Body of the link becomes the actual text.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/MessagesTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/MessagesTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/MessagesTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/MessagesTag.java Sun Feb  1 18:04:05 2009
@@ -18,17 +18,18 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.util.TextUtil;
+
 import net.sourceforge.stripes.validation.ValidationError;
 import net.sourceforge.stripes.validation.ValidationErrors;
 
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * Returns or clears the current messages associated with the user's wiki

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java Sun Feb  1 18:04:05 2009
@@ -18,14 +18,14 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Includes the body in case there is no such page available.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageDateTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageDateTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageDateTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageDateTag.java Sun Feb  1 18:04:05 2009
@@ -18,16 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.preferences.Preferences.TimeFormat;
 
-import com.ecyrd.jspwiki.preferences.Preferences;
-import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
 
 /**
  *  Writes the modification date of the page, formatted

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java Sun Feb  1 18:04:05 2009
@@ -18,11 +18,12 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.providers.ProviderException;
+import org.apache.wiki.providers.ProviderException;
+
 
 /**
  *  Includes the body in case the set page does exist.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageInfoLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageInfoLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageInfoLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageInfoLinkTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
 
 /**
  *  Writes a link to the Wiki PageInfo.  Body of the link becomes the actual text.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageNameTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageNameTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageNameTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageNameTag.java Sun Feb  1 18:04:05 2009
@@ -18,14 +18,14 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
 
 /**
  *  Returns the currently requested page name.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageSizeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageSizeTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageSizeTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageSizeTag.java Sun Feb  1 18:04:05 2009
@@ -18,14 +18,14 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Returns the currently requested page or attachment size.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageTypeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageTypeTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageTypeTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageTypeTag.java Sun Feb  1 18:04:05 2009
@@ -18,13 +18,13 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
 
-import com.ecyrd.jspwiki.attachment.Attachment;
 
 /**
  *  Includes the body, if the current page is of proper type.

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamHandler.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.tags;
+package org.apache.wiki.tags;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamTag.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.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTagSupport;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParentPageNameTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParentPageNameTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParentPageNameTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParentPageNameTag.java Sun Feb  1 18:04:05 2009
@@ -18,14 +18,14 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
 
 /**
  *  Returns the parent of the currently requested page.  Weblog entries are recognized

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java Sun Feb  1 18:04:05 2009
@@ -18,23 +18,23 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.security.Permission;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiProvider;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.action.GroupActionBean;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.permissions.AllPermission;
+import org.apache.wiki.auth.permissions.GroupPermission;
+import org.apache.wiki.auth.permissions.PermissionFactory;
+import org.apache.wiki.auth.permissions.WikiPermission;
 
-import com.ecyrd.jspwiki.WikiProvider;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.action.GroupActionBean;
-import com.ecyrd.jspwiki.auth.AuthorizationManager;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.permissions.AllPermission;
-import com.ecyrd.jspwiki.auth.permissions.GroupPermission;
-import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
-import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
 
 /**
  *  Tells whether the user in the current wiki context possesses a particular

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Map;
@@ -26,10 +26,10 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyContent;
 
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.plugin.PluginManager;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.PluginManager;
 
 /**
  *  Inserts any Wiki plugin.  The body of the tag becomes then

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSImageLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSImageLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSImageLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSImageLinkTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -26,10 +26,11 @@
 
 import javax.servlet.jsp.JspWriter;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.rss.RSSGenerator;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.rss.RSSGenerator;
+
 
 /**
  *  Writes an image link to a JSPWiki RSS file.  If RSS generation has

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSLinkTag.java Sun Feb  1 18:04:05 2009
@@ -18,11 +18,12 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.WikiEngine;
+import org.apache.wiki.WikiEngine;
+
 
 /**
  *  Writes a link to the RSS file (using the "link" attribute).

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RequestResourceTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RequestResourceTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RequestResourceTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RequestResourceTag.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.tags;
+package org.apache.wiki.tags;
 
-import com.ecyrd.jspwiki.ui.TemplateManager;
+import org.apache.wiki.ui.TemplateManager;
 
 /**
  *  Provides easy access to TemplateManager.addResourceRequest().  You may use

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorInfo.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorInfo.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorInfo.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.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.tagext.TagExtraInfo;
 import javax.servlet.jsp.tagext.TagData;
@@ -34,7 +34,7 @@
     public VariableInfo[] getVariableInfo(TagData data)
     {
         VariableInfo[] var = { new VariableInfo( data.getAttributeString("id"),
-                                                 "com.ecyrd.jspwiki.search.SearchResult",
+                                                 "org.apache.wiki.search.SearchResult",
                                                  true,
                                                  VariableInfo.NESTED )
         };

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -26,12 +26,13 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.search.SearchResult;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.search.SearchResult;
+
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
 
 /**
  *  Iterates through Search result results.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Collection;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.util.Collection;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SetPaginationTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SetPaginationTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SetPaginationTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SetPaginationTag.java Sun Feb  1 18:04:05 2009
@@ -18,13 +18,14 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
 import javax.servlet.jsp.jstl.fmt.LocaleSupport;
 
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.util.TextUtil;
+
 
 
 /**

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java Sun Feb  1 18:04:05 2009
@@ -19,14 +19,15 @@
     under the License.  
  */
 
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.util.Locale;
 
 import javax.servlet.jsp.JspTagException;
 
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  * <p>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.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.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.*;
 import javax.servlet.jsp.tagext.*;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TemplateDirTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TemplateDirTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TemplateDirTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TemplateDirTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TranslateTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TranslateTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TranslateTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TranslateTag.java Sun Feb  1 18:04:05 2009
@@ -18,16 +18,17 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.action.WikiContextFactory;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.action.WikiContextFactory;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
 /**
  *  Converts the body text into HTML content.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UploadLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UploadLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UploadLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UploadLinkTag.java Sun Feb  1 18:04:05 2009
@@ -18,12 +18,13 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 
-import com.ecyrd.jspwiki.WikiContext;
+import org.apache.wiki.WikiContext;
+
 
 /**
  *  Writes a link to the upload page.  Body of the link becomes the actual text.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserCheckTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserCheckTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserCheckTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserCheckTag.java Sun Feb  1 18:04:05 2009
@@ -18,12 +18,13 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.AuthenticationManager;
+
 
 /**
  *  Includes the content if an user check validates.  This has
@@ -137,7 +138,7 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.tags.WikiTagBase#doWikiStartTag()
+     * @see org.apache.wiki.tags.WikiTagBase#doWikiStartTag()
      */
     @Override
     public final int doWikiStartTag()

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserNameTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserNameTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserNameTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserNameTag.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.security.Principal;
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  *  Returns the current user name, or empty, if the user has not been

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserProfileTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserProfileTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserProfileTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserProfileTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -28,17 +28,18 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
-import com.ecyrd.jspwiki.auth.UserManager;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.UserManager;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  * <p>
@@ -212,9 +213,9 @@
     }
 
     /**
-     * Returns a sorted list of the {@link com.ecyrd.jspwiki.auth.authorize.Group} objects a user possesses
+     * Returns a sorted list of the {@link org.apache.wiki.auth.authorize.Group} objects a user possesses
      * in his or her WikiSession. The result is computed by consulting
-     * {@link com.ecyrd.jspwiki.WikiSession#getRoles()}
+     * {@link org.apache.wiki.WikiSession#getRoles()}
      * and extracting those that are of type Group.
      * @return the list of groups, sorted by name
      */
@@ -253,9 +254,9 @@
     }
 
     /**
-     * Returns a sorted list of the {@link com.ecyrd.jspwiki.auth.authorize.Role} objects a user possesses
+     * Returns a sorted list of the {@link org.apache.wiki.auth.authorize.Role} objects a user possesses
      * in his or her WikiSession. The result is computed by consulting
-     * {@link com.ecyrd.jspwiki.WikiSession#getRoles()}
+     * {@link org.apache.wiki.WikiSession#getRoles()}
      * and extracting those that are of type Role.
      * @return the list of roles, sorted by name
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/VariableTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/VariableTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/VariableTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/VariableTag.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.JspException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.NoSuchVariableException;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.NoSuchVariableException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  *  Returns the value of an Wiki variable.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiBodyTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiBodyTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiBodyTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiBodyTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 
@@ -27,10 +27,11 @@
 import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.tagext.TryCatchFinally;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
-import com.ecyrd.jspwiki.WikiContext;
 
 /**
  *  This is a class that provides the same services as the WikiTagBase, but this time it

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiLinkTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiLinkTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiLinkTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiLinkTag.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.tags;
+package org.apache.wiki.tags;
 
 import java.io.IOException;
 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java Sun Feb  1 18:04:05 2009
@@ -18,21 +18,22 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.tags;
+package org.apache.wiki.tags;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.TryCatchFinally;
 
+import org.apache.wiki.*;
+import org.apache.wiki.action.WikiActionBean;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.ui.stripes.WikiInterceptor;
+import org.apache.wiki.util.TextUtil;
+
 import net.sourceforge.stripes.tag.StripesTagSupport;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.ui.stripes.WikiInterceptor;
-import com.ecyrd.jspwiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.action.WikiActionBean;
 
 /**
  *  Base class for JSPWiki tags.  You do not necessarily have
@@ -85,7 +86,7 @@
     /**
      * Initializes the tag, and sets an internal reference to the current WikiActionBean
      * by delegating to
-     * {@link com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#findActionBean(PageContext)}.
+     * {@link org.apache.wiki.ui.stripes.WikiInterceptor#findActionBean(PageContext)}.
      * (That method retrieves the WikiActionBean from page scope.).
      * If the WikiActionBean is a WikiContext, a specific reference to the WikiContext
      * will be set also. Both of these available as protected fields {@link #m_wikiActionBean} and

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/package.html?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/package.html (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/package.html Sun Feb  1 18:04:05 2009
@@ -31,7 +31,7 @@
 <p>The correct way to do reference cleaning is to implement the {@link javax.servlet.jsp.tagext.TryCatchFinally}
 interface, where the <code>doFinally()</code> method is called every time the tag
 has been finished with and prior to it being put back into the pool.  Most JSPWiki
-base tag classes {@link com.ecyrd.jspwiki.tags.IteratorTag} and {@link com.ecyrd.jspwiki.tags.WikiTagBase}
+base tag classes {@link org.apache.wiki.tags.IteratorTag} and {@link org.apache.wiki.tags.WikiTagBase}
 implement the TryCatchFinally
 interface, which means that any class subclassed from them also allows has those methods.</p>
 

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

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/EditorManager.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/EditorManager.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/EditorManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java Sun Feb  1 18:04:05 2009
@@ -18,27 +18,27 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.net.URL;
 import java.util.*;
 
 import javax.servlet.jsp.PageContext;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.NoSuchVariableException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.modules.ModuleManager;
+import org.apache.wiki.modules.WikiModuleInfo;
+import org.apache.wiki.preferences.Preferences;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
 import org.jdom.xpath.XPath;
 
-import com.ecyrd.jspwiki.NoSuchVariableException;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.modules.ModuleManager;
-import com.ecyrd.jspwiki.modules.WikiModuleInfo;
-import com.ecyrd.jspwiki.preferences.Preferences;
 
 /**
  *  Defines an editor manager.  An editor can be added by adding a

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/GenericHTTPHandler.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/GenericHTTPHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/GenericHTTPHandler.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/GenericHTTPHandler.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/GenericHTTPHandler.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/GenericHTTPHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/GenericHTTPHandler.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.ui;
+package org.apache.wiki.ui;
 
-import com.ecyrd.jspwiki.WikiContext;
+import org.apache.wiki.WikiContext;
 
 /**
  *  Provides a generic HTTP handler interface.

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/InputValidator.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/InputValidator.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/InputValidator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
+import org.apache.wiki.*;
+import org.apache.wiki.i18n.InternationalizationManager;
+
 
 /**
  * Provides basic validation services for HTTP parameters. Three standard

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Installer.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Installer.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.io.*;
 import java.text.MessageFormat;
@@ -29,17 +29,18 @@
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.*;
-import com.ecyrd.jspwiki.auth.authorize.Group;
-import com.ecyrd.jspwiki.auth.authorize.GroupManager;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
-import com.ecyrd.jspwiki.providers.FileSystemProvider;
-import com.ecyrd.jspwiki.util.CommentedProperties;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.*;
+import org.apache.wiki.auth.*;
+import org.apache.wiki.auth.authorize.Group;
+import org.apache.wiki.auth.authorize.GroupManager;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.providers.BasicAttachmentProvider;
+import org.apache.wiki.providers.FileSystemProvider;
+import org.apache.wiki.util.CommentedProperties;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  * Manages JSPWiki installation on behalf of <code>admin/Install.jsp</code>.

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/TemplateManager.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/TemplateManager.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/TemplateManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,16 +31,16 @@
 import javax.servlet.jsp.PageContext;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.modules.ModuleManager;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.preferences.Preferences.TimeFormat;
 
-import com.ecyrd.jspwiki.InternalWikiException;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.modules.ModuleManager;
-import com.ecyrd.jspwiki.preferences.Preferences;
-import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
 
 /**
  * This class takes care of managing JSPWiki templates. This class also provides

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiJSPFilter.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiJSPFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiJSPFilter.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiJSPFilter.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiJSPFilter.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiJSPFilter.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiJSPFilter.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.io.*;
 
@@ -27,15 +27,15 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.action.WikiActionBean;
+import org.apache.wiki.event.*;
+import org.apache.wiki.ui.stripes.WikiInterceptor;
+import org.apache.wiki.util.TextUtil;
+import org.apache.wiki.util.UtilJ2eeCompat;
+import org.apache.wiki.util.WatchDog;
 import org.slf4j.MDC;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.action.WikiActionBean;
-import com.ecyrd.jspwiki.event.*;
-import com.ecyrd.jspwiki.ui.stripes.WikiInterceptor;
-import com.ecyrd.jspwiki.util.TextUtil;
-import com.ecyrd.jspwiki.util.UtilJ2eeCompat;
-import com.ecyrd.jspwiki.util.WatchDog;
 
 /**
  * This filter goes through the generated page response prior and
@@ -64,7 +64,7 @@
  * </pre>
  * 
  * @see TemplateManager
- * @see com.ecyrd.jspwiki.tags.RequestResourceTag
+ * @see org.apache.wiki.tags.RequestResourceTag
  */
 public class WikiJSPFilter extends WikiServletFilter
 {
@@ -382,7 +382,7 @@
      *  Fires a WikiPageEvent of the provided type and page name
      *  to all registered listeners of the current WikiEngine.
      *
-     * @see com.ecyrd.jspwiki.event.WikiPageEvent
+     * @see org.apache.wiki.event.WikiPageEvent
      * @param type       the event type to be fired
      * @param pagename   the wiki page name as a String
      */

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiRequestWrapper.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiRequestWrapper.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiRequestWrapper.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.security.Principal;
 import java.util.Enumeration;
@@ -28,11 +28,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.SessionMonitor;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.preferences.Preferences;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.SessionMonitor;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.preferences.Preferences;
+
 
 /**
  * Servlet request wrapper that encapsulates an incoming HTTP request and
@@ -40,7 +41,7 @@
  * values. It also ensures that the user's {@link java.util.Locale} preference
  * is respected by ensuring that the {@link #getLocale()} returns a preferred
  * Locale matching what the user supplies in the
- * {@link com.ecyrd.jspwiki.preferences.Preferences#PREFS_LOCALE} cookie. This
+ * {@link org.apache.wiki.preferences.Preferences#PREFS_LOCALE} cookie. This
  * Locale will also be returned at the top of the enumeration returned by
  * {@link #getLocales()}.
  * 
@@ -73,7 +74,7 @@
 
     /**
      * {@inheritDoc}. If the user supplied a preferred locale via the cookie
-     * value {@link com.ecyrd.jspwiki.preferences.Preferences#PREFS_LOCALE},
+     * value {@link org.apache.wiki.preferences.Preferences#PREFS_LOCALE},
      * that value is returned in preference.
      */
     public Locale getLocale()
@@ -83,7 +84,7 @@
 
     /**
      * {@inheritDoc}. If the user supplied a preferred locale via the cookie
-     * value {@link com.ecyrd.jspwiki.preferences.Preferences#PREFS_LOCALE},
+     * value {@link org.apache.wiki.preferences.Preferences#PREFS_LOCALE},
      * that value is returned as the first item in the array.
      */
     public Enumeration getLocales()

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiServletFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiServletFilter.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiServletFilter.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.ui;
+package org.apache.wiki.ui;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -27,22 +27,22 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.preferences.Preferences;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.AuthenticationManager;
+import org.apache.wiki.auth.SessionMonitor;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.tags.WikiTagBase;
 import org.slf4j.MDC;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.SessionMonitor;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.tags.WikiTagBase;
 
 /**
- * Filter that verifies that the {@link com.ecyrd.jspwiki.WikiEngine} is running, and
+ * Filter that verifies that the {@link org.apache.wiki.WikiEngine} is running, and
  * sets the authentication status for the user's WikiSession. Each HTTP request
  * processed by this filter is wrapped by a {@link WikiRequestWrapper}. The wrapper's
  * primary responsibility is to return the correct <code>userPrincipal</code> and

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBean.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBean.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBean.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBean.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBean.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBean.java Sun Feb  1 18:04:05 2009
@@ -18,10 +18,10 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.ui.admin;
+package org.apache.wiki.ui.admin;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.ui.GenericHTTPHandler;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.ui.GenericHTTPHandler;
 
 /**
  *  Describes an administrative bean.



Mime
View raw message