You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2016/05/20 02:45:07 UTC
[2/2] archiva-redback-core git commit: fix javadoc error
fix javadoc error
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/f012c560
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/f012c560
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/f012c560
Branch: refs/heads/master
Commit: f012c5608a510acb9844ad4711d1588fe55593f0
Parents: 68e3f31
Author: olivier lamy <ol...@apache.org>
Authored: Fri May 20 12:44:56 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Fri May 20 12:44:56 2016 +1000
----------------------------------------------------------------------
.../AuthenticationDataSource.java | 2 +-
.../authentication/AuthenticationManager.java | 2 +-
.../authentication/AuthenticationResult.java | 2 +-
.../DefaultAuthenticationManager.java | 4 +--
.../ldap/LdapBindAuthenticator.java | 2 +-
.../memory/MemoryAuthenticator.java | 2 +-
.../memory/MemoryAuthenticatorTest.java | 2 +-
.../users/UserManagerAuthenticator.java | 4 +--
.../authorization/AuthorizationException.java | 2 +-
.../authorization/AuthorizationResult.java | 2 +-
.../redback/authorization/Authorizer.java | 4 +--
.../authorization/NotAuthorizedException.java | 2 +-
.../authorization/rbac/RbacAuthorizer.java | 2 +-
.../evaluator/DefaultPermissionEvaluator.java | 4 +--
.../PermissionEvaluationException.java | 2 +-
.../rbac/evaluator/PermissionEvaluator.java | 2 +-
.../common/jdo/test/StoreManagerDebug.java | 2 +-
.../connection/LdapConnectionConfiguration.java | 2 +-
.../common/ldap/role/LdapRoleMapper.java | 2 +-
.../ldap/role/LdapRoleMapperConfiguration.java | 2 +-
.../common/ldap/user/LdapUserMapper.java | 2 +-
.../management/JdoDataManagementTool.java | 4 +--
.../archiva/redback/integration/HttpUtils.java | 11 ++++----
.../security/GuestUserEnvironmentCheck.java | 2 +-
.../security/LockedAdminEnvironmentCheck.java | 2 +-
.../security/RequiredRolesEnvironmentCheck.java | 2 +-
.../digest/HttpDigestAuthenticationFilter.java | 4 +--
.../integration/model/EditRoleDetails.java | 4 +--
.../redback/integration/model/RoleDetails.java | 2 +-
.../integration/model/SimplePermission.java | 2 +-
.../redback/rest/api/model/StringList.java | 2 +-
.../archiva/redback/rest/api/model/User.java | 1 -
.../api/services/RoleManagementService.java | 21 ++++++--------
.../services/DefaultRoleManagementService.java | 2 +-
.../keystore/KeyStoreAuthenticator.java | 2 +-
.../redback/keys/AbstractKeyManager.java | 2 +-
.../archiva/redback/keys/AuthenticationKey.java | 2 +-
.../apache/archiva/redback/keys/KeyManager.java | 2 +-
.../redback/policy/AbstractCookieSettings.java | 2 +-
.../redback/policy/UserSecurityPolicy.java | 8 +++---
.../redback/rbac/AbstractRBACManager.java | 2 +-
.../apache/archiva/redback/rbac/Operation.java | 12 ++++----
.../apache/archiva/redback/rbac/Permission.java | 10 +++----
.../archiva/redback/rbac/RBACManager.java | 19 ++++++-------
.../apache/archiva/redback/rbac/Resource.java | 2 +-
.../org/apache/archiva/redback/rbac/Role.java | 10 +++----
.../archiva/redback/rbac/UserAssignment.java | 4 +--
.../redback/rbac/jdo/JdoRbacManager.java | 16 +++++------
.../redback/rbac/jdo/JdoRbacManagerTest.java | 2 +-
.../redback/rbac/ldap/LdapRbacManager.java | 29 ++++++++++----------
.../memory/MemoryAuthorizationDataSource.java | 2 +-
.../redback/rbac/memory/MemoryAuthorizer.java | 2 +-
.../redback/rbac/memory/MemoryRbacManager.java | 4 +--
.../redback/role/DefaultRoleManager.java | 4 +--
.../archiva/redback/role/RoleManager.java | 8 +++---
.../redback/role/RoleManagerException.java | 2 +-
.../processor/DefaultRoleModelProcessor.java | 2 +-
.../role/processor/RoleModelProcessor.java | 2 +-
.../template/DefaultRoleTemplateProcessor.java | 2 +-
.../role/template/RoleTemplateProcessor.java | 2 +-
.../RoleTemplateProcessorException.java | 2 +-
.../redback/role/util/RoleModelUtils.java | 2 +-
.../validator/DefaultRoleModelValidator.java | 4 +--
.../role/validator/RoleModelValidator.java | 2 +-
.../redback/role/AbstractRoleManagerTest.java | 2 +-
.../redback/role/JpoxRoleManagerTest.java | 2 +-
.../archiva/redback/role/RoleManagerTest.java | 2 +-
.../role/processor/RoleModelProcessorTest.java | 4 +--
.../template/RoleTemplateProcessorTest.java | 2 +-
.../role/validator/RoleModelValidatorTest.java | 2 +-
.../redback/system/DefaultSecuritySystem.java | 6 ++--
.../archiva/redback/system/SecuritySystem.java | 2 +-
.../system/TestAuthenticationManager.java | 2 +-
.../org/apache/archiva/redback/users/User.java | 28 +++++++++----------
.../archiva/redback/users/UserManager.java | 2 +-
.../configurable/ConfigurableUserManager.java | 2 +-
.../redback/users/ldap/LdapUserManager.java | 2 +-
.../users/ldap/ctl/DefaultLdapController.java | 2 +-
.../ldap/service/DefaultLdapCacheService.java | 2 +-
.../users/ldap/service/LdapCacheService.java | 2 +-
.../ldap/service/LdapCacheServiceTest.java | 2 +-
81 files changed, 165 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java
index d9d2dd8..87c39f8 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java
@@ -21,7 +21,7 @@ package org.apache.archiva.redback.authentication;
/**
* Just a tag to indicate that the implementing class is an AuthenticationDataSource.
- * <p/>
+ *
* todo which this back to an interface and use the mojo style expression evaluation to populate the particular required fields
*
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java
index b01d4ed..96413ac 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java
@@ -27,7 +27,7 @@ import java.util.List;
/**
* AuthenticationManager:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
public interface AuthenticationManager
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
index dd98d56..6c56f2f 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java
@@ -30,7 +30,7 @@ import java.util.Map;
/**
* AuthenticationResult: wrapper object for information that comes back from the authentication system
*
- * @author Jesse McConnell <je...@codehaus.org>
+ * @author Jesse McConnell
*/
public class AuthenticationResult
implements Serializable
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
index 63e4f0e..d5342bf 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
@@ -41,12 +41,12 @@ import java.util.Map;
/**
* DefaultAuthenticationManager: the goal of the authentication manager is to act as a conduit for
* authentication requests into different authentication schemes
- * <p/>
+ *
* For example, the default implementation can be configured with any number of authenticators and will
* sequentially try them for an authenticated result. This allows you to have the standard user/pass
* auth procedure followed by authentication based on a known key for 'remember me' type functionality.
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("authenticationManager")
public class DefaultAuthenticationManager
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
index ab13105..c79fb82 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
@@ -49,7 +49,7 @@ import javax.naming.directory.SearchResult;
/**
* LdapBindAuthenticator:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service( "authenticator#ldap" )
public class LdapBindAuthenticator
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
index 9731ad6..a5ed0f5 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
/**
* MemoryAuthenticator:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("authenticator#memory")
public class MemoryAuthenticator
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticatorTest.java
index a408949..7dd92f1 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticatorTest.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticatorTest.java
@@ -34,7 +34,7 @@ import javax.inject.Named;
/**
* MemoryAuthenticatorTest:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
----------------------------------------------------------------------
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
index 802d1a1..567b7b3 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
@@ -73,9 +73,9 @@ public class UserManagerAuthenticator
/**
* @throws org.apache.archiva.redback.policy.AccountLockedException
*
+ * @throws AuthenticationException
+ * @throws AccountLockedException
* @throws MustChangePasswordException
- * @throws MustChangePasswordException
- * @throws PolicyViolationException
* @see org.apache.archiva.redback.authentication.Authenticator#authenticate(org.apache.archiva.redback.authentication.AuthenticationDataSource)
*/
public AuthenticationResult authenticate( AuthenticationDataSource ds )
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java
index 49c5fb3..0434392 100644
--- a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java
+++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java
@@ -23,7 +23,7 @@ package org.apache.archiva.redback.authorization;
/**
* EntityAuthenticationException.java
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
public class AuthorizationException
extends Exception
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java
index 95608be..d2a10e3 100644
--- a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java
+++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.authorization;
/**
* AuthorizationResult: wrapper object for results from the authorization system
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
public class AuthorizationResult
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java
index 27ba7a4..118c433 100644
--- a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java
+++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java
@@ -26,8 +26,8 @@ import org.apache.archiva.redback.authorization.AuthorizationResult;
/**
* Authorizer:
*
- * @author: Jesse McConnell <je...@codehaus.org>
- * @todo chain of command rule processing
+ * @author: Jesse McConnell
+ * TODO chain of command rule processing
*/
public interface Authorizer
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java
index 20e6f25..bad6c3b 100644
--- a/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java
+++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.authorization;
/**
* EntityAuthenticationException.java
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
public class NotAuthorizedException
extends Exception
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
index e385d31..33dde90 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
@@ -46,7 +46,7 @@ import java.util.Map;
/**
* RbacAuthorizer:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*/
@Service("authorizer#rbac")
public class RbacAuthorizer
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
index 681ae42..b62efe7 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
@@ -31,11 +31,11 @@ import javax.inject.Named;
/**
* DefaultPermissionEvaluator:
- * <p/>
+ *
* Currently only one expression is available for evaluation, ${username} will be replaced with the username
* of the person making the authorization check
*
- * @author Jesse McConnell <je...@codehaus.org>
+ * @author Jesse McConnell
*/
@Service("permissionEvaluator")
public class DefaultPermissionEvaluator
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
index 15d4c83..7f66cdc 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.authorization.rbac.evaluator;
/**
* PermissionEvaluationException:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*
*/
public class PermissionEvaluationException
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
----------------------------------------------------------------------
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
index 8dc0014..5096cb2 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
@@ -25,7 +25,7 @@ import org.apache.archiva.redback.rbac.Permission;
/**
* PermissionEvaluator:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*
*/
public interface PermissionEvaluator
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/test/StoreManagerDebug.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/test/StoreManagerDebug.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/test/StoreManagerDebug.java
index 29cb7fd..ea57a51 100644
--- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/test/StoreManagerDebug.java
+++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/test/StoreManagerDebug.java
@@ -34,7 +34,7 @@ import org.jpox.store.rdbms.RDBMSManager;
/**
* A extension to JPOX store manager that allows counting the SQL queries
*
- * @author Carlos Sanchez <a href="mailto:carlos@apache.org">
+ * @author Carlos Sanchez
*/
public class StoreManagerDebug
extends RDBMSManager
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
index 3efdb2f..5eeb7d9 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
@@ -30,7 +30,7 @@ import java.util.TreeMap;
/**
* This class contains the configuration for a ldap connection.
- * <p/>
+ *
* Properties of a ldap connection:
* <ul>
* <li>Hostname - String, required.
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
index 8b66e82..75fa37e 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
@@ -46,7 +46,7 @@ public interface LdapRoleMapper
* read all ldap groups then map to corresponding role (if no mapping found group is ignored)
*
* @return all roles
- * @throws Exception
+ * @throws MappingException
*/
List<String> getAllRoles( DirContext context )
throws MappingException;
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
index 0e1c4a8..346db91 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
@@ -31,7 +31,7 @@ import java.util.Map;
public interface LdapRoleMapperConfiguration
{
/**
- * add mapping ldap group <-> redback roles
+ * add mapping ldap group to redback roles
*
* @param roles list of Role names
* @param ldapGroup ldap group
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
index ddfb329..cc0bcb8 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
@@ -35,7 +35,7 @@ import javax.naming.directory.BasicAttributes;
import java.util.Date;
/**
- * @author <a href="jesse@codehaus.org"> jesse
+ * @author Jesse
*/
@Service( "userMapper#ldap" )
public class LdapUserMapper
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
----------------------------------------------------------------------
diff --git a/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
index 2f8ca63..7b625b7 100644
--- a/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
+++ b/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
@@ -62,8 +62,8 @@ import org.springframework.stereotype.Service;
/**
* JDO implementation of the data management tool.
*
- * @todo do we really need JDO specifics here? Could optimize by going straight to JDOFactory
- * @todo check whether this current method logs everything unnecessarily.
+ * TODO do we really need JDO specifics here? Could optimize by going straight to JDOFactory
+ * TODO check whether this current method logs everything unnecessarily.
*/
@Service("dataManagementTool#jdo")
public class JdoDataManagementTool
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
index 5daf1d0..b50b497 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
@@ -33,17 +33,16 @@ public class HttpUtils
{
/**
* Convert typical complex header into properties.
- * <p/>
- * <p/>
+ *
+ *
* Example:
- * </p>
- * <p/>
+ *
* <code>
* realm="Somewhere Over The Rainbow", domain="kansas.co.us", nonce="65743ABCF"
* </code>
- * <p/>
+ *
* <p>becomes</p>
- * <p/>
+ *
* <code>
* Map ( "realm", "Somewhere Over The Rainbox" )
* Map ( "domain", "kansas.co.us" )
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
index 1d0052a..9958dbf 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
@@ -39,7 +39,7 @@ import java.util.List;
/**
* RequiredRolesEnvironmentCheck:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("environmentCheck#guest-user-check")
public class GuestUserEnvironmentCheck
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
index 2ea2482..8d05e68 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
@@ -41,7 +41,7 @@ import java.util.List;
* LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked
* and unlocks them on startup.
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service( "environmentCheck#locked-admin-check" )
public class LockedAdminEnvironmentCheck
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
index e7a230b..bd52093 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
* required roles of the redback-xwork-integration artifact exist to be
* assigned.
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*
*/
@Service("environmentCheck#required-roles")
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
index 986f649..c0671fd 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
@@ -35,9 +35,9 @@ import java.io.IOException;
/**
* HttpDigestAuthenticationFilter.
- * <p/>
+ *
* Uses RFC 2617 and RFC 2069 to perform Digest authentication against the incoming client.
- * <p/>
+ *
* <ul>
* <li><a href="http://www.faqs.org/rfcs/rfc2617.html">RFC 2617</a> - HTTP Authentication: Basic and Digest Access Authentication</li>
* <li><a href="http://www.faqs.org/rfcs/rfc2069.html">RFC 2069</a> - An Extension to HTTP : Digest Access Authentication</li>
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
index 0d87cba..1d68ab9 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
@@ -24,10 +24,10 @@ import org.apache.archiva.redback.rbac.Role;
/**
* EditRoleDetails - Existing user Role Details.
- * <p/>
+ *
* This is a placeholder for information passed back
* and forth between the Action and the Client.
- * <p/>
+ *
* We intentionally do not hook up the actual object to prevent
* creative injection of fields and values by the untrusted client.
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
index 88e13fe..2d3105d 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
@@ -25,7 +25,7 @@ import java.util.List;
/**
* RoleDetails - this is a placeholder for information passed back
* and forth between the Action and the Client.
- * <p/>
+ *
* We intentionally do not hook up the actual object to prevent
* creative injection of fields and values by the untrusted client.
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
index d7a0820..672e27c 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.integration.model;
/**
* SimplePermission - this is a placeholder for information passed back
* and forth between the Action and the Client.
- * <p/>
+ *
* We intentionally do not hook up the actual object to prevent
* creative injection of fields and values by the untrusted client.
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java
index 97dba5b..d93ca94 100644
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/StringList.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * jaxrs fail to return List<String> so use this contains for rest services returning that
+ * jaxrs fail to return List {@link String} so use this contains for rest services returning that
*
* @author Olivier Lamy
* @since 2.1
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
index 58c5b43..1b6d50c 100644
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
@@ -77,7 +77,6 @@ public class User
/**
* as we can user multiple userManagers implementation we must track from which one this one comes.
* @since 2.1
- * @return userManager id
*/
private String userManagerId;
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
index e80022a..2b62849 100644
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
@@ -52,12 +52,11 @@ public interface RoleManagementService
/**
* removes a role corresponding to the role Id that was manufactured with the given resource
- * <p/>
+ *
* it also removes any user assignments for that role
*
* @param templateId
* @param resource
- * @throws Exception
*/
@Path( "removeTemplatedRole" )
@GET
@@ -71,13 +70,12 @@ public interface RoleManagementService
/**
* allows for a role coming from a template to be renamed effectively swapping out the bits of it that
* were labeled with the oldResource with the newResource
- * <p/>
+ *
* it also manages any user assignments for that role
*
* @param templateId
* @param oldResource
* @param newResource
- * @throws Exception
*/
@Path( "updateRole" )
@GET
@@ -93,7 +91,6 @@ public interface RoleManagementService
*
* @param roleId
* @param principal
- * @throws Exception
*/
@Path( "assignRole" )
@GET
@@ -107,7 +104,7 @@ public interface RoleManagementService
*
* @param roleName
* @param principal
- * @throws Exception
+ * @throws RedbackServiceException
*/
@Path( "assignRoleByName" )
@GET
@@ -118,7 +115,7 @@ public interface RoleManagementService
/**
* Assigns the templated role indicated by the templateId
- * <p/>
+ *
* fails if the templated role has not been created
*
* @param templateId
@@ -139,7 +136,7 @@ public interface RoleManagementService
*
* @param roleId
* @param principal
- * @throws Exception
+ * @throws RedbackServiceException
*/
@Path( "unassignRole" )
@GET
@@ -153,7 +150,7 @@ public interface RoleManagementService
*
* @param roleName
* @param principal
- * @throws Exception
+ * @throws RedbackServiceException
*/
@Path( "unassignRoleByName" )
@GET
@@ -167,7 +164,7 @@ public interface RoleManagementService
*
* @param roleId
* @return
- * @throws Exception
+ * @throws RedbackServiceException
*/
@Path( "roleExists" )
@GET
@@ -182,7 +179,7 @@ public interface RoleManagementService
* @param templateId
* @param resource
* @return
- * @throws Exception
+ * @throws RedbackServiceException
*/
@Path( "templatedRoleExists" )
@GET
@@ -198,7 +195,7 @@ public interface RoleManagementService
*
* @param templateId the templated role
* @param resource the resource to verify
- * @throws Exception
+ * @throws RedbackServiceException
*/
@Path( "verifyTemplatedRole" )
@GET
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
index db845e3..ee3fbb0 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
@@ -873,7 +873,7 @@ public class DefaultRoleManagementService
*
* @param roleList
* @return
- * @throws org.apache.archiva.redback.rbac.RbacManagerException
+ * @throws RedbackServiceException
*
*/
protected List<org.apache.archiva.redback.rbac.Role> filterRolesForCurrentUserAccess(
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
----------------------------------------------------------------------
diff --git a/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java b/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
index 84ed964..51a9d31 100644
--- a/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
+++ b/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
@@ -44,7 +44,7 @@ import javax.annotation.Resource;
/**
* KeyStoreAuthenticator:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("authenticator#keystore")
public class KeyStoreAuthenticator
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
----------------------------------------------------------------------
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
index d1619c4..b7fa243 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AbstractKeyManager.java
@@ -102,7 +102,7 @@ public abstract class AbstractKeyManager
/**
* Tests the key to see if it is expired or not.
*
- * If the key is expired, a call to {@link #removeExpiredKey(AuthenticationKey)} is issued,
+ * If the key is expired, a call to {@link #deleteKey(AuthenticationKey)} is issued,
* and a {@link KeyNotFoundException} is thrown.
*
* @param authkey the key to test.
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
----------------------------------------------------------------------
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
index c0f49ca..241cba0 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
@@ -41,7 +41,7 @@ public interface AuthenticationKey
/**
* A String representation of what the purpose of existence is for this key.
- * <p/>
+ *
* Examples: "selfservice password reset", "inter system communications", "remember me"
*
* @return
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
----------------------------------------------------------------------
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
index 12df9c7..2ef731d 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManager.java
@@ -40,7 +40,7 @@ public interface KeyManager
/**
* Attempt to find a specific key in the store.
- * <p/>
+ *
* NOTE: Implementations of this interface should never return an expired key.
*
* @param key the key to find.
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
----------------------------------------------------------------------
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
index 9d3947c..da1e708 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
@@ -27,7 +27,7 @@ import org.apache.archiva.redback.configuration.UserConfiguration;
/**
* Base class for cookie settings. These will only differ by their configuration keys.
*
- * @todo not sure if having the domain and path in the general configuration is a good idea - this is probably something
+ * TODO not sure if having the domain and path in the general configuration is a good idea - this is probably something
* customised once for all cookies and applications. Should it be in a sharead configuration file, under a sharead key,
* or perhaps even configured at the application server level? (ie, in Naming).
*/
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java
----------------------------------------------------------------------
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java
index 3555d35..c42c4e1 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java
@@ -24,7 +24,7 @@ import java.util.List;
* User Security Policy Settings.
*
*
- * @todo roll password management into it's own object.
+ * TODO roll password management into it's own object.
*/
public interface UserSecurityPolicy
{
@@ -125,7 +125,7 @@ public interface UserSecurityPolicy
/**
* Enable the policies or not.
- * <p/>
+ *
* Useful in code when application startup or application init is being performed.
*
* @param enabled true if enabled.
@@ -167,11 +167,11 @@ public interface UserSecurityPolicy
/**
* Extension Point - Change the password of a user.
- * <p/>
+ *
* This method does not check if a user is allowed to change his/her password.
* Any kind of authorization checks for password change allowed on guest or
* anonymous users needs to occur before calling this method.
- * <p/>
+ *
* This method does not persist the newly changed user password.
* That will require a call to {@link org.apache.archiva.redback.users.UserManager#updateUser(User)}.
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
index 4678a7f..ce495da 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
@@ -500,7 +500,7 @@ public abstract class AbstractRBACManager
/**
* returns the active roles for a given principal
- * <p/>
+ *
* NOTE: roles that are returned might have have roles themselves, if
* you just want all permissions then use {@link #getAssignedPermissions(String principal)}
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
index 12988ce..4fa9da8 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
@@ -18,12 +18,12 @@ package org.apache.archiva.redback.rbac;
/**
* Operation
- * <p/>
+ *
* In RBAC the operation is an action or functionality that can be linked with a
* particular resource into an assignable Permission. Operations don't exist outside
* Permissions.
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
@@ -40,9 +40,9 @@ public interface Operation
/**
* name of the operation that is used in the act of authorization
- * <p/>
+ *
* 'modify-foo', 'change-password'
- * <p/>
+ *
* NOTE: This field is considered the Primary Key for this object.
*
* @return the name of the operation.
@@ -56,9 +56,9 @@ public interface Operation
/**
* Set name of the operation that is used in the act of authorization
- * <p/>
+ *
* 'modify-foo', 'change-password'
- * <p/>
+ *
* NOTE: This field is considered the Primary Key for this object.
*
* @param name
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
index 397a32f..f0bcf4b 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
@@ -18,13 +18,13 @@ package org.apache.archiva.redback.rbac;
/**
* Permission
- * <p/>
+ *
* A permission is the wrapper for an operation and a resource effectively saying
* that the operation is authorized for that resource.
- * <p/>
+ *
* P(Operation, Resource)
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
@@ -38,7 +38,7 @@ public interface Permission
/**
* Get the short name of the permission.
- * <p/>
+ *
* NOTE: This field is considered the Primary Key for this object.
*
* @return the short name for this permission.
@@ -52,7 +52,7 @@ public interface Permission
/**
* This is the resource associated with this permission.
- * <p/>
+ *
* Implementors must always supply a Resource.
*
* @return the Resource.
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
index 99afb8c..34cdcdf 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManager.java
@@ -27,9 +27,9 @@ import java.util.Set;
/**
* RBACManager
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @todo expand on javadoc
+ * TODO expand on javadoc
*/
public interface RBACManager
{
@@ -46,7 +46,7 @@ public interface RBACManager
/**
* Creates an implementation specific {@link Role}, or return an existing {@link Role}, depending
* on the provided <code>name</code> parameter.
- * <p/>
+ *
* Note: Be sure to use {@link #saveRole(Role)} in order to persist any changes to the Role.
*
* @param name the name.
@@ -128,7 +128,7 @@ public interface RBACManager
/**
* Creates an implementation specific {@link Permission}, or return an existing {@link Permission}, depending
* on the provided <code>name</code> parameter.
- * <p/>
+ *
* Note: Be sure to use {@link #savePermission(Permission)} in order to persist any changes to the Role.
*
* @param name the name.
@@ -141,7 +141,7 @@ public interface RBACManager
/**
* Creates an implementation specific {@link Permission} with specified {@link Operation},
* and {@link Resource} identifiers.
- * <p/>
+ *
* Note: Be sure to use {@link #savePermission(Permission)} in order to persist any changes to the Role.
*
* @param name the name.
@@ -158,7 +158,6 @@ public interface RBACManager
*
* @param name the name to test for.
* @return true if permission exists.
- * @throws RbacManagerException
*/
boolean permissionExists( String name );
@@ -186,7 +185,7 @@ public interface RBACManager
/**
* Creates an implementation specific {@link Operation}, or return an existing {@link Operation}, depending
* on the provided <code>name</code> parameter.
- * <p/>
+ *
* Note: Be sure to use {@link #saveOperation(Operation)} in order to persist any changes to the Role.
*
* @param name the name.
@@ -230,7 +229,7 @@ public interface RBACManager
/**
* Creates an implementation specific {@link Resource}, or return an existing {@link Resource}, depending
* on the provided <code>identifier</code> parameter.
- * <p/>
+ *
* Note: Be sure to use {@link #saveResource(Resource)} in order to persist any changes to the Role.
*
* @param identifier the identifier.
@@ -266,7 +265,7 @@ public interface RBACManager
/**
* Creates an implementation specific {@link UserAssignment}, or return an existing {@link UserAssignment},
* depending on the provided <code>identifier</code> parameter.
- * <p/>
+ *
* Note: Be sure to use {@link #saveUserAssignment(UserAssignment)} in order to persist any changes to the Role.
*
* @param principal the principal reference to the user.
@@ -325,7 +324,7 @@ public interface RBACManager
/**
* returns the active roles for a given principal
- * <p/>
+ *
* NOTE: roles that are returned might have have roles themselves, if
* you just want all permissions then use {@link #getAssignedPermissions(String principal)}
*
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
index 9518fda..3a3980a 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
@@ -31,7 +31,7 @@ package org.apache.archiva.redback.rbac;
* wildcards can be used on the resource definition to streamline the assigning of
* permissions for _large_ sets of things.
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
index 32c220a..d1f293e 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
@@ -20,16 +20,16 @@ import java.util.List;
/**
* Role
- * <p/>
+ *
* A role is assignable to a user and effectively grants that user all of the
* permissions that are present in that role. A role can also contain other roles
* which add the permissions in those roles to the available permissions for authorization.
- * <p/>
+ *
* A role can contain any number of permissions
* A role can contain any number of other roles
* A role can be assigned to any number of users
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
@@ -69,7 +69,7 @@ public interface Role
/**
* Get the name.
- * <p/>
+ *
* NOTE: This field is considered the Primary Key for this object.
*/
String getName();
@@ -114,7 +114,7 @@ public interface Role
/**
* Set Name
- * <p/>
+ *
* NOTE: This field is considered the Primary Key for this object.
*
* @param name
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
index ed0caf9..6d68c0a 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
@@ -24,10 +24,10 @@ import java.util.List;
*
* This is the many to many mapping object needed by persistence stores.
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
- * @todo expand on javadoc
+ * TODO expand on javadoc
*/
public interface UserAssignment
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
index 266c411..ac565a3 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
@@ -45,7 +45,7 @@ import java.util.List;
* JdoRbacManager:
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*
*/
@Service( "rbacManager#jdo" )
@@ -67,14 +67,13 @@ public class JdoRbacManager
/**
* Creates an implementation specific {@link Role}.
- * <p/>
+ *
* Note: this method does not add the {@link Role} to the underlying store.
* a call to {@link #saveRole(Role)} is required to track the role created with this
* method call.
*
* @param name the name.
* @return the new {@link Role} object with an empty (non-null) {@link Role#getChildRoleNames()} object.
- * @throws RbacManagerException
*/
public Role createRole( String name )
{
@@ -205,7 +204,7 @@ public class JdoRbacManager
/**
* Creates an implementation specific {@link Permission}.
- * <p/>
+ *
* Note: this method does not add the {@link Permission} to the underlying store.
* a call to {@link #savePermission(Permission)} is required to track the permission created
* with this method call.
@@ -237,7 +236,7 @@ public class JdoRbacManager
/**
* Creates an implementation specific {@link Permission} with specified {@link Operation},
* and {@link Resource} identifiers.
- * <p/>
+ *
* Note: this method does not add the Permission, Operation, or Resource to the underlying store.
* a call to {@link #savePermission(Permission)} is required to track the permission, operation,
* or resource created with this method call.
@@ -338,7 +337,7 @@ public class JdoRbacManager
/**
* Creates an implementation specific {@link Operation}.
- * <p/>
+ *
* Note: this method does not add the {@link Operation} to the underlying store.
* a call to {@link #saveOperation(Operation)} is required to track the operation created
* with this method call.
@@ -421,7 +420,7 @@ public class JdoRbacManager
/**
* Creates an implementation specific {@link Resource}.
- * <p/>
+ *
* Note: this method does not add the {@link Resource} to the underlying store.
* a call to {@link #saveResource(Resource)} is required to track the resource created
* with this method call.
@@ -507,14 +506,13 @@ public class JdoRbacManager
/**
* Creates an implementation specific {@link UserAssignment}.
- * <p/>
+ *
* Note: this method does not add the {@link UserAssignment} to the underlying store.
* a call to {@link #saveUserAssignment(UserAssignment)} is required to track the user
* assignment created with this method call.
*
* @param principal the principal reference to the user.
* @return the new UserAssignment with an empty (non-null) {@link UserAssignment#getRoleNames()} object.
- * @throws RbacManagerException
*/
public UserAssignment createUserAssignment( String principal )
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
index 9dd78e9..0572706 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
@@ -41,7 +41,7 @@ import java.util.Properties;
/**
* JdoRbacManagerTest:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*/
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
index dda7283..aefb829 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
@@ -472,22 +472,21 @@ public class LdapRbacManager
return this.rbacImpl.getParentRoles( role );
}
- /**
- public Collection<Role> getEffectivelyAssignedRoles( String username )
- throws RbacManagerException
- {
- // TODO here !!
- return this.rbacImpl.getEffectivelyAssignedRoles( username );
- }**/
+ //
+ // public Collection<Role> getEffectivelyAssignedRoles( String username )
+ // throws RbacManagerException
+ // {
+ // TODO here !!
+ // return this.rbacImpl.getEffectivelyAssignedRoles( username );
+ // }
+
+ //public Collection<Role> getEffectivelyUnassignedRoles( String username )
+ //throws RbacManagerException
+ //{
+ // TODO here !!
+ // return this.rbacImpl.getEffectivelyUnassignedRoles( username );
+ // }
- /**
- * public Collection<Role> getEffectivelyUnassignedRoles( String username )
- * throws RbacManagerException
- * {
- * // TODO here !!
- * return this.rbacImpl.getEffectivelyUnassignedRoles( username );
- * }*
- */
public Set<Role> getEffectiveRoles( Role role )
throws RbacManagerException
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizationDataSource.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizationDataSource.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizationDataSource.java
index 2fb03f7..60db572 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizationDataSource.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizationDataSource.java
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.users.User;
/**
* MemoryAuthorizationDataSource:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*
*/
public class MemoryAuthorizationDataSource
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
index 6e49243..a468556 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
@@ -26,7 +26,7 @@ import org.apache.archiva.redback.authorization.Authorizer;
import org.springframework.stereotype.Service;
/**
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("authorizer#memory")
public class MemoryAuthorizer
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
index 96f7354..9fb9e08 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
@@ -43,10 +43,10 @@ import java.util.Map;
/**
* MemoryRbacManager: a very quick and dirty implementation of a rbac store
- * <p/>
+ *
* WARNING: not for actual usage, its not sound - jesse
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
index 45f39de..8010f0c 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
@@ -57,7 +57,7 @@ import java.util.Map;
/**
* RoleProfileManager:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("roleManager")
public class DefaultRoleManager
@@ -228,7 +228,7 @@ public class DefaultRoleManager
/**
* update the role from templateId from oldResource to newResource
- * <p/>
+ *
* NOTE: this requires removal and creation of the role since the jdo store does not tolerate renaming
* because of the use of the name as an identifier
*/
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
index f1d3518..9a77eff 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManager.java
@@ -26,7 +26,7 @@ import java.net.URL;
/**
* RoleProfileManager:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*
*/
public interface RoleManager
@@ -58,7 +58,7 @@ public interface RoleManager
/**
* removes a role corresponding to the role Id that was manufactured with the given resource
- * <p/>
+ *
* it also removes any user assignments for that role
*
* @param templateId
@@ -72,7 +72,7 @@ public interface RoleManager
/**
* allows for a role coming from a template to be renamed effectively swapping out the bits of it that
* were labeled with the oldResource with the newResource
- * <p/>
+ *
* it also manages any user assignments for that role
*
* @param templateId
@@ -106,7 +106,7 @@ public interface RoleManager
/**
* Assigns the templated role indicated by the templateId
- * <p/>
+ *
* fails if the templated role has not been created
*
* @param templateId
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java
index f8e6d63..9939aaa 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/RoleManagerException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.role;
/**
* RoleProfileException:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*
*/
public class RoleManagerException
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
index bd07806..6a6a0a0 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
@@ -51,7 +51,7 @@ import java.util.Set;
/**
* DefaultRoleModelProcessor: inserts the components of the model that can be populated into the rbac manager
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service( "roleModelProcessor" )
public class DefaultRoleModelProcessor
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
index 7d0ff58..0505963 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/RoleModelProcessor.java
@@ -25,7 +25,7 @@ import org.apache.archiva.redback.role.model.RedbackRoleModel;
/**
* RoleModelValidator:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*
*/
public interface RoleModelProcessor
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
index 43857f1..1bb0f6f 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
@@ -48,7 +48,7 @@ import java.util.List;
/**
* DefaultRoleTemplateProcessor: inserts the components of a template into the rbac manager
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
@Service("roleTemplateProcessor")
public class DefaultRoleTemplateProcessor
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
index ec23887..7f8e07d 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessor.java
@@ -25,7 +25,7 @@ import org.apache.archiva.redback.role.model.RedbackRoleModel;
/**
* RoleModelValidator:
*
- * @author: Jesse McConnell <je...@codehaus.org>
+ * @author: Jesse McConnell
*/
public interface RoleTemplateProcessor
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/f012c560/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java
----------------------------------------------------------------------
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java
index f533a6c..83f4e19 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.role.template;
/**
* RoleProfileException:
*
- * @author Jesse McConnell <jm...@apache.org>
+ * @author Jesse McConnell
*
*/
public class RoleTemplateProcessorException