svn commit: r1236813 - in /incubator/jspwiki/trunk/src/org/apache/wiki: ./ auth/ auth/acl/ auth/authorize/ auth/permissions/ auth/user/ diff/ render/ tags/ util/

[me...@apache.org]

Author: metskem
Date: Fri Jan 27 18:38:43 2012
New Revision: 1236813

URL: http://svn.apache.org/viewvc?rev=1236813&view=rev
Log:
a few more package-rename/javadoc changes

Modified:
    incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/WikiSession.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/DefaultAclManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/permissions/GroupPermission.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/AbstractUserDatabase.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/JDBCUserDatabase.java
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/XMLUserDatabase.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html
    incubator/jspwiki/trunk/src/org/apache/wiki/util/WikiBackgroundThread.java

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java Fri Jan 27 18:38:43 2012
@@ -723,7 +723,7 @@ public class PageManager extends ModuleM
     /**
      * 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 org.apache.wiki.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.
      *
      */

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiSession.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiSession.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiSession.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiSession.java Fri Jan 27 18:38:43 2012
@@ -436,7 +436,7 @@ public final class WikiSession implement
      * Listens for WikiEvents generated by source objects such as the
      * GroupManager. This method adds Principals to the private Subject managed
      * by the WikiSession.
-     * @see org.apache.wiki.event.WikiEventListener#actionPerformed(com.ecyrd.jspwiki.event.WikiEvent)
+     * @see org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent)
      */
     public final void actionPerformed( WikiEvent event )
     {

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java Fri Jan 27 18:38:43 2012
@@ -705,7 +705,7 @@ public final class UserManager
     /**
      * Inner class that handles the actual profile save action. Instances
      * of this class are assumed to have been added to an approval workflow via
-     * {@link org.apache.wiki.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.
      *
      */

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/DefaultAclManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/DefaultAclManager.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/DefaultAclManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/acl/DefaultAclManager.java Fri Jan 27 18:38:43 2012
@@ -69,7 +69,7 @@ public class DefaultAclManager implement
      * Initializes the AclManager with a supplied wiki engine and properties.
      * @param engine the wiki engine
      * @param props the initialization properties
-     * @see org.apache.wiki.auth.acl.AclManager#initialize(com.ecyrd.jspwiki.WikiEngine,
+     * @see org.apache.wiki.auth.acl.AclManager#initialize(org.apache.wiki.WikiEngine,
      *      java.util.Properties)
      */
     public void initialize( WikiEngine engine, Properties props )

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java Fri Jan 27 18:38:43 2012
@@ -179,7 +179,7 @@ public class WebContainerAuthorizer impl
      * @param role the role to check
      * @return <code>true</code> if the user is considered to be in the role,
      *         <code>false</code> otherwise
-     * @see org.apache.wiki.auth.Authorizer#isUserInRole(com.ecyrd.jspwiki.WikiSession, java.security.Principal)
+     * @see org.apache.wiki.auth.Authorizer#isUserInRole(org.apache.wiki.WikiSession, java.security.Principal)
      */
     public boolean isUserInRole( WikiSession session, Principal role )
     {

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/permissions/GroupPermission.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/permissions/GroupPermission.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/permissions/GroupPermission.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/permissions/GroupPermission.java Fri Jan 27 18:38:43 2012
@@ -455,7 +455,7 @@ public final class GroupPermission exten
      * </table>
      * <p>
      * Note that JSPWiki&#8217;s access control checks are made inside of
-     * {@link org.apache.wiki.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/org/apache/wiki/auth/user/AbstractUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/AbstractUserDatabase.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/AbstractUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/AbstractUserDatabase.java Fri Jan 27 18:38:43 2012
@@ -183,7 +183,7 @@ public abstract class AbstractUserDataba
 
     /**
      * {@inheritDoc}
-     * @see org.apache.wiki.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;
 
@@ -200,7 +200,7 @@ public abstract class AbstractUserDataba
 
     /**
      * {@inheritDoc}
-     * @see org.apache.wiki.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;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/JDBCUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/JDBCUserDatabase.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/JDBCUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/JDBCUserDatabase.java Fri Jan 27 18:38:43 2012
@@ -444,7 +444,7 @@ public class JDBCUserDatabase extends Ab
     }
 
     /**
-     * @see org.apache.wiki.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
@@ -660,7 +660,7 @@ public class JDBCUserDatabase extends Ab
     }
 
     /**
-     * @see org.apache.wiki.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/org/apache/wiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/XMLUserDatabase.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/XMLUserDatabase.java Fri Jan 27 18:38:43 2012
@@ -255,7 +255,7 @@ public class XMLUserDatabase extends Abs
      * 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 org.apache.wiki.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
      */

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java Fri Jan 27 18:38:43 2012
@@ -105,7 +105,7 @@ public class ContextualDiffProvider impl
     }
 
     /**
-     * @see org.apache.wiki.WikiProvider#initialize(com.ecyrd.jspwiki.WikiEngine,
+     * @see org.apache.wiki.WikiProvider#initialize(org.apache.wiki.WikiEngine,
      *      java.util.Properties)
      *      
      * {@inheritDoc}

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java Fri Jan 27 18:38:43 2012
@@ -80,7 +80,7 @@ public class ExternalDiffProvider implem
 
     /**
      * {@inheritDoc}
-     * @see org.apache.wiki.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/org/apache/wiki/diff/TraditionalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java Fri Jan 27 18:38:43 2012
@@ -74,7 +74,7 @@ public class TraditionalDiffProvider imp
 
     /**
      * {@inheritDoc}
-     * @see org.apache.wiki.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/org/apache/wiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/render/RenderingManager.java Fri Jan 27 18:38:43 2012
@@ -327,7 +327,7 @@ public class RenderingManager implements
     /**
      * Flushes the document cache in response to a POST_SAVE_BEGIN event.
      *
-     * @see org.apache.wiki.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/org/apache/wiki/tags/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/package.html Fri Jan 27 18:38:43 2012
@@ -31,7 +31,7 @@ is an exception, doEndTag() is never cal
 <p>The correct way to do reference cleaning is to implement the {@link javax.servlet.jsp.tagext.TryCatchFinally}
 interface, where the <code>doFinally()</code> method is called every time the tag
 has been finished with and prior to it being put back into the pool.  Most JSPWiki
-base tag classes {@link org.apache.wiki.tags.IteratorTag} and {@link com.ecyrd.jspwiki.tags.WikiTagBase}
+base tag classes {@link org.apache.wiki.tags.IteratorTag} and {@link org.apache.wiki.tags.WikiTagBase}
 implement the TryCatchFinally
 interface, which means that any class subclassed from them also allows has those methods.</p>
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/WikiBackgroundThread.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/WikiBackgroundThread.java?rev=1236813&r1=1236812&r2=1236813&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/WikiBackgroundThread.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/WikiBackgroundThread.java Fri Jan 27 18:38:43 2012
@@ -65,7 +65,7 @@ public abstract class WikiBackgroundThre
      * and, if detected, marks the thread for death.
      * 
      * @param event {@inheritDoc}
-     * @see org.apache.wiki.event.WikiEventListener#actionPerformed(com.ecyrd.jspwiki.event.WikiEvent)
+     * @see org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent)
      */
     public final void actionPerformed( WikiEvent event )
     {