From 8d0946d1a0db9cddb737bf2d4017ce9f84601866 Mon Sep 17 00:00:00 2001
From: Olivier Lamy
Date: Thu, 5 Jul 2012 21:03:45 +0000
Subject: [PATCH] remove @version $Id$
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1357910 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/authentication/AuthenticationConstants.java | 2 +-
.../redback/authentication/AuthenticationDataSource.java | 2 +-
.../archiva/redback/authentication/AuthenticationException.java | 2 +-
.../archiva/redback/authentication/AuthenticationResult.java | 2 +-
.../apache/archiva/redback/authentication/Authenticator.java | 2 +-
.../authentication/PasswordBasedAuthenticationDataSource.java | 2 +-
.../authentication/TokenBasedAuthenticationDataSource.java | 2 +-
.../archiva/redback/authentication/open/OpenAuthenticator.java | 2 +-
.../archiva/redback/authorization/open/OpenAuthorizer.java | 2 +-
.../archiva/redback/common/jdo/UserConfigurableJdoFactory.java | 2 +-
.../org/apache/archiva/redback/common/ldap/LdapUserMapper.java | 2 +-
.../java/org/apache/archiva/redback/common/ldap/LdapUtils.java | 2 +-
.../apache/archiva/redback/common/ldap/MappingException.java | 2 +-
.../java/org/apache/archiva/redback/common/ldap/UserMapper.java | 2 +-
.../java/org/apache/archiva/redback/common/ldap/UserUpdate.java | 2 +-
.../ldap/connection/ConfigurableLdapConnectionFactory.java | 2 +-
.../archiva/redback/common/ldap/connection/LdapConnection.java | 2 +-
.../common/ldap/connection/LdapConnectionConfiguration.java | 2 +-
.../redback/common/ldap/connection/LdapConnectionFactory.java | 2 +-
.../archiva/redback/common/ldap/connection/LdapException.java | 2 +-
.../apache/archiva/redback/configuration/UserConfiguration.java | 2 +-
.../archiva/redback/configuration/UserConfigurationTest.java | 2 +-
.../java/org/apache/archiva/redback/integration/HttpUtils.java | 2 +-
.../apache/archiva/redback/integration/checks/ExpectedJsps.java | 2 +-
.../redback/integration/checks/xwork/XworkActionConfig.java | 2 +-
.../redback/integration/checks/xwork/XworkPackageConfig.java | 2 +-
.../archiva/redback/integration/eXc/CheckboxImageCell.java | 2 +-
.../org/apache/archiva/redback/integration/eXc/MailtoCell.java | 2 +-
.../redback/integration/eXc/ProcessUserRowsCallback.java | 2 +-
.../archiva/redback/integration/eXc/SecurityFilterCell.java | 2 +-
.../archiva/redback/integration/eXc/views/SecurityToolbar.java | 2 +-
.../archiva/redback/integration/eXc/views/SecurityView.java | 2 +-
.../archiva/redback/integration/filter/SpringServletFilter.java | 2 +-
.../filter/authentication/AbstractHttpAuthenticationFilter.java | 2 +-
.../filter/authentication/HttpAuthenticationException.java | 2 +-
.../integration/filter/authentication/HttpAuthenticator.java | 2 +-
.../filter/authentication/basic/HttpBasicAuthentication.java | 2 +-
.../authentication/basic/HttpBasicAuthenticationFilter.java | 2 +-
.../integration/filter/authentication/digest/Digest.java | 2 +-
.../redback/integration/filter/authentication/digest/Hex.java | 2 +-
.../filter/authentication/digest/HttpDigestAuthentication.java | 2 +-
.../authentication/digest/HttpDigestAuthenticationFilter.java | 2 +-
.../filter/authentication/digest/HttpDigestHeader.java | 2 +-
.../filter/authentication/digest/NonceExpirationException.java | 2 +-
.../filter/authorization/SimpleAuthorizationFilter.java | 2 +-
.../archiva/redback/integration/interceptor/SecureAction.java | 2 +-
.../apache/archiva/redback/integration/mail/MailGenerator.java | 2 +-
.../org/apache/archiva/redback/integration/mail/Mailer.java | 2 +-
.../org/apache/archiva/redback/integration/mail/MailerImpl.java | 2 +-
.../archiva/redback/integration/mail/VelocityMailGenerator.java | 2 +-
.../redback/integration/model/AdminEditUserCredentials.java | 2 +-
.../archiva/redback/integration/model/CreateRoleDetails.java | 2 +-
.../redback/integration/model/CreateUserCredentials.java | 2 +-
.../archiva/redback/integration/model/EditRoleDetails.java | 2 +-
.../archiva/redback/integration/model/EditUserCredentials.java | 2 +-
.../apache/archiva/redback/integration/model/RoleDetails.java | 2 +-
.../archiva/redback/integration/model/SimplePermission.java | 2 +-
.../archiva/redback/integration/model/UserCredentials.java | 2 +-
.../archiva/redback/integration/reports/CsvRolesMatrix.java | 2 +-
.../apache/archiva/redback/integration/reports/CsvUserList.java | 2 +-
.../org/apache/archiva/redback/integration/reports/Report.java | 2 +-
.../archiva/redback/integration/reports/ReportException.java | 2 +-
.../archiva/redback/integration/reports/ReportManager.java | 2 +-
.../redback/integration/taglib/jsp/ElseAuthorizedTag.java | 2 +-
.../redback/integration/taglib/jsp/IfAnyAuthorizedTag.java | 2 +-
.../archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java | 2 +-
.../archiva/redback/integration/taglib/jsp/IfConfiguredTag.java | 2 +-
.../integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java | 2 +-
.../integration/taglib/jsp/IsReadOnlyUserManagerTag.java | 2 +-
.../archiva/redback/integration/util/AutoLoginCookies.java | 2 +-
.../org/apache/archiva/redback/integration/util/DateUtils.java | 2 +-
.../archiva/redback/integration/util/ModelTemplateSorter.java | 2 +-
.../archiva/redback/integration/util/OperationSorter.java | 2 +-
.../archiva/redback/integration/util/PermissionSorter.java | 2 +-
.../apache/archiva/redback/integration/util/ResourceSorter.java | 2 +-
.../org/apache/archiva/redback/integration/util/RoleSorter.java | 2 +-
.../archiva/redback/integration/util/TemplatedRoleSorter.java | 2 +-
.../apache/archiva/redback/integration/util/UserComparator.java | 2 +-
.../org/apache/archiva/redback/integration/HttpUtilsTest.java | 2 +-
.../archiva/redback/integration/mail/MockJavaMailSender.java | 2 +-
.../archiva/redback/rest/services/mock/MockJavaMailSender.java | 2 +-
.../archiva/redback/struts2/action/AbstractSecurityAction.java | 2 +-
.../redback/struts2/action/AbstractUserCredentialsAction.java | 2 +-
.../apache/archiva/redback/struts2/action/AccountAction.java | 2 +-
.../org/apache/archiva/redback/struts2/action/LoginAction.java | 2 +-
.../org/apache/archiva/redback/struts2/action/LogoutAction.java | 2 +-
.../apache/archiva/redback/struts2/action/PasswordAction.java | 2 +-
.../archiva/redback/struts2/action/PasswordResetAction.java | 2 +-
.../apache/archiva/redback/struts2/action/RegisterAction.java | 2 +-
.../archiva/redback/struts2/action/SecurityRedirectAction.java | 2 +-
.../action/admin/AbstractAdminUserCredentialsAction.java | 2 +-
.../redback/struts2/action/admin/AddAdminUserAction.java | 2 +-
.../redback/struts2/action/admin/AdminConsoleAction.java | 2 +-
.../archiva/redback/struts2/action/admin/AssignmentsAction.java | 2 +-
.../archiva/redback/struts2/action/admin/EditRoleAction.java | 2 +-
.../archiva/redback/struts2/action/admin/OperationsAction.java | 2 +-
.../archiva/redback/struts2/action/admin/PermissionsAction.java | 2 +-
.../archiva/redback/struts2/action/admin/ReportAction.java | 2 +-
.../archiva/redback/struts2/action/admin/ResourcesAction.java | 2 +-
.../archiva/redback/struts2/action/admin/RoleCreateAction.java | 2 +-
.../archiva/redback/struts2/action/admin/RoleModelAction.java | 2 +-
.../archiva/redback/struts2/action/admin/RolesAction.java | 2 +-
.../archiva/redback/struts2/action/admin/SystemInfoAction.java | 2 +-
.../archiva/redback/struts2/action/admin/UserCreateAction.java | 2 +-
.../archiva/redback/struts2/action/admin/UserDeleteAction.java | 2 +-
.../archiva/redback/struts2/action/admin/UserEditAction.java | 2 +-
.../archiva/redback/struts2/action/admin/UserListAction.java | 2 +-
.../redback/struts2/checks/AbstractXworkConfigurationCheck.java | 2 +-
.../redback/struts2/checks/ExpectedXworkConfiguration.java | 2 +-
.../struts2/interceptor/EnvironmentCheckInterceptor.java | 2 +-
.../redback/struts2/interceptor/ForceAdminUserInterceptor.java | 2 +-
.../redback/struts2/interceptor/SecureActionInterceptor.java | 2 +-
.../archiva/redback/struts2/result/SecurityExternalResult.java | 2 +-
.../redback/struts2/action/admin/SystemInfoActionTest.java | 2 +-
.../redback/struts2/interceptor/CustomInterceptorTest.java | 1 -
.../archiva/redback/struts2/interceptor/MockComponentImpl.java | 1 -
.../org/apache/archiva/redback/keys/AbstractKeyManager.java | 2 +-
.../java/org/apache/archiva/redback/keys/AuthenticationKey.java | 2 +-
.../main/java/org/apache/archiva/redback/keys/KeyManager.java | 2 +-
.../org/apache/archiva/redback/keys/KeyManagerException.java | 2 +-
.../org/apache/archiva/redback/keys/KeyNotFoundException.java | 2 +-
.../apache/archiva/redback/keys/cached/CachedKeyManager.java | 2 +-
.../archiva/redback/keys/cached/CachedKeyManagerTest.java | 2 +-
.../java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java | 2 +-
.../org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java | 2 +-
.../archiva/redback/keys/memory/MemoryAuthenticationKey.java | 2 +-
.../apache/archiva/redback/keys/memory/MemoryKeyManager.java | 2 +-
.../archiva/redback/keys/memory/MemoryKeyManagerTest.java | 2 +-
.../org/apache/archiva/redback/keys/KeyManagerTestCase.java | 2 +-
.../apache/archiva/redback/policy/AccountLockedException.java | 2 +-
.../java/org/apache/archiva/redback/policy/CookieSettings.java | 2 +-
.../archiva/redback/policy/DefaultUserSecurityPolicy.java | 2 +-
.../archiva/redback/policy/DefaultUserValidationSettings.java | 2 +-
.../archiva/redback/policy/MustChangePasswordException.java | 2 +-
.../java/org/apache/archiva/redback/policy/PasswordEncoder.java | 2 +-
.../archiva/redback/policy/PasswordEncodingException.java | 2 +-
.../java/org/apache/archiva/redback/policy/PasswordRule.java | 2 +-
.../archiva/redback/policy/PasswordRuleViolationException.java | 2 +-
.../apache/archiva/redback/policy/PasswordRuleViolations.java | 2 +-
.../java/org/apache/archiva/redback/policy/PolicyContext.java | 2 +-
.../apache/archiva/redback/policy/PolicyViolationException.java | 2 +-
.../apache/archiva/redback/policy/RememberMeCookieSettings.java | 2 +-
.../org/apache/archiva/redback/policy/SignonCookieSettings.java | 2 +-
.../org/apache/archiva/redback/policy/UserSecurityPolicy.java | 2 +-
.../apache/archiva/redback/policy/UserValidationSettings.java | 2 +-
.../redback/policy/encoders/AbstractJAASPasswordEncoder.java | 2 +-
.../redback/policy/encoders/PlainTextPasswordEncoder.java | 2 +-
.../archiva/redback/policy/encoders/SHA1PasswordEncoder.java | 2 +-
.../archiva/redback/policy/encoders/SHA256PasswordEncoder.java | 2 +-
.../archiva/redback/policy/rules/AbstractPasswordRule.java | 2 +-
.../apache/archiva/redback/policy/rules/AlphaPasswordRule.java | 2 +-
.../redback/policy/rules/CharacterLengthPasswordRule.java | 2 +-
.../archiva/redback/policy/rules/MustHavePasswordRule.java | 2 +-
.../archiva/redback/policy/rules/NumericalPasswordRule.java | 2 +-
.../apache/archiva/redback/policy/rules/ReusePasswordRule.java | 2 +-
.../org/apache/archiva/redback/policy/PasswordEncoderTest.java | 2 +-
.../archiva/redback/authorization/rbac/RbacAuthorizer.java | 2 +-
.../rbac/evaluator/DefaultPermissionEvaluator.java | 2 +-
.../rbac/evaluator/PermissionEvaluationException.java | 2 +-
.../authorization/rbac/evaluator/PermissionEvaluator.java | 2 +-
.../org/apache/archiva/redback/rbac/AbstractRBACManager.java | 2 +-
.../main/java/org/apache/archiva/redback/rbac/AbstractRole.java | 2 +-
.../org/apache/archiva/redback/rbac/AbstractUserAssignment.java | 2 +-
.../main/java/org/apache/archiva/redback/rbac/Operation.java | 2 +-
.../main/java/org/apache/archiva/redback/rbac/Permission.java | 2 +-
.../main/java/org/apache/archiva/redback/rbac/RBACManager.java | 2 +-
.../org/apache/archiva/redback/rbac/RBACManagerListener.java | 2 +-
.../org/apache/archiva/redback/rbac/RBACObjectAssertions.java | 2 +-
.../org/apache/archiva/redback/rbac/RbacManagerException.java | 2 +-
.../apache/archiva/redback/rbac/RbacObjectInvalidException.java | 2 +-
.../archiva/redback/rbac/RbacObjectNotFoundException.java | 2 +-
.../org/apache/archiva/redback/rbac/RbacPermanentException.java | 2 +-
.../src/main/java/org/apache/archiva/redback/rbac/Resource.java | 2 +-
.../src/main/java/org/apache/archiva/redback/rbac/Role.java | 2 +-
.../java/org/apache/archiva/redback/rbac/UserAssignment.java | 2 +-
.../apache/archiva/redback/rbac/cached/CachedRbacManager.java | 2 +-
.../redback/rbac/cached/CachedRbacManagerPerformanceTest.java | 2 +-
.../org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java | 2 +-
.../main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java | 2 +-
.../org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java | 2 +-
.../redback/rbac/memory/MemoryAuthorizationDataSource.java | 2 +-
.../org/apache/archiva/redback/rbac/memory/MemoryOperation.java | 2 +-
.../apache/archiva/redback/rbac/memory/MemoryPermission.java | 2 +-
.../apache/archiva/redback/rbac/memory/MemoryRbacManager.java | 2 +-
.../org/apache/archiva/redback/rbac/memory/MemoryResource.java | 2 +-
.../java/org/apache/archiva/redback/rbac/memory/MemoryRole.java | 2 +-
.../archiva/redback/rbac/memory/MemoryUserAssignment.java | 2 +-
.../archiva/redback/rbac/memory/MemoryRbacManagerTest.java | 2 +-
.../org/apache/archiva/redback/role/RoleManagerException.java | 2 +-
.../redback/role/template/RoleTemplateProcessorException.java | 2 +-
.../archiva/redback/tests/AbstractRbacManagerTestCase.java | 2 +-
.../apache/archiva/redback/tests/RbacManagerEventTracker.java | 2 +-
.../apache/archiva/redback/system/SecuritySystemConstants.java | 2 +-
.../apache/archiva/redback/system/check/EnvironmentCheck.java | 2 +-
.../redback/authentication/users/UserManagerAuthenticator.java | 2 +-
.../org/apache/archiva/redback/users/AbstractUserManager.java | 2 +-
.../main/java/org/apache/archiva/redback/users/Messages.java | 2 +-
.../apache/archiva/redback/users/PermanentUserException.java | 2 +-
.../org/apache/archiva/redback/users/UserManagerException.java | 2 +-
.../org/apache/archiva/redback/users/UserManagerListener.java | 2 +-
.../apache/archiva/redback/users/cached/CachedUserManager.java | 2 +-
.../archiva/redback/users/cached/CachedUserManagerTest.java | 2 +-
.../org/apache/archiva/redback/users/jdo/JdoUserManager.java | 2 +-
.../java/org/apache/archiva/redback/users/jdo/Messages.java | 2 +-
.../apache/archiva/redback/users/jdo/JdoUserManagerTest.java | 2 +-
.../apache/archiva/redback/users/ldap/ctl/LdapController.java | 2 +-
.../apache/archiva/redback/users/ldap/LdapUserManagerTest.java | 2 +-
.../apache/archiva/redback/users/memory/MemoryUserManager.java | 2 +-
.../users/provider/test/AbstractUserManagerTestCase.java | 2 +-
.../redback/users/provider/test/UserManagerEventTracker.java | 2 +-
210 files changed, 208 insertions(+), 210 deletions(-)
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java
index 7379937c..35c9bfd7 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java
@@ -21,7 +21,7 @@
/**
* Contants class used for authentication
- * @version $Id$
+ *
*/
public class AuthenticationConstants
{
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 82a49a2f..746aa1df 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
@@ -24,7 +24,7 @@
*
* todo which this back to an interface and use the mojo style expression evaluation to populate the particular required fields
*
- * @version $Id$
+ *
* @see PasswordBasedAuthenticationDataSource
* @see TokenBasedAuthenticationDataSource
*/
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java
index a168e2d6..38fe3f9c 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java
@@ -22,7 +22,7 @@
* AuthenticationException.java
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class AuthenticationException
extends Exception
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 8e42842a..2fbcc808 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
@@ -26,7 +26,7 @@
* AuthenticationResult: wrapper object for information that comes back from the authentication system
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class AuthenticationResult
implements Serializable
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
index e1ebc0ab..54805bcf 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
@@ -26,7 +26,7 @@
* Authenticator:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public interface Authenticator
{
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java
index c42b7405..c156fd37 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java
@@ -28,7 +28,7 @@
* PasswordBasedAuthenticationDataSource: the username is considered the principal with this data source
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*
*/
@Service("authenticationDataSource#password")
diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java
index 3f25a263..7a8e4ef9 100644
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java
@@ -28,7 +28,7 @@
* TokenBasedAuthenticationDataSource
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "authenticationDataSource#token" )
@Scope( "prototype" )
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
index f5ff4745..b87c8f59 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
@@ -32,7 +32,7 @@
* All attempts result in access.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*
*/
@Service("authenticator#open")
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java b/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java
index fd1d5b4a..4d167c8a 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/apache/archiva/redback/authorization/open/OpenAuthorizer.java
@@ -26,7 +26,7 @@
* OpenAuthorizer - No checks for authorization, everything passes.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*
*/
@Service("authorizer#rbac")
diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
index 98d253f0..eeb1cf68 100644
--- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
+++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
@@ -37,7 +37,7 @@
* UserConfigurableJdoFactory
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "jdoFactory#users" )
public class UserConfigurableJdoFactory
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
index f75c284a..3add782a 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
@@ -33,7 +33,7 @@
/**
* @author jesse
- * @version $Id$
+ *
*/
@Service( "userMapper#ldap" )
public class LdapUserMapper
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
index 9c12c270..1131cee2 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
@@ -26,7 +26,7 @@
/**
*
- * @version $Id$
+ *
*/
public final class LdapUtils
{
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/MappingException.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/MappingException.java
index 1345a5e7..63aca30e 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/MappingException.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/MappingException.java
@@ -20,7 +20,7 @@
*/
/**
- * @version $Id$
+ *
*/
public class MappingException
extends Exception
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java
index 25146343..01c2f849 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java
@@ -24,7 +24,7 @@
import javax.naming.directory.Attributes;
/**
- * @version $Id$
+ *
*/
public interface UserMapper
{
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java
index 2249cdaf..48f4e9b9 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java
@@ -22,7 +22,7 @@
import javax.naming.directory.Attributes;
/**
- * @version $Id$
+ *
*/
public class UserUpdate
{
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
index e6beb6ed..2d6861f6 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
@@ -34,7 +34,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
@Service( "ldapConnectionFactory#configurable" )
public class ConfigurableLdapConnectionFactory
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
index c80bc47b..ce45e2e1 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
@@ -37,7 +37,7 @@
* The configuration for a connection will not change.
*
* @author trygvis
- * @version $Id$
+ *
*/
public class LdapConnection
{
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 64c298b4..52470c3a 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
@@ -44,7 +44,7 @@
* Note that both the bind dn and password must be set if any are set.
*
* @author trygvis
- * @version $Id$
+ *
*/
public class LdapConnectionConfiguration
{
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
index e7ca10ef..377a156a 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
@@ -27,7 +27,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
public interface LdapConnectionFactory
{
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapException.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapException.java
index 654f95aa..cbd4ef9d 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapException.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapException.java
@@ -23,7 +23,7 @@
/**
* @author trygvis
- * @version $Id$
+ *
*/
public class LdapException
extends NamingException
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
index 5e076dec..63e6fcbe 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
@@ -39,7 +39,7 @@
* ConfigurationFactory
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "userConfiguration" )
public class UserConfiguration
diff --git a/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java b/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java
index f79670d5..63aec745 100644
--- a/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java
+++ b/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java
@@ -34,7 +34,7 @@
* UserConfigurationTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
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 c5b52013..5f0bec32 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
@@ -27,7 +27,7 @@
* Collection of Utility methods useful in an Http environment.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
* @todo should move this to plexus-utils or plexus-utils-web
*/
public class HttpUtils
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
index 5c8fc95f..20349f24 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
@@ -28,7 +28,7 @@
* ExpectedJsps
* @FIXME the jsp list is not correct
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("environmentCheck#ExpectedJsps")
public class ExpectedJsps
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
index 9499a589..0efd4630 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
@@ -26,7 +26,7 @@
* XworkActionConfig
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class XworkActionConfig
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
index b49afc5a..cfdd34e1 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
@@ -27,7 +27,7 @@
* XworkPackageConfig
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class XworkPackageConfig
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
index 3530607c..65d01342 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
@@ -28,7 +28,7 @@
* CheckboxImageCell
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class CheckboxImageCell
extends AbstractCell
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
index b51966ba..ecb98276 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
@@ -28,7 +28,7 @@
* MailtoCell
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MailtoCell
extends AbstractCell
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
index eae448ae..5f5a4d6b 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
@@ -33,7 +33,7 @@
* ProcessUserRowsCallback - Efficient and safe sort callback for user manager provided user lists.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class ProcessUserRowsCallback
extends ProcessRowsCallback
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
index cb27063a..f6c65c37 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
@@ -31,7 +31,7 @@
* SecurityFilterCell
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class SecurityFilterCell
implements Cell
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
index ac95f8bc..94dde66c 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
@@ -34,7 +34,7 @@
* SecurityToolbar
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class SecurityToolbar
extends TwoColumnRowLayout
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
index 729866d1..6283be4e 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
@@ -27,7 +27,7 @@
* SecurityView
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class SecurityView
extends AbstractHtmlView
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
index 8c5a2c5c..f91bd6e5 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
@@ -30,7 +30,7 @@
* SpringServletFilter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class SpringServletFilter
implements Filter
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
index 4be9cc5a..2a4bea87 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
@@ -28,7 +28,7 @@
* AbstractHttpAuthenticationFilter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractHttpAuthenticationFilter
extends SpringServletFilter
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
index c087ef69..e03608a9 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
@@ -25,7 +25,7 @@
* HttpAuthenticationException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class HttpAuthenticationException
extends AuthenticationException
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
index 4e1b97f5..1747a799 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
@@ -43,7 +43,7 @@
* HttpAuthenticator
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class HttpAuthenticator
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
index 4fb4e8c2..e940c7c9 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
@@ -40,7 +40,7 @@
* HttpBasicAuthentication
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("httpAuthenticator#basic")
public class HttpBasicAuthentication
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
index 0bef4e5e..bbef6215 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
@@ -36,7 +36,7 @@
* HttpBasicAuthenticationFilter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class HttpBasicAuthenticationFilter
extends AbstractHttpAuthenticationFilter
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
index 750541a2..9b4b8c70 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
@@ -26,7 +26,7 @@
* Digest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
* @todo move to plexus-utils in future
*/
public class Digest
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
index 1d8c9b26..f38c6abf 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
@@ -23,7 +23,7 @@
* Hex
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
* @todo should probably move this to plexus-utils or plexus-security-common
*/
public class Hex
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
index 0bb1ac30..ef6632e9 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
@@ -44,7 +44,7 @@
* HttpDigestAuthentication methods for working with RFC 2617 HTTP Authentication.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("httpAuthenticator#digest")
public class HttpDigestAuthentication
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 69a7b351..986f6494 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
@@ -44,7 +44,7 @@
*
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class HttpDigestAuthenticationFilter
extends AbstractHttpAuthenticationFilter
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
index dc999bac..fc432ee6 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
@@ -35,7 +35,7 @@
* HttpDigestHeader
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "httpClientHeader" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
index c143c2e2..68532260 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
@@ -25,7 +25,7 @@
* NonceExpirationException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class NonceExpirationException
extends HttpAuthenticationException
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
index 7523d4f4..3f259a28 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
@@ -39,7 +39,7 @@
* SimpleAuthorizationFilter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class SimpleAuthorizationFilter
extends SpringServletFilter
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
index c6546cbb..b4fad5da 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
@@ -24,7 +24,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface SecureAction
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
index e7ae4344..b9b009e2 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
@@ -25,7 +25,7 @@
* Mail generator component.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public interface MailGenerator
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
index b4aa023c..b2599db4 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
@@ -25,7 +25,7 @@
/**
* @author Emmanuel Venisse
- * @version $Id$
+ *
*/
public interface Mailer
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
index 2ed4a4fd..efba805a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
@@ -48,7 +48,7 @@
* Mailer
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("mailer")
public class MailerImpl
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
index ab298b08..eb5ed2ca 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
@@ -40,7 +40,7 @@
* Mail generator component implementation using velocity.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
@Service( "mailGenerator#velocity" )
public class VelocityMailGenerator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
index 7b628406..6270ca17 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
@@ -25,7 +25,7 @@
* AdminEditUserCredentials
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class AdminEditUserCredentials
extends EditUserCredentials
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
index 5e7b0784..4c1fbcaa 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
@@ -23,7 +23,7 @@
* CreateRoleDetails
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class CreateRoleDetails
extends RoleDetails
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
index 54cef2bf..5c65600f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
@@ -23,7 +23,7 @@
* CreateUserCredentials
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class CreateUserCredentials
extends UserCredentials
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 fdcb8e56..0d87cbae 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
@@ -32,7 +32,7 @@
* creative injection of fields and values by the untrusted client.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class EditRoleDetails
extends RoleDetails
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
index 0986560f..8f71c80b 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
@@ -26,7 +26,7 @@
* EditUserCredentials
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class EditUserCredentials
extends UserCredentials
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 a2944f8a..88e13fe2 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
@@ -30,7 +30,7 @@
* creative injection of fields and values by the untrusted client.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class RoleDetails
{
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 bb055a14..d7a08208 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
@@ -27,7 +27,7 @@
* creative injection of fields and values by the untrusted client.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class SimplePermission
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
index b07edb3a..dcb4135f 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
@@ -29,7 +29,7 @@
* UserCredentials
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class UserCredentials
implements Serializable
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
index 7fa41cef..b73e98ed 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
@@ -44,7 +44,7 @@
* CsvRolesMatrix
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "report#rolesmatrix-csv" )
public class CsvRolesMatrix
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
index 2cc3083d..4e7e5146 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
@@ -43,7 +43,7 @@
* CsvUserList
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "report#userlist-csv" )
public class CsvUserList
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
index 5fa1b58f..f96ae406 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
@@ -25,7 +25,7 @@
* Report
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface Report
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
index fa459543..547e7a8e 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
@@ -23,7 +23,7 @@
* ReportException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class ReportException
extends Exception
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
index 1adbfe6f..8ccb59fd 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
@@ -34,7 +34,7 @@
* ReportManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "reportManager" )
public class ReportManager
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
index bfa4fff9..656448b9 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
@@ -26,7 +26,7 @@
* IfAuthorizedTag:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class ElseAuthorizedTag
extends ConditionalTagSupport
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
index aab577da..a6df0a89 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
@@ -34,7 +34,7 @@
* IfAnyAuthorizedTag:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class IfAnyAuthorizedTag
extends ConditionalTagSupport
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
index 3682ec69..5c8a78fc 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
@@ -33,7 +33,7 @@
* IfAuthorizedTag:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class IfAuthorizedTag
extends ConditionalTagSupport
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
index 35ed9723..fd9e52ac 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
@@ -30,7 +30,7 @@
* IfConfiguredTag:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class IfConfiguredTag
extends ConditionalTagSupport
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
index a2b41de2..4002fa7e 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
@@ -30,7 +30,7 @@
* IsReadOnlyUserManagerTag:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class IsNotReadOnlyUserManagerTag
extends ConditionalTagSupport
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
index 13259247..09dfb736 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
@@ -30,7 +30,7 @@
* IsReadOnlyUserManagerTag:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class IsReadOnlyUserManagerTag
extends ConditionalTagSupport
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
index 9e85ae55..32303df7 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
@@ -39,7 +39,7 @@
* AutoLoginCookies
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("autoLoginCookies")
public class AutoLoginCookies
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
index b7e8e91b..f59e0f1a 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
@@ -27,7 +27,7 @@
* DateUtils
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class DateUtils
{
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
index f1655a9b..49830cb3 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
@@ -27,7 +27,7 @@
* ModelTemplateSorter
*
* @author Henry Isidro
- * @version $Id$
+ *
*/
public class ModelTemplateSorter
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
index 399326b1..6708c593 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
@@ -27,7 +27,7 @@
* OperationSorter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class OperationSorter
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
index e5387de4..cb8dc167 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
@@ -27,7 +27,7 @@
* PermissionSorter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PermissionSorter
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
index ae82c681..260e1b12 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
@@ -27,7 +27,7 @@
* ResourceSorter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class ResourceSorter
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
index cf752f59..4807cdbd 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
@@ -27,7 +27,7 @@
* RoleSorter
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RoleSorter
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
index 8ddc364d..603e2f28 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
@@ -27,7 +27,7 @@
* TemplatedRoleSorter
*
* @author Henry Isidro
- * @version $Id$
+ *
*/
public class TemplatedRoleSorter
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
index b4bf8930..7fcb3900 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
@@ -27,7 +27,7 @@
* UserComparator
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class UserComparator
implements Comparator
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
index 87ab447b..13ad628c 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
@@ -29,7 +29,7 @@
* HttpUtilsTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class HttpUtilsTest
extends TestCase
diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
index 57f1d199..d0a43f0f 100644
--- a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
+++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
@@ -31,7 +31,7 @@
/**
* @author olamy
* @since 26 sept. 2008
- * @version $Id$
+ *
*/
public class MockJavaMailSender
extends JavaMailSenderImpl
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockJavaMailSender.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockJavaMailSender.java
index 3c41a332..9211a211 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockJavaMailSender.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockJavaMailSender.java
@@ -31,7 +31,7 @@
/**
* @author olamy
* @since 26 sept. 2008
- * @version $Id$
+ *
*/
@Service("mockJavaMailSender")
public class MockJavaMailSender
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
index d7603680..562441da 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
@@ -35,7 +35,7 @@
* AbstractSecurityAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractSecurityAction
extends RedbackActionSupport
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java
index 478a1825..a7791efd 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java
@@ -45,7 +45,7 @@
* AbstractUserCredentialsAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractUserCredentialsAction
extends AbstractSecurityAction
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
index 9d7f8089..cf30f48a 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
@@ -40,7 +40,7 @@
* AccountAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-account" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
index b2242394..ea6fade8 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
@@ -52,7 +52,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-login" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
index e2daf81d..7abd00a1 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
@@ -35,7 +35,7 @@
* LogoutAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-logout" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
index c913b77d..5ac26e71 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
@@ -40,7 +40,7 @@
* PasswordAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-password" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java
index e686277c..b6cdb4db 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java
@@ -41,7 +41,7 @@
* PasswordResetAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-password-reset" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java
index 4615355c..e35e02a2 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java
@@ -42,7 +42,7 @@
* RegisterAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-register" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
index 0c7b8402..f21e0d2d 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
@@ -27,7 +27,7 @@
* SecurityRedirectAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-redirect" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
index eab88a14..5903a3e5 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
@@ -25,7 +25,7 @@
* AbstractAdminUserCredentialsAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractAdminUserCredentialsAction
extends AbstractUserCredentialsAction
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java
index fe12f83f..9173a1c1 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java
@@ -50,7 +50,7 @@
* AddAdminUserAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-admin-account" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
index 3af427c4..f8242a7c 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
@@ -31,7 +31,7 @@
* AdminConsoleAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller("redback-admin-console")
@Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
index 15bd4c5d..74b7eff8 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
@@ -53,7 +53,7 @@
* AssignmentsAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller("redback-assignments")
@Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
index 925ac0a7..77a6924e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
@@ -45,7 +45,7 @@
* EditRoleAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-role-edit" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
index 77d75de4..2253b5cf 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
@@ -41,7 +41,7 @@
* OperationsAction:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Controller( "redback-operations" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
index 806036e2..8f5d0d15 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
@@ -43,7 +43,7 @@
* PermissionsAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-permissions" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
index b413e1ba..dc86e8e8 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
@@ -44,7 +44,7 @@
* ReportAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller("redback-report")
@Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
index 8ab53582..bd3c6832 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
@@ -40,7 +40,7 @@
* OperationsAction:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Controller( "redback-resources" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
index 74bd8caa..07d16aa3 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
@@ -44,7 +44,7 @@
* RoleCreateAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-role-create" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
index 282efe83..938236c1 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
@@ -35,7 +35,7 @@
* RolesAction
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Controller( "redback-role-model" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
index 414f70ee..92272d0e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
@@ -37,7 +37,7 @@
* RolesAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-roles" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
index 76422e89..4f67651e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
@@ -46,7 +46,7 @@
* SystemInfoAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-sysinfo" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
index 83d46b74..158b5f96 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
@@ -38,7 +38,7 @@
* UserCreateAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller("redback-admin-user-create")
@Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
index 2f8d4e7a..13a867d0 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
@@ -45,7 +45,7 @@
* UserDeleteAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-admin-user-delete" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
index b5060029..b9728c9f 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
@@ -54,7 +54,7 @@
* UserEditAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-admin-user-edit" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
index 6ce6ef8b..b50a97ab 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
@@ -62,7 +62,7 @@
* UserListAction
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redback-admin-user-list" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
index 53ebc174..21ef7ea0 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
@@ -34,7 +34,7 @@
* AbstractXworkConfigurationCheck
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class AbstractXworkConfigurationCheck
{
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
index 583d1359..21472a33 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
@@ -42,7 +42,7 @@
*
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*
* TODO: Address comment below and add back in the component declaration
*
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
index dd40493d..28905f2d 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
@@ -36,7 +36,7 @@
* EnvironmentCheckInterceptor
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redbackEnvironmentCheckInterceptor" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
index b77c0494..79808758 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
@@ -52,7 +52,7 @@
* EnvironmentCheckInterceptor
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Controller( "redbackForceAdminUserInterceptor" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
index 5bd7e1df..9454c963 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
@@ -47,7 +47,7 @@
*
* @author Joakim Erdfelt
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Controller( "redbackSecureActionInterceptor" )
@Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
index 0552dc4b..3964ee16 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
@@ -27,7 +27,7 @@
* SecurityExternalResult
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@SuppressWarnings( "serial" )
@Controller( "securityExternalResult" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
index 84d12794..1600451e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
@@ -30,7 +30,7 @@
* SystemInfoActionTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@RunWith( JUnit4.class )
public class SystemInfoActionTest
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
index f8c814c6..073769c1 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
@@ -32,7 +32,6 @@
/**
*
* @author Rahul Thakur
- * @version $Id: CustomInterceptorTest.java 1310448 2012-04-06 16:23:16Z olamy $
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
index 049ef6ae..8421e149 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
@@ -23,7 +23,6 @@
/**
* @author Rahul Thakur
- * @version $Id: MockComponentImpl.java 1310448 2012-04-06 16:23:16Z olamy $
*/
@Service
public class MockComponentImpl
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 e5d74bc6..d1619c42 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
@@ -31,7 +31,7 @@
* AbstractKeyManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractKeyManager
implements KeyManager
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 1ddf00d8..c0f49cab 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
@@ -27,7 +27,7 @@
* login credentials.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface AuthenticationKey
{
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 4853080a..12df9c7a 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
@@ -25,7 +25,7 @@
* KeyManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface KeyManager
{
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
index 1cf53446..47b6cc6e 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyManagerException.java
@@ -23,7 +23,7 @@
* KeyManagerException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class KeyManagerException
extends Exception
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
index f43d2486..8294c10d 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/KeyNotFoundException.java
@@ -22,7 +22,7 @@
* KeyNotFoundException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class KeyNotFoundException
extends KeyManagerException
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
index 20730d25..f1c49c64 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
@@ -36,7 +36,7 @@
* CachedKeyManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("keyManager#cached")
public class CachedKeyManager
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
index 1974cb90..d3239312 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
@@ -31,7 +31,7 @@
* CachedKeyManagerTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class CachedKeyManagerTest
extends KeyManagerTestCase
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
index 908ec446..dab078b0 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/java/org/apache/archiva/redback/keys/jdo/JdoKeyManager.java
@@ -43,7 +43,7 @@
* JdoKeyManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "keyManager#jdo" )
public class JdoKeyManager
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
index c7430cb1..70f6d73a 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/java/org/apache/archiva/redback/keys/jdo/JdoKeyManagerTest.java
@@ -37,7 +37,7 @@
* JdoKeyManagerTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class JdoKeyManagerTest
extends KeyManagerTestCase
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
index fb0b6d0e..a464e8ca 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
@@ -27,7 +27,7 @@
* MemoryAuthenticationKey
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryAuthenticationKey
implements AuthenticationKey
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
index 6db38644..2695f3f1 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
@@ -38,7 +38,7 @@
* KeyManager backed by an in-memory only store.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("keyManager#memory")
public class MemoryKeyManager
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
index ad10015b..a03a4cc1 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
@@ -30,7 +30,7 @@
* MemoryKeyManagerTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryKeyManagerTest
extends KeyManagerTestCase
diff --git a/redback-keys/redback-keys-tests/src/main/java/org/apache/archiva/redback/keys/KeyManagerTestCase.java b/redback-keys/redback-keys-tests/src/main/java/org/apache/archiva/redback/keys/KeyManagerTestCase.java
index 56d16769..f5e8afe1 100644
--- a/redback-keys/redback-keys-tests/src/main/java/org/apache/archiva/redback/keys/KeyManagerTestCase.java
+++ b/redback-keys/redback-keys-tests/src/main/java/org/apache/archiva/redback/keys/KeyManagerTestCase.java
@@ -36,7 +36,7 @@
* KeyManagerTestCase
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath*:/spring-context.xml"} )
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AccountLockedException.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AccountLockedException.java
index 9352346b..67cc309a 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AccountLockedException.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AccountLockedException.java
@@ -22,7 +22,7 @@
* AccountLockedException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class AccountLockedException
extends PolicyViolationException
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/CookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/CookieSettings.java
index c28f117b..e4cf16a2 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/CookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/CookieSettings.java
@@ -23,7 +23,7 @@
* CookieSettings
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface CookieSettings
{
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
index 000e7ac2..b393a766 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
@@ -39,7 +39,7 @@
* User Security Policy.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "userSecurityPolicy" )
public class DefaultUserSecurityPolicy
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
index bf1c348f..9b913fc8 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
@@ -29,7 +29,7 @@
* DefaultUserValidationSettings
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("userValidationSettings")
public class DefaultUserValidationSettings
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/MustChangePasswordException.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/MustChangePasswordException.java
index 1170d015..5b919886 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/MustChangePasswordException.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/MustChangePasswordException.java
@@ -22,7 +22,7 @@
* MustChangePasswordException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MustChangePasswordException
extends PolicyViolationException
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncoder.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncoder.java
index c7560a55..6fd2da95 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncoder.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncoder.java
@@ -25,7 +25,7 @@
*
* @author colin sampaleanu
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface PasswordEncoder
{
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java
index 8755ff14..9544bdec 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java
@@ -20,7 +20,7 @@
* Password Encoding Exception.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PasswordEncodingException
extends RuntimeException
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java
index 043d491f..1f11d140 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java
@@ -22,7 +22,7 @@
* A Password Rule
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface PasswordRule
{
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java
index b45d3883..8a94eff9 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java
@@ -20,7 +20,7 @@
* Password Rule Violations Exception
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PasswordRuleViolationException
extends RuntimeException
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java
index caa57935..1bb57c18 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java
@@ -25,7 +25,7 @@
* Password Rule Violations
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PasswordRuleViolations
{
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java
index aea7b56a..326debe8 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java
@@ -24,7 +24,7 @@
* Useful for managing policy operations on a thread local point of view.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PolicyContext
{
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java
index ac2b4415..ce8005c4 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java
@@ -20,7 +20,7 @@
* PolicyViolationException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PolicyViolationException
extends Exception
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
index bb6688c5..8a32f7ad 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
@@ -28,7 +28,7 @@
* RememberMeCookieSettings
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("cookieSettings#rememberMe")
public class RememberMeCookieSettings
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
index 9a0293a7..28e0c468 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
@@ -28,7 +28,7 @@
* SignonCookieSettings
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("cookieSettings#signon")
public class SignonCookieSettings
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 50a77d14..3555d359 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
@@ -23,7 +23,7 @@
/**
* User Security Policy Settings.
*
- * @version $Id$
+ *
* @todo roll password management into it's own object.
*/
public interface UserSecurityPolicy
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java
index b8d39638..d0b0cddc 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java
@@ -23,7 +23,7 @@
* UserValidationSettings
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface UserValidationSettings
{
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java
index 0a80fa41..c0a067d6 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java
@@ -30,7 +30,7 @@
* Abstract Password Encoder that uses the {@link MessageDigest} from JAAS.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class AbstractJAASPasswordEncoder
implements PasswordEncoder
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java
index 4929c87e..8ddbb461 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java
@@ -24,7 +24,7 @@
* See {@link PasswordEncoder#encodePassword(String)} for details.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordEncoder#plaintext")
public class PlainTextPasswordEncoder
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java
index a1abdac6..6a70fe58 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java
@@ -24,7 +24,7 @@
*
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordEncoder#sha1")
public class SHA1PasswordEncoder
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java
index 0531b0c2..6d72e475 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java
@@ -23,7 +23,7 @@
* SHA-256 Password Encoder.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordEncoder#sha256")
public class SHA256PasswordEncoder
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
index 9407b8b5..73183e0e 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
@@ -26,7 +26,7 @@
* AbstractPasswordRule
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractPasswordRule
implements PasswordRule
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
index 31e2f837..8329f32f 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
@@ -29,7 +29,7 @@
* alpha characters contained within.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordRule#alpha-count")
public class AlphaPasswordRule
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
index 61d7c917..9aa6b221 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
@@ -29,7 +29,7 @@
* {@link #setMaximumCharacters(int)} characters in length.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordRule#character-length")
public class CharacterLengthPasswordRule
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
index e62ed8e2..818f7d31 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
@@ -28,7 +28,7 @@
* Basic Password Rule, Checks for non-empty Passwords in non guest users.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordRule#must-have")
public class MustHavePasswordRule
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
index eef40573..5bde337a 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
@@ -29,7 +29,7 @@
* numerical characters contained within.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordRule#numerical-count")
public class NumericalPasswordRule
diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
index 0d4988df..2a4b2b53 100644
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
@@ -30,7 +30,7 @@
* the {@link User#getPreviousEncodedPasswords()} to ensure that a password is not reused.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("passwordRule#reuse")
public class ReusePasswordRule
diff --git a/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java b/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java
index caa7b072..806e195a 100644
--- a/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java
+++ b/redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java
@@ -30,7 +30,7 @@
* PasswordEncoderTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
index 896ade57..5a3c0026 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
@@ -47,7 +47,7 @@
* RbacAuthorizer:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Service( "authorizer#rbac" )
public class RbacAuthorizer
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
index 9947ea86..6e694918 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
@@ -35,7 +35,7 @@
* of the person making the authorization check
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Service("permissionEvaluator")
public class DefaultPermissionEvaluator
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
index 6b0380f4..15d4c836 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
@@ -23,7 +23,7 @@
* PermissionEvaluationException:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class PermissionEvaluationException
extends Exception
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
index f6423150..8b7d4a2c 100644
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
@@ -26,7 +26,7 @@
* PermissionEvaluator:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public interface PermissionEvaluator
{
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 c90ac555..81841e5e 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
@@ -35,7 +35,7 @@
* AbstractRBACManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractRBACManager
implements RBACManager
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java
index 97a74391..19e66024 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java
@@ -20,7 +20,7 @@
* AbstractRole useful for common logic that implementors can use.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractRole
implements Role
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractUserAssignment.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractUserAssignment.java
index 375a09e7..80dabf0e 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractUserAssignment.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractUserAssignment.java
@@ -22,7 +22,7 @@
* AbstractUserAssignment useful for common logic that implementors can use.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractUserAssignment
implements UserAssignment
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 14a4c6fd..12988cef 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
@@ -25,7 +25,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface Operation
{
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 eaba55db..397a32f9 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
@@ -26,7 +26,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface Permission
{
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 15f4cbc1..3cf1699d 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
@@ -29,7 +29,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
* @todo expand on javadoc
*/
public interface RBACManager
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManagerListener.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManagerListener.java
index 77ed0708..205219dd 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManagerListener.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACManagerListener.java
@@ -23,7 +23,7 @@
* RBACManagerListener
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface RBACManagerListener
{
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
index d8fac1c6..42502f19 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
@@ -22,7 +22,7 @@
* RBACObjectAssertions
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RBACObjectAssertions
{
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacManagerException.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacManagerException.java
index 6d1d0ad1..7c4dceb0 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacManagerException.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacManagerException.java
@@ -21,7 +21,7 @@
* a fundamental persistence or store issue.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RbacManagerException
extends Exception
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectInvalidException.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectInvalidException.java
index b816ea93..d74123cd 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectInvalidException.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectInvalidException.java
@@ -20,7 +20,7 @@
* RbacObjectInvalidException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RbacObjectInvalidException
extends RbacManagerException
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectNotFoundException.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectNotFoundException.java
index a5eca108..60033e44 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectNotFoundException.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacObjectNotFoundException.java
@@ -24,7 +24,7 @@
* when a RBAC Object Was Not Found.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RbacObjectNotFoundException
extends RbacManagerException
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacPermanentException.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacPermanentException.java
index cf95ae2b..f9097d8b 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacPermanentException.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RbacPermanentException.java
@@ -23,7 +23,7 @@
* RbacPermanentException - tossed when a forbidden action against a permanent RBAC Object occurs.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RbacPermanentException
extends RbacManagerException
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 2eac18fc..9518fda7 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
@@ -33,7 +33,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface Resource
{
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 a065ce2a..32c220a2 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
@@ -31,7 +31,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface Role
{
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 e2274a27..ed0caf98 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
@@ -26,7 +26,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
* @todo expand on javadoc
*/
public interface UserAssignment
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
index fe80b4c9..9306f454 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
@@ -45,7 +45,7 @@
* CachedRbacManager is a wrapped RBACManager with caching.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "rBACManager#cached" )
public class CachedRbacManager
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
index 10167fc0..0b03c784 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
@@ -31,7 +31,7 @@
* CachedRbacManagerPerformanceTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class CachedRbacManagerPerformanceTest
extends AbstractRbacManagerPerformanceTestCase
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 9135d0fb..090b0a4e 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
@@ -46,7 +46,7 @@
*
* @author Joakim Erdfelt
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@Service( "rBACManager#jdo" )
public class JdoRbacManager
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
index 655b682b..48677aa7 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
@@ -54,7 +54,7 @@
* JdoTool - RBAC JDO Tools.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service("jdoTool")
public class JdoTool
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 8f2739ab..afbed39b 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
@@ -43,7 +43,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class JdoRbacManagerTest
extends AbstractRbacManagerTestCase
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 21ccaa6c..2fb03f7b 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
@@ -25,7 +25,7 @@
* MemoryAuthorizationDataSource:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class MemoryAuthorizationDataSource
// implements AuthorizationDataSource
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryOperation.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryOperation.java
index ab01232c..698cdf07 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryOperation.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryOperation.java
@@ -25,7 +25,7 @@
* MemoryOperation
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryOperation
implements Operation, java.io.Serializable
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryPermission.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryPermission.java
index b9275e9b..5c120bb7 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryPermission.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryPermission.java
@@ -27,7 +27,7 @@
* MemoryPermission
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryPermission
implements Permission, java.io.Serializable
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 2c14b311..c3ca827a 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
@@ -48,7 +48,7 @@
*
* @author Jesse McConnell
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "rBACManager#memory" )
public class MemoryRbacManager
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryResource.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryResource.java
index 1bc24170..8baf8df9 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryResource.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryResource.java
@@ -25,7 +25,7 @@
* MemoryResource
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryResource
implements Resource, java.io.Serializable
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRole.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRole.java
index 5f7b8fa6..9a42433c 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRole.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRole.java
@@ -30,7 +30,7 @@
* MemoryRole
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryRole
extends AbstractRole
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryUserAssignment.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryUserAssignment.java
index a5990c41..403a6e07 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryUserAssignment.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryUserAssignment.java
@@ -29,7 +29,7 @@
* MemoryUserAssignment
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryUserAssignment
extends AbstractUserAssignment
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
index 00c0c6a5..e2eb252b 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
@@ -30,7 +30,7 @@
* MemoryRbacManagerTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MemoryRbacManagerTest
extends AbstractRbacManagerTestCase
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 c02af330..f8e6d639 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
@@ -23,7 +23,7 @@
* RoleProfileException:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class RoleManagerException
extends Exception
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 672e37eb..f533a6c0 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
@@ -23,7 +23,7 @@
* RoleProfileException:
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
public class RoleTemplateProcessorException
extends Exception
diff --git a/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
index dfd2597a..e3dc48da 100644
--- a/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
+++ b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
@@ -40,7 +40,7 @@
* AbstractRbacManagerTestCase
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java
index b5f86fa5..912e1505 100644
--- a/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java
+++ b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java
@@ -31,7 +31,7 @@
* RbacManagerEventTracker
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class RbacManagerEventTracker
implements RBACManagerListener
diff --git a/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
index ca8bfd49..2f65fcfc 100644
--- a/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
+++ b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
@@ -23,7 +23,7 @@
* SecuritySystemConstants - constants for use with contexts that use plexus-security.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class SecuritySystemConstants
{
diff --git a/redback-system/src/main/java/org/apache/archiva/redback/system/check/EnvironmentCheck.java b/redback-system/src/main/java/org/apache/archiva/redback/system/check/EnvironmentCheck.java
index b8872aa7..4d9699ac 100644
--- a/redback-system/src/main/java/org/apache/archiva/redback/system/check/EnvironmentCheck.java
+++ b/redback-system/src/main/java/org/apache/archiva/redback/system/check/EnvironmentCheck.java
@@ -25,7 +25,7 @@
* EnvironmentCheck - Perform an Environment Check.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface EnvironmentCheck
{
diff --git a/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java b/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
index f07774fb..865b226f 100644
--- a/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
+++ b/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
@@ -46,7 +46,7 @@
* {@link Authenticator} implementation that uses a wrapped {@link UserManager} to authenticate.
*
* @author Rahul Thakur
- * @version $Id$
+ *
*/
@Service( "authenticator#user-manager" )
public class UserManagerAuthenticator
diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
index ae43e023..49b6fd0a 100644
--- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
+++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/AbstractUserManager.java
@@ -29,7 +29,7 @@
* AbstractUserManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public abstract class AbstractUserManager
implements UserManager
diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/Messages.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/Messages.java
index c3b617ef..3244031e 100644
--- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/Messages.java
+++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/Messages.java
@@ -27,7 +27,7 @@
* Localized Message Handling.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class Messages
{
diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/PermanentUserException.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/PermanentUserException.java
index 4bf4b2ce..c1852626 100644
--- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/PermanentUserException.java
+++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/PermanentUserException.java
@@ -24,7 +24,7 @@
* occurs.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class PermanentUserException
extends UserManagerException
diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java
index a7a26bd0..84f95fd4 100644
--- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java
+++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerException.java
@@ -23,7 +23,7 @@
* UserManagerException
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class UserManagerException
extends RuntimeException
diff --git a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerListener.java b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerListener.java
index 763681fd..67d50aba 100644
--- a/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerListener.java
+++ b/redback-users/redback-users-api/src/main/java/org/apache/archiva/redback/users/UserManagerListener.java
@@ -23,7 +23,7 @@
* UserManagerListener
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public interface UserManagerListener
{
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
index 5de74659..36241b07 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
@@ -37,7 +37,7 @@
* CachedUserManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "userManager#cached" )
public class CachedUserManager
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java b/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
index e18ed634..24d44abf 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
@@ -35,7 +35,7 @@
* CachedUserManagerTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class CachedUserManagerTest
extends AbstractUserManagerTestCase
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
index ce33caa9..9b6e7273 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
@@ -49,7 +49,7 @@
* JdoUserManager
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@Service( "userManager#jdo" )
public class JdoUserManager
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
index b206f72c..d0675484 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/Messages.java
@@ -27,7 +27,7 @@
* Localized Message Handling.
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class Messages
{
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java b/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
index f0279b83..bc11f245 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java
@@ -38,7 +38,7 @@
* JdoUserManagerTest
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class JdoUserManagerTest
extends AbstractUserManagerTestCase
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
index 4abf5493..eb147fcb 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
@@ -29,7 +29,7 @@
import java.util.List;
/**
- * @version $Id$
+ *
*/
public interface LdapController
{
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
index 97767c04..d60d0e47 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
@@ -57,7 +57,7 @@
* LdapUserManagerTest
*
* @author Jesse McConnell
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
diff --git a/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java b/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java
index f0f0800d..927e4ba1 100644
--- a/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java
@@ -43,7 +43,7 @@
import javax.annotation.Resource;
/**
- * @version $Id$
+ *
*/
@Service("userManager#memory")
public class MemoryUserManager
diff --git a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java
index 2179497e..1f9e6e54 100644
--- a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java
+++ b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java
@@ -38,7 +38,7 @@
* AbstractUserManagerTestCase
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath*:/spring-context.xml"} )
diff --git a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/UserManagerEventTracker.java b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/UserManagerEventTracker.java
index ea6a5650..80dcbe1f 100644
--- a/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/UserManagerEventTracker.java
+++ b/redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/UserManagerEventTracker.java
@@ -29,7 +29,7 @@
* UserManagerEventTracker
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class UserManagerEventTracker
implements UserManagerListener