jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r739802 [8/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/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.io.*;
 import java.lang.reflect.Modifier;
@@ -33,18 +33,18 @@
 
 import org.apache.commons.lang.ClassUtils;
 import org.apache.ecs.xhtml.*;
-import org.apache.jspwiki.api.ModuleData;
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.*;
+import org.apache.wiki.api.ModuleData;
+import org.apache.wiki.api.PluginException;
+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.parser.PluginContent;
+import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.modules.ModuleManager;
-import com.ecyrd.jspwiki.modules.WikiModuleInfo;
-import com.ecyrd.jspwiki.parser.PluginContent;
-import com.ecyrd.jspwiki.util.ClassUtil;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Manages plugin classes.  There exists a single instance of PluginManager
@@ -59,14 +59,14 @@
  *
  *  For example, in the following line of code:
  *  <pre>
- *  [{INSERT com.ecyrd.jspwiki.plugin.FunnyPlugin  foo='bar'
+ *  [{INSERT org.apache.wiki.plugin.FunnyPlugin  foo='bar'
  *  blob='goo'
  *
  *  abcdefghijklmnopqrstuvw
  *  01234567890}]
  *  </pre>
  *
- *  The plugin class is "com.ecyrd.jspwiki.plugin.FunnyPlugin", the
+ *  The plugin class is "org.apache.wiki.plugin.FunnyPlugin", the
  *  parameters are "foo" and "blob" (having values "bar" and "goo",
  *  respectively), and the plugin body is then
  *  "abcdefghijklmnopqrstuvw\n01234567890".   The plugin body is
@@ -78,7 +78,7 @@
  *  <P>
  *  The class name can be shortened, and marked without the package.
  *  For example, "FunnyPlugin" would be expanded to
- *  "com.ecyrd.jspwiki.plugin.FunnyPlugin" automatically.  It is also
+ *  "org.apache.wiki.plugin.FunnyPlugin" automatically.  It is also
  *  possible to define other packages, by setting the
  *  "jspwiki.plugin.searchPath" property.  See the included
  *  jspwiki.properties file for examples.
@@ -92,7 +92,7 @@
  *  example:
  *
  *  <pre>
- *  [{INSERT com.ecyrd.jspwiki.plugin.Counter WHERE name='foo'}]
+ *  [{INSERT org.apache.wiki.plugin.Counter WHERE name='foo'}]
  *  </pre>
  *
  *  is the same as
@@ -153,9 +153,9 @@
      *  This is the default package to try in case the instantiation
      *  fails.
      */
-    public static final String DEFAULT_PACKAGE = "com.ecyrd.jspwiki.plugin";
+    public static final String DEFAULT_PACKAGE = "org.apache.wiki.plugin";
 
-    private static final String DEFAULT_FORMS_PACKAGE = "com.ecyrd.jspwiki.forms";
+    private static final String DEFAULT_FORMS_PACKAGE = "org.apache.wiki.forms";
 
     /**
      *  The name of the body content.  Current value is "_body".
@@ -267,7 +267,7 @@
      *
      *  @param classname Either a fully fledged class name, or just
      *  the name of the file (that is,
-     *  "com.ecyrd.jspwiki.plugin.Counter" or just plain "Counter").
+     *  "org.apache.wiki.plugin.Counter" or just plain "Counter").
      *
      *  @return A found class.
      *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RPCSamplePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RPCSamplePlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RPCSamplePlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RPCSamplePlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.util.Map;
 
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.rpc.RPCCallable;
+import org.apache.wiki.rpc.json.JSONRPCManager;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.rpc.RPCCallable;
-import com.ecyrd.jspwiki.rpc.json.JSONRPCManager;
 
 /**
  *  Simple plugin which shows how to add JSON calls to your plugin.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java Sun Feb  1 18:04:05 2009
@@ -18,25 +18,25 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
 import org.apache.ecs.xhtml.*;
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.preferences.Preferences.TimeFormat;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.preferences.Preferences;
-import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Returns the Recent Changes in the wiki being a date-sorted list of page names.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java Sun Feb  1 18:04:05 2009
@@ -18,19 +18,19 @@
     specific language governing permissions and limitations
     under the License.  
 */
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
 
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.ReferenceManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.ReferenceManager;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Displays the pages referring to the current page.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Search.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Search.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Search.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -26,14 +26,14 @@
 import java.util.Map;
 
 import org.apache.ecs.xhtml.*;
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.search.SearchResult;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.search.SearchResult;
 
 /**
  *  The "Search" plugin allows you to access the JSPWiki search routines and show the displays in an array on your page. 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/SessionsPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/SessionsPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/SessionsPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/SessionsPlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.PluginException;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
 
 /**
  *  <p>Displays information about active wiki sessions. The parameter

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.parser.Heading;
+import org.apache.wiki.parser.HeadingListener;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.parser.Heading;
-import com.ecyrd.jspwiki.parser.HeadingListener;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides a table of contents. 

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UndefinedPagesPlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.TreeSet;
 
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.ReferenceManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
 
-import com.ecyrd.jspwiki.ReferenceManager;
-import com.ecyrd.jspwiki.WikiContext;
 
 /**
  *  Plugin that enumerates the pages in the wiki that have not yet been defined.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UnusedPagesPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UnusedPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UnusedPagesPlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeSet;
 
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.ReferenceManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.ReferenceManager;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  * Plugin for displaying pages that are not linked to in other pages.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Creates a list of all weblog entries on a monthly basis.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java Sun Feb  1 18:04:05 2009
@@ -18,19 +18,19 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.plugin;
+package org.apache.wiki.plugin;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Builds a simple weblog.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -27,19 +27,19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.jspwiki.api.PluginException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.PluginException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.auth.AuthorizationManager;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.parser.PluginContent;
+import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.preferences.Preferences.TimeFormat;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.AuthorizationManager;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.parser.PluginContent;
-import com.ecyrd.jspwiki.preferences.Preferences;
-import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  <p>Builds a simple weblog.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WikiPlugin.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WikiPlugin.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.plugin;
+package org.apache.wiki.plugin;
 
 import java.util.Map;
 
-import org.apache.jspwiki.api.PluginException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.PluginException;
 
-import com.ecyrd.jspwiki.WikiContext;
 
 /**
  *  Defines an interface for plugins.  Any instance of a wiki plugin

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/package.html?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/package.html (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/package.html Sun Feb  1 18:04:05 2009
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html> <head>
-<title>com.ecyrd.jspwiki.plugin</title>
+<title>org.apache.wiki.plugin</title>
 </head>
 
 <body>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.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.preferences;
+package org.apache.wiki.preferences;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -30,14 +30,15 @@
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.PageContext;
 
-import com.ecyrd.jspwiki.InternalWikiException;
-import com.ecyrd.jspwiki.PropertyReader;
-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.ui.stripes.LocaleConverter;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.PropertyReader;
+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.ui.stripes.LocaleConverter;
+
 
 /**
  * <p>
@@ -45,14 +46,14 @@
  * and other customizable user interface items. Preferences are initialized by
  * JSPWiki by reading a series of cookies from the user's HTTP request. This
  * happens once per request, during the execution of
- * {@link com.ecyrd.jspwiki.ui.WikiServletFilter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)}.
+ * {@link org.apache.wiki.ui.WikiServletFilter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)}.
  * The method {@link #setupPreferences(HttpServletRequest)} performs the actual
  * initialization.
  * <p>
  * After initialization, Preferences are stashed in the user's session as an
  * attribute named {@link #SESSIONPREFS}. Preferences may be subsequently
  * changed by calling
- * {@link com.ecyrd.jspwiki.action.UserPreferencesActionBean#save()} with
+ * {@link org.apache.wiki.action.UserPreferencesActionBean#save()} with
  * appropriate parameters, generally from a JSP.
  * </p>
  */
@@ -114,7 +115,7 @@
     public static final String PREFS_SECTION_EDITING = "SectionEditing";
 
     /**
-     * Cookie name for the user's preferred {@link com.ecyrd.jspwiki.ui.Editor}.
+     * Cookie name for the user's preferred {@link org.apache.wiki.ui.Editor}.
      */
     public static final String PREFS_EDITOR = "Editor";
 
@@ -315,10 +316,10 @@
      * This method checks to see if user preferences have been loaded from
      * request cookies, and if not, loads them. This method is called from three
      * places: from
-     * {@link com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#intercept(net.sourceforge.stripes.controller.ExecutionContext)},
-     * {@link com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, javax.servlet.http.HttpServletResponse, String)}
+     * {@link org.apache.wiki.ui.stripes.WikiInterceptor#intercept(net.sourceforge.stripes.controller.ExecutionContext)},
+     * {@link org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, javax.servlet.http.HttpServletResponse, String)}
      * and
-     * {@link com.ecyrd.jspwiki.action.WikiContextFactory#newViewContext(HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.jspwiki.api.WikiPage)}.
+     * {@link org.apache.wiki.action.WikiContextFactory#newViewContext(HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.wiki.api.WikiPage)}.
      * </p>
      * <p>
      * Every user preference is read from a unique cookie. This method parses
@@ -333,7 +334,7 @@
      * </p>
      * <p>
      * To change user preference values after the initial parse, users normally
-     * invoke {@link com.ecyrd.jspwiki.action.UserPreferencesActionBean#save()}.
+     * invoke {@link org.apache.wiki.action.UserPreferencesActionBean#save()}.
      * </p>
      * 
      * @param request the HTTP request

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/AbstractFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/AbstractFileProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/AbstractFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/AbstractFileProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.io.*;
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.search.QueryItem;
+import org.apache.wiki.search.SearchMatcher;
+import org.apache.wiki.search.SearchResult;
+import org.apache.wiki.search.SearchResultComparator;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.search.QueryItem;
-import com.ecyrd.jspwiki.search.SearchMatcher;
-import com.ecyrd.jspwiki.search.SearchResult;
-import com.ecyrd.jspwiki.search.SearchResultComparator;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Provides a simple directory based repository for Wiki pages.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/BasicAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/BasicAttachmentProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/BasicAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/BasicAttachmentProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -39,17 +39,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-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.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.search.QueryItem;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
+
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.search.QueryItem;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
-
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.content.WikiName;
 
 /**
  *  Provides basic, versioning attachments.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingAttachmentProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingAttachmentProvider.java Sun Feb  1 18:04:05 2009
@@ -18,22 +18,22 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.search.QueryItem;
+import org.apache.wiki.util.ClassUtil;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
-import com.ecyrd.jspwiki.search.QueryItem;
-import com.ecyrd.jspwiki.util.ClassUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.CacheEntry;
 import com.opensymphony.oscache.base.NeedsRefreshException;
@@ -116,7 +116,7 @@
         
         try
         {            
-            Class providerclass = ClassUtil.findClass( "com.ecyrd.jspwiki.providers",
+            Class providerclass = ClassUtil.findClass( "org.apache.wiki.providers",
                                                        classname );
 
             m_provider = (WikiAttachmentProvider)providerclass.newInstance();

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingProvider.java Sun Feb  1 18:04:05 2009
@@ -18,22 +18,22 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.providers;
+package org.apache.wiki.providers;
 
 import java.io.IOException;
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.render.RenderingManager;
+import org.apache.wiki.search.QueryItem;
+import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.render.RenderingManager;
-import com.ecyrd.jspwiki.search.QueryItem;
-import com.ecyrd.jspwiki.util.ClassUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 import com.opensymphony.oscache.base.events.*;
@@ -176,7 +176,7 @@
 
         try
         {
-            Class providerclass = ClassUtil.findClass( "com.ecyrd.jspwiki.providers",
+            Class providerclass = ClassUtil.findClass( "org.apache.wiki.providers",
                                                        classname );
 
             m_provider = (WikiPageProvider)providerclass.newInstance();

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FastSearch.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FastSearch.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FastSearch.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FastSearch.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.providers;
+package org.apache.wiki.providers;
 
 /**
  *  If a provider implements this interface, then CachingProvider

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FileSystemProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FileSystemProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FileSystemProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FileSystemProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.io.*;
 import java.util.Properties;
 
-import org.apache.jspwiki.api.WikiPage;
+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;
 
 /**
  *  Provides a simple directory based repository for Wiki pages.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/NoSuchVersionException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/NoSuchVersionException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/NoSuchVersionException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/NoSuchVersionException.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.providers;
+package org.apache.wiki.providers;
 
 /**
  *  Indicates that an non-existing version was specified.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/ProviderException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/ProviderException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/ProviderException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/ProviderException.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.providers;
+package org.apache.wiki.providers;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.api.WikiException;
 
 /**
  *  This exception represents the superclass of all exceptions that providers

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RCSFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RCSFileProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RCSFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RCSFileProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.io.File;
 import java.io.BufferedReader;
@@ -37,15 +37,15 @@
 import java.text.SimpleDateFormat;
 import java.text.ParseException;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.*;
 
 /**
  *  This class implements a simple RCS file provider.  NOTE: You MUST

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RepositoryModifiedException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RepositoryModifiedException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RepositoryModifiedException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RepositoryModifiedException.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.providers;
+package org.apache.wiki.providers;
 
 /**
  *  If the provider detects that someone has modified the repository

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningFileProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningFileProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.io.*;
 import java.util.Collection;
@@ -28,15 +28,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+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.util.FileUtil;
 
-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.util.FileUtil;
 
-import com.ecyrd.jspwiki.*;
 
 /**
  *  Provides a simple directory based repository for Wiki pages.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningProvider.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.providers;
+package org.apache.wiki.providers;
 
 /**
  *  This is a provider interface which providers can implement, if they

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiAttachmentProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiAttachmentProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.io.InputStream;
 import java.io.IOException;
@@ -27,11 +27,11 @@
 import java.util.Date;
 import java.util.List;
 
-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.search.QueryItem;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.search.QueryItem;
 
 /**
  *  Defines an attachment provider - a class which is capable of saving

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiPageProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiPageProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiPageProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiPageProvider.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.providers;
+package org.apache.wiki.providers;
 
 import java.util.List;
 import java.util.Collection;
 import java.util.Date;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.search.QueryItem;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.search.QueryItem;
 
 /**
  *  Each Wiki page provider should implement this interface.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CleanTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CleanTextRenderer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CleanTextRenderer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CleanTextRenderer.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.render;
+package org.apache.wiki.render;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
-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 org.apache.wiki.parser.WikiDocument;
 import org.jdom.JDOMException;
 import org.jdom.Text;
 import org.jdom.xpath.XPath;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.WikiDocument;
 
 /**
  *  A simple renderer that just renders all the text() nodes

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CreoleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CreoleRenderer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CreoleRenderer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CreoleRenderer.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.render;
+package org.apache.wiki.render;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.parser.PluginContent;
+import org.apache.wiki.parser.WikiDocument;
 import org.jdom.Content;
 import org.jdom.Element;
 import org.jdom.Text;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.PluginContent;
-import com.ecyrd.jspwiki.parser.WikiDocument;
 
 /**
  *  Implements DOM-to-Creole rendering.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.render;
+package org.apache.wiki.render;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -27,23 +27,23 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.jspwiki.api.WikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiEventUtils;
+import org.apache.wiki.event.WikiPageEvent;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.modules.InternalModule;
+import org.apache.wiki.parser.JSPWikiMarkupParser;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.providers.CachingProvider;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.event.WikiEvent;
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WikiEventUtils;
-import com.ecyrd.jspwiki.event.WikiPageEvent;
-import com.ecyrd.jspwiki.modules.InternalModule;
-import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
-import com.ecyrd.jspwiki.providers.CachingProvider;
-import com.ecyrd.jspwiki.util.TextUtil;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 
@@ -329,7 +329,7 @@
     /**
      * Flushes the document cache in response to a POST_SAVE_BEGIN event.
      *
-     * @see com.ecyrd.jspwiki.event.WikiEventListener#actionPerformed(com.ecyrd.jspwiki.event.WikiEvent)
+     * @see org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent)
      * @param event {@inheritDoc}
      */
     @SuppressWarnings("deprecation")

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WikiRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WikiRenderer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WikiRenderer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WikiRenderer.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.render;
+package org.apache.wiki.render;
 
 import java.io.IOException;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  *  Provides an interface to the basic rendering engine.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WysiwygEditingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WysiwygEditingRenderer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WysiwygEditingRenderer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WysiwygEditingRenderer.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.render;
+package org.apache.wiki.render;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Iterator;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.htmltowiki.XHtmlToWikiConfig;
+import org.apache.wiki.parser.WikiDocument;
 import org.jdom.Attribute;
 import org.jdom.Element;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.htmltowiki.XHtmlToWikiConfig;
-import com.ecyrd.jspwiki.parser.WikiDocument;
 
 /**
  *  Implements a WikiRendered that outputs XHTML in a format that is suitable

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/render/XHTMLRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/render/XHTMLRenderer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/render/XHTMLRenderer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/XHTMLRenderer.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.render;
+package org.apache.wiki.render;
 
 import java.io.IOException;
 import java.io.StringWriter;
 
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.parser.WikiDocument;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.parser.WikiDocument;
 
 /**
  *  Implements a WikiRendered that outputs XHTML.  Because the internal DOM

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCCallable.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCCallable.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCCallable.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCCallable.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCCallable.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCCallable.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCCallable.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.rpc;
+package org.apache.wiki.rpc;
 
 /**
  *  Defines an interface for anything which can be called using the RPC methods.

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCManager.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCManager.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCManager.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCManager.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCManager.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCManager.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.rpc;
+package org.apache.wiki.rpc;
 
 /**
  *  A base class for managing RPC calls.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.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.rpc.atom;
+package org.apache.wiki.rpc.atom;
 
 import java.io.*;
 import javax.servlet.ServletConfig;
@@ -31,22 +31,22 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-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.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.plugin.WeblogEntryPlugin;
+import org.apache.wiki.plugin.WeblogPlugin;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.*;
 import org.intabulas.sandler.*;
 import org.intabulas.sandler.exceptions.*;
 import org.intabulas.sandler.elements.*;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.util.*;
 
-import com.ecyrd.jspwiki.plugin.WeblogEntryPlugin;
-import com.ecyrd.jspwiki.plugin.WeblogPlugin;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Handles incoming requests for the Atom API.  This class uses the

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/json/JSONRPCManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/json/JSONRPCManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/json/JSONRPCManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/json/JSONRPCManager.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.rpc.json;
+package org.apache.wiki.rpc.json;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
@@ -29,17 +29,17 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.rpc.RPCCallable;
-import com.ecyrd.jspwiki.rpc.RPCManager;
-import com.ecyrd.jspwiki.ui.TemplateManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.rpc.RPCCallable;
+import org.apache.wiki.rpc.RPCManager;
+import org.apache.wiki.ui.TemplateManager;
 import org.jabsorb.callback.InvocationCallback;
 import org.jabsorb.JSONRPCBridge;
 
@@ -54,7 +54,7 @@
  *  <p>
  *  Due to some limitations of the JSON-RPC library, we do not use the
  *  Global bridge object. 
- *  @see com.ecyrd.jspwiki.rpc.RPCCallable
+ *  @see org.apache.wiki.rpc.RPCCallable
  *  @since 2.5.4
  */
 // FIXME: Must be mootool-ified.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/AtomFeed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/AtomFeed.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/AtomFeed.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/AtomFeed.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.rss;
+package org.apache.wiki.rss;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -30,17 +30,17 @@
 import javax.servlet.ServletContext;
 
 import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.Release;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.providers.ProviderException;
 import org.jdom.Element;
 import org.jdom.Namespace;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
-import com.ecyrd.jspwiki.Release;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Provides an Atom 1.0 standard feed, with enclosures.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Entry.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Entry.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Entry.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Entry.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.rss;
+package org.apache.wiki.rss;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.api.WikiPage;
 
 /**
  *  Represents an entry, that is, an unit of change, in a Feed.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Feed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Feed.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Feed.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Feed.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.rss;
+package org.apache.wiki.rss;
 
 import java.util.*;
 
 import javax.servlet.ServletContext;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  *  Represents an abstract feed.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS10Feed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS10Feed.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS10Feed.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS10Feed.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.rss;
+package org.apache.wiki.rss;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Iterator;
 
 import org.apache.ecs.xml.XML;
-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;
 
 /**
  *  Provides an implementation of an RSS 1.0 feed.  In addition, this class is

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS20Feed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS20Feed.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS20Feed.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS20Feed.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.rss;
+package org.apache.wiki.rss;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -27,16 +27,16 @@
 
 import javax.servlet.ServletContext;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.Release;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.providers.ProviderException;
 import org.jdom.Element;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
-import com.ecyrd.jspwiki.Release;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Represents an RSS 2.0 feed (with enclosures).  This feed provides no

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java Sun Feb  1 18:04:05 2009
@@ -18,22 +18,22 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.rss;
+package org.apache.wiki.rss;
 
 import java.util.*;
 
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.content.WikiName;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.auth.permissions.PagePermission;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  The master class for generating different kinds of Feeds (including RSS1.0, 2.0 and Atom).
@@ -154,7 +154,7 @@
 
     /**
      *  Initialize the RSS generator for a given WikiEngine.  Currently the only 
-     *  required property is <tt>{@value com.ecyrd.jspwiki.WikiEngine#PROP_BASEURL}</tt>.
+     *  required property is <tt>{@value org.apache.wiki.WikiEngine#PROP_BASEURL}</tt>.
      *  
      *  @param engine The WikiEngine.
      *  @param properties The properties.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSThread.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSThread.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSThread.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSThread.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.rss;
+package org.apache.wiki.rss;
 
 
 import java.io.BufferedWriter;
@@ -32,13 +32,14 @@
 import java.io.StringReader;
 import java.io.Writer;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.WatchDog;
+import org.apache.wiki.util.WikiBackgroundThread;
+
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.WatchDog;
-import com.ecyrd.jspwiki.util.WikiBackgroundThread;
 
 /**
  *  Runs the RSS generation thread.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.search;
+package org.apache.wiki.search;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -27,16 +27,16 @@
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.providers.WikiPageProvider;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.providers.WikiPageProvider;
 
 /**
  *  Interface for the search providers that handle searching the Wiki

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java Sun Feb  1 18:04:05 2009
@@ -18,16 +18,13 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.search;
+package org.apache.wiki.search;
 
 import java.io.*;
 import java.util.*;
 
 import org.apache.commons.lang.StringUtils;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-import org.apache.jspwiki.api.WikiPage;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Document;
@@ -48,15 +45,18 @@
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
+import org.apache.wiki.*;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
+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.providers.WikiPageProvider;
+import org.apache.wiki.util.*;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
-import com.ecyrd.jspwiki.content.WikiName;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.providers.WikiPageProvider;
-import com.ecyrd.jspwiki.util.*;
 
 /**
  *  Interface for the search providers that handle searching the Wiki
@@ -774,7 +774,7 @@
         }
 
         /* (non-Javadoc)
-         * @see com.ecyrd.jspwiki.SearchResult#getScore()
+         * @see org.apache.wiki.SearchResult#getScore()
          */
         public int getScore()
         {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/QueryItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/QueryItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/QueryItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/QueryItem.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.     
  */
-package com.ecyrd.jspwiki.search;
+package org.apache.wiki.search;
 
 /**
  *  This simple class just fulfils the role of a container

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java Sun Feb  1 18:04:05 2009
@@ -18,31 +18,31 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.search;
+package org.apache.wiki.search;
 
 import java.io.IOException;
 import java.util.*;
 
 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.*;
-import com.ecyrd.jspwiki.event.WikiEvent;
-import com.ecyrd.jspwiki.event.WikiEventListener;
-import com.ecyrd.jspwiki.event.WikiEventUtils;
-import com.ecyrd.jspwiki.event.WikiPageEvent;
-import com.ecyrd.jspwiki.filters.BasicPageFilter;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.modules.InternalModule;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.rpc.RPCCallable;
-import com.ecyrd.jspwiki.rpc.json.JSONRPCManager;
-import com.ecyrd.jspwiki.util.ClassUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
+import org.apache.wiki.*;
+import org.apache.wiki.api.FilterException;
+import org.apache.wiki.api.WikiException;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiEventUtils;
+import org.apache.wiki.event.WikiPageEvent;
+import org.apache.wiki.filters.BasicPageFilter;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.modules.InternalModule;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.rpc.RPCCallable;
+import org.apache.wiki.rpc.json.JSONRPCManager;
+import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.TextUtil;
+
 
 /**
  *  Manages searching the Wiki.
@@ -57,7 +57,7 @@
 {
     private static final Logger log = LoggerFactory.getLogger(SearchManager.class);
 
-    private static final String DEFAULT_SEARCHPROVIDER  = "com.ecyrd.jspwiki.search.LuceneSearchProvider";
+    private static final String DEFAULT_SEARCHPROVIDER  = "org.apache.wiki.search.LuceneSearchProvider";
     
     /** Old option, now deprecated. */
     private static final String PROP_USE_LUCENE        = "jspwiki.useLucene";
@@ -256,7 +256,7 @@
 
         try
         {
-            Class providerClass = ClassUtil.findClass( "com.ecyrd.jspwiki.search", providerClassName );
+            Class providerClass = ClassUtil.findClass( "org.apache.wiki.search", providerClassName );
             m_searchProvider = (SearchProvider)providerClass.newInstance();
         }
         catch( ClassNotFoundException e )

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchMatcher.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchMatcher.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchMatcher.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchMatcher.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.search;
+package org.apache.wiki.search;
 
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
 
-import com.ecyrd.jspwiki.WikiEngine;
 
 /**
  * SearchMatcher performs the task of matching a search query to a page's

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.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.search;
+package org.apache.wiki.search;
 
 import java.io.IOException;
 import java.util.Collection;
 
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiProvider;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.WikiProvider;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *  Interface for the search providers that handle searching the Wiki

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

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/search/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/search/package.html?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/search/package.html (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/package.html Sun Feb  1 18:04:05 2009
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html> <head>
-<title>com.ecyrd.jspwiki.search</title>
+<title>org.apache.wiki.search</title>
 </head>
 
 <body>

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.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.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.ecyrd.jspwiki.ui.admin.AdminBean;
-import com.ecyrd.jspwiki.ui.admin.AdminBeanManager;
+import org.apache.wiki.ui.admin.AdminBean;
+import org.apache.wiki.ui.admin.AdminBeanManager;
+
 
 /**
  *  Provides an iterator for all AdminBeans of a given type.

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.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.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.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
+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;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
-import com.ecyrd.jspwiki.attachment.Attachment;
 
 /**
  *  Iterates through the list of attachments one has.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AuthorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AuthorTag.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AuthorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AuthorTag.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 org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.parser.MarkupParser;
+import org.apache.wiki.parser.WikiDocument;
+import org.apache.wiki.render.RenderingManager;
+import org.apache.wiki.util.TextUtil;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.parser.MarkupParser;
-import com.ecyrd.jspwiki.parser.WikiDocument;
-import com.ecyrd.jspwiki.render.RenderingManager;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Writes the author name of the current page, including a link to that page,

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



Mime
View raw message