jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r739802 [6/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/auth/login/CookieAuthenticationLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.auth.login;
+package org.apache.wiki.auth.login;
 
 import java.io.*;
 import java.util.UUID;
@@ -30,14 +30,15 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.HttpUtil;
+import org.apache.wiki.util.TextUtil;
+
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.util.FileUtil;
-import com.ecyrd.jspwiki.util.HttpUtil;
-import com.ecyrd.jspwiki.util.TextUtil;
 
 /**
  *  Logs in an user based on a cookie stored in the user's computer.  The cookie

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

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

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseCallback.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseCallback.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseCallback.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseCallback.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.auth.login;
+package org.apache.wiki.auth.login;
 
 import javax.security.auth.callback.Callback;
 
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserDatabase;
+
 
 /**
  * Callback for requesting and supplying a wiki UserDatabase. This callback is

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.auth.login;
+package org.apache.wiki.auth.login;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -30,14 +30,15 @@
 import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginException;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.user.UserDatabase;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.user.UserDatabase;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.i18n.InternationalizationManager;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
 /**
  * <p>
@@ -50,12 +51,12 @@
  * username</li>
  * <li>{@link javax.security.auth.callback.PasswordCallback}- supplies the
  * password</li>
- * <li>{@link com.ecyrd.jspwiki.auth.login.LocaleCallback}- supplies the
+ * <li>{@link org.apache.wiki.auth.login.LocaleCallback}- supplies the
  * HTTP request, from which the user's {@link java.util.Locale} is obtained
  * (used for constructing localized error messages)</li>
- * <li>{@link com.ecyrd.jspwiki.auth.login.WikiEngineCallback}- supplies the
- * {@link com.ecyrd.jspwiki.WikiEngine}, from which the
- * {@link com.ecyrd.jspwiki.i18n.InternationalizationManager} is obtained
+ * <li>{@link org.apache.wiki.auth.login.WikiEngineCallback}- supplies the
+ * {@link org.apache.wiki.WikiEngine}, from which the
+ * {@link org.apache.wiki.i18n.InternationalizationManager} is obtained
  * (used for constructing localized error messages)</li>
  * </ol>
  * <p>
@@ -76,7 +77,7 @@
      *      {@link javax.security.auth.login.FailedLoginException} if the
      *      username or password does not match what is contained in the
      *      database. The text of this message will be looked up in the
-     *      {@link com.ecyrd.jspwiki.i18n.InternationalizationManager#CORE_BUNDLE}
+     *      {@link org.apache.wiki.i18n.InternationalizationManager#CORE_BUNDLE}
      *      using the key <code>login.error.password</code>. Any other
      *      Exceptions thrown by this method will <em>not</em> be localized,
      *      because they represent exceptional error conditions that should not

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.login;
+package org.apache.wiki.auth.login;
 
 import java.io.IOException;
 
@@ -27,12 +27,13 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.servlet.http.HttpServletRequest;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.Authorizer;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.Authorizer;
+
 
 /**
  * Handles logins made from within JSPWiki.
- * @see com.ecyrd.jspwiki.WikiSession#getWikiSession(WikiEngine,HttpServletRequest)
+ * @see org.apache.wiki.WikiSession#getWikiSession(WikiEngine,HttpServletRequest)
  * @author Andrew Jaquith
  * @since 2.3
  */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package com.ecyrd.jspwiki.auth.login;
+package org.apache.wiki.auth.login;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -32,13 +32,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.auth.Authorizer;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.authorize.Role;
+import org.apache.wiki.auth.authorize.WebAuthorizer;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
-import com.ecyrd.jspwiki.auth.Authorizer;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.authorize.Role;
-import com.ecyrd.jspwiki.auth.authorize.WebAuthorizer;
 
 /**
  * <p>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiCallbackHandler.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiCallbackHandler.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiCallbackHandler.java Sun Feb  1 18:04:05 2009
@@ -18,22 +18,23 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.login;
+package org.apache.wiki.auth.login;
 
 import java.io.IOException;
 import java.util.Locale;
 
 import javax.security.auth.callback.*;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+
 
 /**
  * Handles logins made from inside the wiki application, rather than via the web
  * container. This handler is instantiated in
- * {@link com.ecyrd.jspwiki.auth.AuthenticationManager#login(WikiSession, String, String)}.
+ * {@link org.apache.wiki.auth.AuthenticationManager#login(WikiSession, String, String)}.
  * If container-managed authentication is used, the
  * {@link WebContainerCallbackHandler} is used instead. This callback handler is
  * designed to be used with {@link UserDatabaseLoginModule}.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiEngineCallback.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiEngineCallback.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiEngineCallback.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiEngineCallback.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.auth.login;
+package org.apache.wiki.auth.login;
 
 import javax.security.auth.callback.Callback;
 
-import com.ecyrd.jspwiki.WikiEngine;
+import org.apache.wiki.WikiEngine;
+
 
 /**
  * Callback for requesting and supplying the WikiEngine object required by a

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.permissions;
+package org.apache.wiki.auth.permissions;
 
 import java.security.Permission;
 import java.security.PermissionCollection;
@@ -55,7 +55,7 @@
         if ( !AllPermission.isJSPWikiPermission( permission ) )
         {
             throw new IllegalArgumentException(
-                    "Permission must be of type com.ecyrd.jspwiki.permissions.*Permission." );
+                    "Permission must be of type org.apache.wiki.permissions.*Permission." );
         }
 
         if ( m_readOnly )

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/GroupPermission.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/GroupPermission.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/GroupPermission.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/GroupPermission.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.permissions;
+package org.apache.wiki.auth.permissions;
 
 import java.io.Serializable;
 import java.security.AccessControlContext;
@@ -32,7 +32,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.SubjectDomainCombiner;
 
-import com.ecyrd.jspwiki.auth.GroupPrincipal;
+import org.apache.wiki.auth.GroupPrincipal;
+
 
 /**
  * <p>
@@ -71,8 +72,8 @@
  *
  * <pre>
  *  grant signedBy &quot;jspwiki&quot;,
- *    principal com.ecyrd.jspwiki.auth.authorize.Role &quot;Authenticated&quot; {
- *      permission com.ecyrd.jspwiki.auth.permissions.GroupPermission &quot;*:&lt;groupmember&gt;&quot;, &quot;edit&quot;;
+ *    principal org.apache.wiki.auth.authorize.Role &quot;Authenticated&quot; {
+ *      permission org.apache.wiki.auth.permissions.GroupPermission &quot;*:&lt;groupmember&gt;&quot;, &quot;edit&quot;;
  * </pre>
  *
  * means, &#8220;allow Authenticated users to edit any groups they are members of.&#8221;
@@ -402,7 +403,7 @@
      * <p>
      * If a SubjectDomainCombiner exists, determining group membership is
      * simple: just iterate through the Subject&#8217;s Principal set and look for all
-     * Principals of type {@link com.ecyrd.jspwiki.auth.GroupPrincipal}. If the
+     * Principals of type {@link org.apache.wiki.auth.GroupPrincipal}. If the
      * name of any Principal matches the value of the implied Permission&#8217;s
      * {@link GroupPermission#getGroup()} value, then the Subject is a member of
      * this group -- and therefore this <code>impliesMember</code> call
@@ -456,7 +457,7 @@
      * </table>
      * <p>
      * Note that JSPWiki&#8217;s access control checks are made inside of
-     * {@link com.ecyrd.jspwiki.auth.AuthorizationManager#checkPermission(com.ecyrd.jspwiki.WikiSession, Permission)},
+     * {@link org.apache.wiki.auth.AuthorizationManager#checkPermission(org.apache.wiki.WikiSession, Permission)},
      * which performs a <code>Subject.doAs()</code> call. Thus, this
      * Permission functions exactly the way it should during normal
      * operations.

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

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

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/AbstractUserDatabase.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/AbstractUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/AbstractUserDatabase.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 import java.io.*;
 import java.security.MessageDigest;
@@ -27,15 +27,15 @@
 import java.util.*;
 
 import org.apache.catalina.util.HexUtils;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.util.CryptoUtil;
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.util.CryptoUtil;
 
 /**
  * Abstract UserDatabase class that provides convenience methods for finding
@@ -70,7 +70,7 @@
      * principal names when the exact profile attribute that supplied the name
      * is unknown.
      * @param index the login name, full name, or wiki name
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#find(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#find(java.lang.String)
      */
     public UserProfile find( String index ) throws NoSuchPrincipalException
     {
@@ -120,25 +120,25 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByEmail(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByEmail(java.lang.String)
      */
     public abstract UserProfile findByEmail( String index ) throws NoSuchPrincipalException;
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByFullName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByFullName(java.lang.String)
      */
     public abstract UserProfile findByFullName( String index ) throws NoSuchPrincipalException;
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByLoginName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByLoginName(java.lang.String)
      */
     public abstract UserProfile findByLoginName( String index ) throws NoSuchPrincipalException;
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByWikiName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByWikiName(java.lang.String)
      */
     public abstract UserProfile findByWikiName( String index ) throws NoSuchPrincipalException;
 
@@ -149,12 +149,12 @@
      * with the supplied identifier, throws a {@link NoSuchPrincipalException}.</p>
      * <p>When this method creates WikiPrincipals, the Principal containing
      * the user's full name is marked as containing the common name (see
-     * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#WikiPrincipal(String, String)}).
+     * {@link org.apache.wiki.auth.WikiPrincipal#WikiPrincipal(String, String)}).
      * @param identifier the name of the principal to retrieve; this corresponds to
      *            value returned by the user profile's
      *            {@link UserProfile#getLoginName()}method.
      * @return the array of Principals representing the user
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#getPrincipals(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#getPrincipals(java.lang.String)
      * @throws NoSuchPrincipalException {@inheritDoc}
      */
     public Principal[] getPrincipals( String identifier ) throws NoSuchPrincipalException
@@ -185,7 +185,7 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#initialize(com.ecyrd.jspwiki.WikiEngine, java.util.Properties)
+     * @see org.apache.wiki.auth.user.UserDatabase#initialize(org.apache.wiki.WikiEngine, java.util.Properties)
      */
     public abstract void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException;
 
@@ -202,7 +202,7 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#save(com.ecyrd.jspwiki.auth.user.UserProfile)
+     * @see org.apache.wiki.auth.user.UserDatabase#save(org.apache.wiki.auth.user.UserProfile)
      */
     public abstract void save( UserProfile profile ) throws WikiSecurityException;
 
@@ -218,7 +218,7 @@
      * @return <code>true</code> if the supplied user password matches the
      * stored password
      * @throws NoSuchAlgorithmException 
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#validatePassword(java.lang.String,
+     * @see org.apache.wiki.auth.user.UserDatabase#validatePassword(java.lang.String,
      *      java.lang.String)
      */
     public boolean validatePassword( String loginName, String password )

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DefaultUserProfile.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DefaultUserProfile.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DefaultUserProfile.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DefaultUserProfile.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -107,7 +107,7 @@
     /**
      * Returns the creation date
      * @return the creation date
-     * @see com.ecyrd.jspwiki.auth.user.UserProfile#getCreated()
+     * @see org.apache.wiki.auth.user.UserProfile#getCreated()
      */
     public Date getCreated()
     {
@@ -135,7 +135,7 @@
     /**
      * Returns the last-modified date.
      * @return the last-modified date
-     * @see com.ecyrd.jspwiki.auth.user.UserProfile#getLastModified()
+     * @see org.apache.wiki.auth.user.UserProfile#getLastModified()
      */
     public Date getLastModified()
     {
@@ -179,7 +179,7 @@
      * new. This implementation checks whether
      * {@link #getLastModified()} returns <code>null</code>
      * to determine the status.
-     * @see com.ecyrd.jspwiki.auth.user.UserProfile#isNew()
+     * @see org.apache.wiki.auth.user.UserProfile#isNew()
      */
     public boolean isNew()
     {
@@ -188,7 +188,7 @@
 
     /**
      * @param date the creation date
-     * @see com.ecyrd.jspwiki.auth.user.UserProfile#setCreated(java.util.Date)
+     * @see org.apache.wiki.auth.user.UserProfile#setCreated(java.util.Date)
      */
     public void setCreated(Date date)
     {
@@ -222,7 +222,7 @@
     /**
      * Sets the last-modified date.
      * @param date the last-modified date
-     * @see com.ecyrd.jspwiki.auth.user.UserProfile#setLastModified(java.util.Date)
+     * @see org.apache.wiki.auth.user.UserProfile#setLastModified(java.util.Date)
      */
     public void setLastModified( Date date )
     {
@@ -232,7 +232,7 @@
     /**
      * Sets the name by which the user logs in. The login name is used as the
      * username for custom authentication (see
-     * {@link com.ecyrd.jspwiki.auth.AuthenticationManager#login(WikiSession, String, String)}).
+     * {@link org.apache.wiki.auth.AuthenticationManager#login(WikiSession, String, String)}).
      * The login name is typically a short name ("jannej"). In contrast, the
      * wiki name is typically of type FirstnameLastName ("JanneJalkanen").
      * @param name the login name

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DuplicateUserException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DuplicateUserException.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DuplicateUserException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DuplicateUserException.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 /**
  * Exception indicating that an identical user already exists in the user

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/JDBCUserDatabase.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/JDBCUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/JDBCUserDatabase.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 import java.io.*;
 import java.security.Principal;
@@ -31,12 +31,13 @@
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.util.Serializer;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.util.Serializer;
+
 
 /**
  * <p>
@@ -356,7 +357,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByEmail(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByEmail(java.lang.String)
      */
     public UserProfile findByEmail( String index ) throws NoSuchPrincipalException
     {
@@ -364,7 +365,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByFullName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByFullName(java.lang.String)
      */
     public UserProfile findByFullName( String index ) throws NoSuchPrincipalException
     {
@@ -372,7 +373,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByLoginName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByLoginName(java.lang.String)
      */
     public UserProfile findByLoginName( String index ) throws NoSuchPrincipalException
     {
@@ -380,7 +381,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByWikiName(String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByWikiName(String)
      */
     public UserProfile findByUid( String uid ) throws NoSuchPrincipalException
     {
@@ -388,7 +389,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByWikiName(String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByWikiName(String)
      */
     public UserProfile findByWikiName( String index ) throws NoSuchPrincipalException
     {
@@ -445,7 +446,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#initialize(com.ecyrd.jspwiki.WikiEngine,
+     * @see org.apache.wiki.auth.user.UserDatabase#initialize(org.apache.wiki.WikiEngine,
      *      java.util.Properties)
      */
     public void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException
@@ -582,7 +583,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#rename(String, String)
+     * @see org.apache.wiki.auth.user.UserDatabase#rename(String, String)
      */
     public void rename( String loginName, String newName )
                                                           throws NoSuchPrincipalException,
@@ -661,7 +662,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#save(com.ecyrd.jspwiki.auth.user.UserProfile)
+     * @see org.apache.wiki.auth.user.UserDatabase#save(org.apache.wiki.auth.user.UserProfile)
      */
     public void save( UserProfile profile ) throws WikiSecurityException
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserDatabase.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserDatabase.java Sun Feb  1 18:04:05 2009
@@ -18,15 +18,16 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 import java.security.Principal;
 import java.util.Properties;
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiSecurityException;
+
 
 /**
  * Defines an interface for loading, persisting and storing users.
@@ -72,10 +73,10 @@
      * Note that if an implememtation wishes to mark one of the returned
      * Principals as representing the user's common name, it should instantiate
      * this Principal using
-     * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#WikiPrincipal(String, String)}
+     * {@link org.apache.wiki.auth.WikiPrincipal#WikiPrincipal(String, String)}
      * with the <code>type</code> parameter set to
-     * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#WIKI_NAME}. The method
-     * {@link com.ecyrd.jspwiki.WikiSession#getUserPrincipal()} will return this
+     * {@link org.apache.wiki.auth.WikiPrincipal#WIKI_NAME}. The method
+     * {@link org.apache.wiki.WikiSession#getUserPrincipal()} will return this
      * principal as the "primary" principal. Note that this method can also be
      * used to mark a WikiPrincipal as a login name or a wiki name.
      * </p>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserProfile.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserProfile.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserProfile.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserProfile.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -29,7 +29,7 @@
  * name, wiki name, and e-mail address. Note that since 2.6 the wiki name is
  * required to be automatically computed from the full name.
  * As of 2.8, user profiles can store custom key/value String/Serializable attributes, and store
- * a unique ID. Locks are checked by {@link com.ecyrd.jspwiki.auth.AuthenticationManager};
+ * a unique ID. Locks are checked by {@link org.apache.wiki.auth.AuthenticationManager};
  * if a profile is locked, the user cannot log with that profile.
  * @author Andrew Jaquith
  * @since 2.3
@@ -164,8 +164,8 @@
     /**
      * Sets the name by which the user logs in. The login name is used as the
      * username for custom authentication (see
-     * {@link com.ecyrd.jspwiki.auth.AuthenticationManager#login(WikiSession, String, String)},
-     * {@link com.ecyrd.jspwiki.auth.login.UserDatabaseLoginModule}). The login
+     * {@link org.apache.wiki.auth.AuthenticationManager#login(WikiSession, String, String)},
+     * {@link org.apache.wiki.auth.login.UserDatabaseLoginModule}). The login
      * name is typically a short name ("jannej"). In contrast, the wiki name is
      * typically of type FirstnameLastName ("JanneJalkanen").
      * @param name the login name

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java Sun Feb  1 18:04:05 2009
@@ -18,7 +18,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.auth.user;
+package org.apache.wiki.auth.user;
 
 import java.io.*;
 import java.security.Principal;
@@ -30,15 +30,15 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.auth.NoSuchPrincipalException;
+import org.apache.wiki.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.util.Serializer;
 import org.w3c.dom.*;
 import org.xml.sax.SAXException;
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.util.Serializer;
 
 /**
  * <p>Manages {@link DefaultUserProfile} objects using XML files for persistence.
@@ -137,7 +137,7 @@
      * {@link NoSuchPrincipalException}.
      * @param index the e-mail address of the desired user profile
      * @return the user profile
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByEmail(String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByEmail(String)
      */
     public UserProfile findByEmail( String index ) throws NoSuchPrincipalException
     {
@@ -156,7 +156,7 @@
      * {@link NoSuchPrincipalException}.
      * @param index the fill name of the desired user profile
      * @return the user profile
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByFullName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByFullName(java.lang.String)
      */
     public UserProfile findByFullName( String index ) throws NoSuchPrincipalException
     {
@@ -175,7 +175,7 @@
      * {@link NoSuchPrincipalException}.
      * @param index the login name of the desired user profile
      * @return the user profile
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByLoginName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByLoginName(java.lang.String)
      */
     public UserProfile findByLoginName( String index ) throws NoSuchPrincipalException
     {
@@ -207,7 +207,7 @@
      * {@link NoSuchPrincipalException}.
      * @param index the wiki name of the desired user profile
      * @return the user profile
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByWikiName(java.lang.String)
+     * @see org.apache.wiki.auth.user.UserDatabase#findByWikiName(java.lang.String)
      */
     public UserProfile findByWikiName( String index ) throws NoSuchPrincipalException
     {
@@ -256,7 +256,7 @@
      * Initializes the user database based on values from a Properties object.
      * The properties object must contain a file path to the XML database file
      * whose key is {@link #PROP_USERDATABASE}.
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#initialize(com.ecyrd.jspwiki.WikiEngine,
+     * @see org.apache.wiki.auth.user.UserDatabase#initialize(org.apache.wiki.WikiEngine,
      *      java.util.Properties)
      * @throws NoRequiredPropertyException if the user database cannot be located, parsed, or opened
      */
@@ -444,7 +444,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.auth.user.UserDatabase#rename(String, String)
+     * @see org.apache.wiki.auth.user.UserDatabase#rename(String, String)
      */
     public synchronized void rename(String loginName, String newName) throws NoSuchPrincipalException, DuplicateUserException, WikiSecurityException
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.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.content;
+package org.apache.wiki.content;
 
 import java.security.Permission;
 import java.security.Principal;
@@ -36,31 +36,31 @@
 import javax.naming.NamingException;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.jspwiki.api.FilterException;
-import org.apache.jspwiki.api.WikiException;
-import org.apache.jspwiki.api.WikiPage;
+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.auth.WikiPrincipal;
+import org.apache.wiki.auth.WikiSecurityException;
+import org.apache.wiki.auth.acl.Acl;
+import org.apache.wiki.auth.acl.AclEntry;
+import org.apache.wiki.auth.acl.AclEntryImpl;
+import org.apache.wiki.auth.user.UserProfile;
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.event.WikiEventManager;
+import org.apache.wiki.event.WikiPageEvent;
+import org.apache.wiki.event.WikiSecurityEvent;
+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 org.apache.wiki.util.WikiBackgroundThread;
+import org.apache.wiki.workflow.Outcome;
+import org.apache.wiki.workflow.Task;
+import org.apache.wiki.workflow.Workflow;
 import org.priha.RepositoryManager;
 import org.priha.util.ConfigurationException;
 
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
-import com.ecyrd.jspwiki.auth.acl.Acl;
-import com.ecyrd.jspwiki.auth.acl.AclEntry;
-import com.ecyrd.jspwiki.auth.acl.AclEntryImpl;
-import com.ecyrd.jspwiki.auth.user.UserProfile;
-import com.ecyrd.jspwiki.event.WikiEvent;
-import com.ecyrd.jspwiki.event.WikiEventManager;
-import com.ecyrd.jspwiki.event.WikiPageEvent;
-import com.ecyrd.jspwiki.event.WikiSecurityEvent;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.util.TextUtil;
-import com.ecyrd.jspwiki.util.WikiBackgroundThread;
-import com.ecyrd.jspwiki.workflow.Outcome;
-import com.ecyrd.jspwiki.workflow.Task;
-import com.ecyrd.jspwiki.workflow.Workflow;
 
 /**
  *  Provides access to the content repository.  Unlike previously, in JSPWiki
@@ -798,7 +798,7 @@
     /**
      * Inner class that handles the page pre-save actions. If the proposed page
      * text is the same as the current version, the {@link #execute()} method
-     * returns {@link com.ecyrd.jspwiki.workflow.Outcome#STEP_ABORT}. Any
+     * returns {@link org.apache.wiki.workflow.Outcome#STEP_ABORT}. Any
      * WikiExceptions thrown by page filters will be re-thrown, and the workflow
      * will abort.
      *
@@ -868,7 +868,7 @@
     /**
      * Inner class that handles the actual page save and post-save actions. Instances
      * of this class are assumed to have been added to an approval workflow via
-     * {@link com.ecyrd.jspwiki.workflow.WorkflowBuilder#buildApprovalWorkflow(Principal, String, Task, String, com.ecyrd.jspwiki.workflow.Fact[], Task, String)};
+     * {@link org.apache.wiki.workflow.WorkflowBuilder#buildApprovalWorkflow(Principal, String, Task, String, org.apache.wiki.workflow.Fact[], Task, String)};
      * they will not function correctly otherwise.
      *
      * @author Andrew Jaquith
@@ -914,7 +914,7 @@
      *  Fires a WikiPageEvent of the provided type and page name
      *  to all registered listeners.
      *
-     * @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
      */
@@ -1074,7 +1074,7 @@
     }
     
     /**
-     *  Listens for {@link com.ecyrd.jspwiki.event.WikiSecurityEvent#PROFILE_NAME_CHANGED}
+     *  Listens for {@link org.apache.wiki.event.WikiSecurityEvent#PROFILE_NAME_CHANGED}
      *  events. If a user profile's name changes, each page ACL is inspected. If an entry contains
      *  a name that has changed, it is replaced with the new one. No events are emitted
      *  as a consequence of this method, because the page contents are still the same; it is

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.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.content;
+package org.apache.wiki.content;
 
 import java.util.Collection;
 import java.util.Set;
@@ -26,18 +26,18 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-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.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+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.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
 
-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 page renaming functionality.  Note that there used to be

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

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/AttachmentDavProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/AttachmentDavProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/AttachmentDavProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/AttachmentDavProvider.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.dav;
+package org.apache.wiki.dav;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 
-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.dav.items.AttachmentItem;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.dav.items.DirectoryItem;
+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.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.dav.items.AttachmentItem;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.DirectoryItem;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 public class AttachmentDavProvider implements DavProvider
 {

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

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

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavProvider.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavProvider.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavProvider.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.dav;
+package org.apache.wiki.dav;
 
-import com.ecyrd.jspwiki.dav.items.DavItem;
+import org.apache.wiki.dav.items.DavItem;
 
 public interface DavProvider
 {

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavUtil.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavUtil.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavUtil.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavUtil.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavUtil.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavUtil.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavUtil.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.dav;
+package org.apache.wiki.dav;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -29,9 +29,9 @@
 import org.apache.ecs.XhtmlDocument;
 import org.apache.ecs.xhtml.li;
 import org.apache.ecs.xhtml.ul;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.WikiPage;
 
-import com.ecyrd.jspwiki.WikiContext;
 
 /**
  *

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/HTMLPagesDavProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/HTMLPagesDavProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/HTMLPagesDavProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/HTMLPagesDavProvider.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.dav;
+package org.apache.wiki.dav;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-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.dav.items.DavItem;
+import org.apache.wiki.dav.items.DirectoryItem;
+import org.apache.wiki.dav.items.HTMLPageDavItem;
+import org.apache.wiki.providers.ProviderException;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.DirectoryItem;
-import com.ecyrd.jspwiki.dav.items.HTMLPageDavItem;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 public class HTMLPagesDavProvider extends RawPagesDavProvider
 {

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/RawPagesDavProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/RawPagesDavProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/RawPagesDavProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/RawPagesDavProvider.java Sun Feb  1 18:04:05 2009
@@ -18,24 +18,24 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package com.ecyrd.jspwiki.dav;
+package org.apache.wiki.dav;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 
-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.dav.items.DavItem;
+import org.apache.wiki.dav.items.DirectoryItem;
+import org.apache.wiki.dav.items.PageDavItem;
+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.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.DirectoryItem;
-import com.ecyrd.jspwiki.dav.items.PageDavItem;
-import com.ecyrd.jspwiki.providers.ProviderException;
 import com.opensymphony.oscache.base.Cache;
 import com.opensymphony.oscache.base.NeedsRefreshException;
 

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

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavProvider.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavProvider.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavProvider.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.dav;
+package org.apache.wiki.dav;
 
 
-import com.ecyrd.jspwiki.WikiEngine;
+import org.apache.wiki.WikiEngine;
 
 public abstract class WikiDavProvider implements DavProvider
 {

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavServlet.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavServlet.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavServlet.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavServlet.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavServlet.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavServlet.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavServlet.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.dav;
+package org.apache.wiki.dav;
 
 import java.io.IOException;
 
@@ -28,13 +28,13 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.time.StopWatch;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.dav.methods.DavMethod;
+import org.apache.wiki.dav.methods.GetMethod;
+import org.apache.wiki.dav.methods.PropFindMethod;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
 
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.dav.methods.DavMethod;
-import com.ecyrd.jspwiki.dav.methods.GetMethod;
-import com.ecyrd.jspwiki.dav.methods.PropFindMethod;
 
 /**
  *

Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiRootProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiRootProvider.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiRootProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiRootProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiRootProvider.java&r1=739575&r2=739802&rev=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiRootProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiRootProvider.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.dav;
+package org.apache.wiki.dav;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.dav.items.TopLevelDavItem;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.dav.items.TopLevelDavItem;
+
 
 public class WikiRootProvider extends WikiDavProvider
 {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentDirectoryItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentDirectoryItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentDirectoryItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentDirectoryItem.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.dav.items;
+package org.apache.wiki.dav.items;
 
 import java.util.Collection;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+
 
 public class AttachmentDirectoryItem extends DirectoryItem
 {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentItem.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.dav.items;
+package org.apache.wiki.dav.items;
 
 import java.util.Collection;
 
 import javax.servlet.ServletContext;
 
+import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.dav.AttachmentDavProvider;
+import org.apache.wiki.dav.DavPath;
 import org.jdom.Element;
 
-import com.ecyrd.jspwiki.attachment.Attachment;
-import com.ecyrd.jspwiki.dav.AttachmentDavProvider;
-import com.ecyrd.jspwiki.dav.DavPath;
 
 /**
  * Represents a DAV attachment.
@@ -53,7 +53,7 @@
     /**
      * Returns a collection of properties for this attachment.
      * @return the attachment properties
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getPropertySet()
+     * @see org.apache.wiki.dav.items.DavItem#getPropertySet()
      */
     public Collection getPropertySet()
     {
@@ -92,7 +92,7 @@
     /**
      * Returns the length of the attachment.
      * @return the length
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getLength()
+     * @see org.apache.wiki.dav.items.DavItem#getLength()
      */
     public long getLength()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DavItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DavItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DavItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DavItem.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.dav.items;
+package org.apache.wiki.dav.items;
 
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+
 
 /**
  *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DirectoryItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DirectoryItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DirectoryItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DirectoryItem.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.dav.items;
+package org.apache.wiki.dav.items;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -26,11 +26,11 @@
 import java.util.Date;
 
 import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
 
 /**
  *
@@ -88,7 +88,7 @@
     }
     
     /* (non-Javadoc)
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getInputStream()
+     * @see org.apache.wiki.dav.items.DavItem#getInputStream()
      */
     public InputStream getInputStream()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/HTMLPageDavItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/HTMLPageDavItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/HTMLPageDavItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/HTMLPageDavItem.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.dav.items;
+package org.apache.wiki.dav.items;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;
 
-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.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+import org.apache.wiki.dav.WikiDavProvider;
+import org.apache.wiki.parser.MarkupParser;
 import org.jdom.Element;
 
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
-import com.ecyrd.jspwiki.dav.WikiDavProvider;
-import com.ecyrd.jspwiki.parser.MarkupParser;
 
 /**
  * Represents a DAV HTML page item.
@@ -55,7 +55,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getHref()
+     * @see org.apache.wiki.dav.items.DavItem#getHref()
      */
     public String getHref()
     {
@@ -65,7 +65,7 @@
     /**
      * Returns the content type for the item. Always returns
      * <code>text/html; charset=UTF-8</code>.
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getContentType()
+     * @see org.apache.wiki.dav.items.DavItem#getContentType()
      */
     public String getContentType()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/PageDavItem.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/PageDavItem.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/PageDavItem.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/PageDavItem.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.dav.items;
+package org.apache.wiki.dav.items;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -27,13 +27,13 @@
 import java.util.Collection;
 
 import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.jspwiki.api.WikiPage;
+import org.apache.wiki.api.WikiPage;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+import org.apache.wiki.dav.WikiDavProvider;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
-import com.ecyrd.jspwiki.dav.WikiDavProvider;
 
 /**
  *
@@ -72,7 +72,7 @@
     }
     
     /* (non-Javadoc)
-     * @see com.ecyrd.jspwiki.dav.DavItem#getPropertySet(int)
+     * @see org.apache.wiki.dav.DavItem#getPropertySet(int)
      */
     public Collection getPropertySet()
     {
@@ -90,7 +90,7 @@
     }
 
     /* (non-Javadoc)
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getContentType()
+     * @see org.apache.wiki.dav.items.DavItem#getContentType()
      */
     public String getContentType()
     {
@@ -98,7 +98,7 @@
     }
 
     /* (non-Javadoc)
-     * @see com.ecyrd.jspwiki.dav.items.DavItem#getInputStream()
+     * @see org.apache.wiki.dav.items.DavItem#getInputStream()
      */
     public InputStream getInputStream()
     {

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

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/DavMethod.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/DavMethod.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/DavMethod.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/DavMethod.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.dav.methods;
+package org.apache.wiki.dav.methods;
 
 import java.io.IOException;
 
@@ -26,8 +26,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+
 
 /**
  *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/GetMethod.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/GetMethod.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/GetMethod.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/GetMethod.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.dav.methods;
+package org.apache.wiki.dav.methods;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,10 +26,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.util.FileUtil;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.util.FileUtil;
+
 
 /**
  *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropFindMethod.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropFindMethod.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropFindMethod.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropFindMethod.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.dav.methods;
+package org.apache.wiki.dav.methods;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -30,8 +30,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.dav.DavContext;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+import org.apache.wiki.dav.WebdavServlet;
+import org.apache.wiki.dav.items.DavItem;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.providers.ProviderException;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -41,12 +47,6 @@
 import org.jdom.output.XMLOutputter;
 import org.jdom.xpath.XPath;
 
-import com.ecyrd.jspwiki.dav.DavContext;
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
-import com.ecyrd.jspwiki.dav.WebdavServlet;
-import com.ecyrd.jspwiki.dav.items.DavItem;
-import com.ecyrd.jspwiki.providers.ProviderException;
 
 /**
  *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropPatchMethod.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropPatchMethod.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropPatchMethod.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropPatchMethod.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.dav.methods;
+package org.apache.wiki.dav.methods;
 
 import java.io.IOException;
 
@@ -26,8 +26,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ecyrd.jspwiki.dav.DavPath;
-import com.ecyrd.jspwiki.dav.DavProvider;
+import org.apache.wiki.dav.DavPath;
+import org.apache.wiki.dav.DavProvider;
+
 
 /**
  *

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ContextualDiffProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ContextualDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ContextualDiffProvider.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.  
 */
 
-package com.ecyrd.jspwiki.diff;
+package org.apache.wiki.diff;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,13 +29,13 @@
 
 import org.apache.commons.jrcs.diff.*;
 import org.apache.commons.jrcs.diff.myers.MyersDiff;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.util.TextUtil;
-
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
+import org.apache.wiki.NoRequiredPropertyException;
+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.util.TextUtil;
+
 
 /**
  * A seriously better diff provider, which highlights changes word-by-word using
@@ -98,7 +98,7 @@
     {}
 
     /**
-     * @see com.ecyrd.jspwiki.WikiProvider#getProviderInfo()
+     * @see org.apache.wiki.WikiProvider#getProviderInfo()
      * 
      * {@inheritDoc}
      */
@@ -108,7 +108,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.WikiProvider#initialize(com.ecyrd.jspwiki.WikiEngine,
+     * @see org.apache.wiki.WikiProvider#initialize(org.apache.wiki.WikiEngine,
      *      java.util.Properties)
      *      
      * {@inheritDoc}
@@ -135,7 +135,7 @@
     /**
      * Do a colored diff of the two regions. This. is. serious. fun. ;-)
      *
-     * @see com.ecyrd.jspwiki.diff.DiffProvider#makeDiffHtml(WikiContext, String, String)
+     * @see org.apache.wiki.diff.DiffProvider#makeDiffHtml(WikiContext, String, String)
      * 
      * {@inheritDoc}
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DiffProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DiffProvider.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.diff;
+package org.apache.wiki.diff;
 
 import java.io.IOException;
 import java.util.Properties;
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiProvider;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiProvider;
+
 
 /**
  *  Provides an SPI for creating a diff between two page versions.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DifferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DifferenceManager.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DifferenceManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DifferenceManager.java Sun Feb  1 18:04:05 2009
@@ -19,18 +19,19 @@
     under the License.  
 */
 
-package com.ecyrd.jspwiki.diff;
+package org.apache.wiki.diff;
 
 import java.io.IOException;
 import java.util.Properties;
 
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.wiki.NoRequiredPropertyException;
+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.util.ClassUtil;
+
 
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.util.ClassUtil;
 
 
 
@@ -71,7 +72,7 @@
 
         try
         {
-            Class providerClass = ClassUtil.findClass( "com.ecyrd.jspwiki.diff", providerClassName );
+            Class providerClass = ClassUtil.findClass( "org.apache.wiki.diff", providerClassName );
             m_provider = (DiffProvider)providerClass.newInstance();
         }
         catch( ClassNotFoundException e )

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ExternalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ExternalDiffProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ExternalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ExternalDiffProvider.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.  
 */
 
-package com.ecyrd.jspwiki.diff;
+package org.apache.wiki.diff;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -27,12 +27,13 @@
 import java.io.StringReader;
 import java.util.Properties;
 
-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 org.apache.wiki.*;
+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.*;
 
 /**
  * This DiffProvider allows external command line tools to be used to generate
@@ -73,7 +74,7 @@
     }
 
     /**
-     * @see com.ecyrd.jspwiki.WikiProvider#getProviderInfo()
+     * @see org.apache.wiki.WikiProvider#getProviderInfo()
      * {@inheritDoc}
      */
     public String getProviderInfo()
@@ -83,7 +84,7 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.WikiProvider#initialize(com.ecyrd.jspwiki.WikiEngine, java.util.Properties)
+     * @see org.apache.wiki.WikiProvider#initialize(org.apache.wiki.WikiEngine, java.util.Properties)
      */
     public void initialize( WikiEngine engine, Properties properties )
         throws NoRequiredPropertyException, IOException

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/TraditionalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=739802&r1=739575&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/TraditionalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/TraditionalDiffProvider.java Sun Feb  1 18:04:05 2009
@@ -19,7 +19,7 @@
     under the License.  
 */
 
-package com.ecyrd.jspwiki.diff;
+package org.apache.wiki.diff;
 
 import java.io.IOException;
 import java.text.ChoiceFormat;
@@ -31,14 +31,14 @@
 
 import org.apache.commons.jrcs.diff.*;
 import org.apache.commons.jrcs.diff.myers.MyersDiff;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.util.TextUtil;
-
-import com.ecyrd.jspwiki.NoRequiredPropertyException;
-import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.i18n.InternationalizationManager;
+import org.apache.wiki.NoRequiredPropertyException;
+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.util.TextUtil;
+
 
 
 /**
@@ -68,7 +68,7 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.WikiProvider#getProviderInfo()
+     * @see org.apache.wiki.WikiProvider#getProviderInfo()
      */
     public String getProviderInfo()
     {
@@ -77,7 +77,7 @@
 
     /**
      * {@inheritDoc}
-     * @see com.ecyrd.jspwiki.WikiProvider#initialize(com.ecyrd.jspwiki.WikiEngine, java.util.Properties)
+     * @see org.apache.wiki.WikiProvider#initialize(org.apache.wiki.WikiEngine, java.util.Properties)
      */
     public void initialize(WikiEngine engine, Properties properties)
         throws NoRequiredPropertyException, IOException



Mime
View raw message