You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/04/13 19:03:59 UTC
svn commit: r764530 - in /incubator/jspwiki/trunk/src/java/org/apache/wiki:
auth/AuthenticationManager.java auth/Authorizer.java workflow/Workflow.java
Author: metskem
Date: Mon Apr 13 17:03:58 2009
New Revision: 764530
URL: http://svn.apache.org/viewvc?rev=764530&view=rev
Log:
replaced some com.ecyrd.jspwiki => org.apache.wiki, and javadoc warnings
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/Authorizer.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java?rev=764530&r1=764529&r2=764530&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java Mon Apr 13 17:03:58 2009
@@ -359,7 +359,7 @@
* combination using JSPWiki's custom authentication mode, using the system default Locale.
* The operation is otherwise identical to {@link #login(WikiSession, HttpServletRequest, String, String)}.
* Also, the user's HTTP request is not made available to LoginModules via the
- * {@link com.ecyrd.jspwiki.auth.login.HttpRequestCallback}.
+ * {@link org.apache.wiki.auth.login.HttpRequestCallback}.
* @param session the current wiki session; may not be <code>null</code>.
* @param username The user name
* @param password the password
@@ -771,10 +771,10 @@
/**
* After successful login, this method is called to inject authorized role Principals into the WikiSession.
* To determine which roles should be injected, the configured Authorizer
- * is queried for the roles it knows about by calling {@link com.ecyrd.jspwiki.auth.Authorizer#getRoles()}.
- * Then, each role returned by the authorizer is tested by calling {@link com.ecyrd.jspwiki.auth.Authorizer#isUserInRole(WikiSession, Principal)}.
+ * is queried for the roles it knows about by calling {@link org.apache.wiki.auth.Authorizer#getRoles()}.
+ * Then, each role returned by the authorizer is tested by calling {@link org.apache.wiki.auth.Authorizer#isUserInRole(WikiSession, Principal)}.
* If this check fails, and the Authorizer is of type WebAuthorizer, the role is checked again by calling
- * {@link com.ecyrd.jspwiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, Principal)}).
+ * {@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, Principal)}).
* Any roles that pass the test are injected into the Subject by firing appropriate authentication events.
* @param session the user's current WikiSession
* @param authorizer the WikiEngine's configured Authorizer
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/Authorizer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/Authorizer.java?rev=764530&r1=764529&r2=764530&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/Authorizer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/Authorizer.java Mon Apr 13 17:03:58 2009
@@ -30,17 +30,17 @@
/**
* Interface for service providers of authorization information. After a user
* successfully logs in, the
- * {@link com.ecyrd.jspwiki.auth.AuthenticationManager} consults the configured
+ * {@link org.apache.wiki.auth.AuthenticationManager} consults the configured
* Authorizer to determine which additional
- * {@link com.ecyrd.jspwiki.auth.authorize.Role} principals should be added to
+ * {@link org.apache.wiki.auth.authorize.Role} principals should be added to
* the user's WikiSession. To determine which roles should be injected, the
* Authorizer is queried for the roles it knows about by calling
- * {@link com.ecyrd.jspwiki.auth.Authorizer#getRoles()}. Then, each role
+ * {@link org.apache.wiki.auth.Authorizer#getRoles()}. Then, each role
* returned by the Authorizer is tested by calling
- * {@link com.ecyrd.jspwiki.auth.Authorizer#isUserInRole(WikiSession, Principal)}.
+ * {@link org.apache.wiki.auth.Authorizer#isUserInRole(WikiSession, Principal)}.
* If this check fails, and the Authorizer is of type WebAuthorizer,
* AuthenticationManager checks the role again by calling
- * {@link com.ecyrd.jspwiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, Principal)}).
+ * {@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, Principal)}).
* Any roles that pass the test are injected into the Subject by firing
* appropriate authentication events.
*
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java?rev=764530&r1=764529&r2=764530&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java Mon Apr 13 17:03:58 2009
@@ -129,7 +129,7 @@
* <ul>
* <li><strong>Named attributes</strong> are simple key-value pairs that
* Workflow participants can get or set. Keys are Strings; values can be any
- * Object. Named attributes are set with {@link #setAttribute(String, Object)}
+ * Object. Named attributes are set with {@link #setAttribute(String, Serializable)}
* and retrieved with {@link #getAttribute(String)}.</li>
* <li><strong>Message arguments</strong> are used in combination with
* JSPWiki's {@link org.apache.wiki.i18n.InternationalizationManager} to