From: Olivier Lamy Date: Thu, 5 Jul 2012 21:03:45 +0000 (+0000) Subject: remove @version $Id$ X-Git-Tag: redback-2.0~114 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d0946d1a0db9cddb737bf2d4017ce9f84601866;p=archiva.git remove @version $Id$ git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1357910 13f79535-47bb-0310-9956-ffa450edef68 --- 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 7379937c2..35c9bfd7e 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 @@ package org.apache.archiva.redback.authentication; /** * 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 82a49a2fd..746aa1df1 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 @@ package org.apache.archiva.redback.authentication; *

* 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 a168e2d6a..38fe3f9c0 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 @@ package org.apache.archiva.redback.authentication; * 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 8e42842a3..2fbcc8086 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 @@ import java.util.Map; * 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 e1ebc0ab3..54805bcf5 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 @@ import org.apache.archiva.redback.policy.MustChangePasswordException; * 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 c42b7405b..c156fd377 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 @@ import org.springframework.stereotype.Service; * 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 3f25a2637..7a8e4ef9c 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 @@ import org.springframework.stereotype.Service; * 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 f5ff47458..b87c8f591 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 @@ import org.springframework.stereotype.Service; * 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 fd1d5b4a8..4d167c8a4 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 @@ import org.springframework.stereotype.Service; * 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 98d253f09..eeb1cf681 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 @@ import javax.inject.Named; * 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 f75c284ae..3add782ae 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 @@ import java.util.Date; /** * @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 9c12c270e..1131cee2f 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 @@ import javax.naming.directory.Attributes; /** * - * @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 1345a5e7f..63aca30ef 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 @@ package org.apache.archiva.redback.common.ldap; */ /** - * @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 25146343d..01c2f849a 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 org.apache.archiva.redback.users.User; 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 2249cdaf6..48f4e9b91 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 @@ package org.apache.archiva.redback.common.ldap; 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 e6beb6edb..2d6861f6e 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 @@ import java.util.Properties; /** * @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 c80bc47b2..ce45e2e10 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 @@ import java.util.Properties; * 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 64c298b44..52470c3a5 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 @@ import java.util.TreeMap; * 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 e7ca10ef4..377a156a7 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 @@ import javax.naming.spi.StateFactory; /** * @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 654f95aa0..cbd4ef9de 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 @@ import javax.naming.NamingException; /** * @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 5e076dec6..63e6fcbe9 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 @@ import java.util.List; * 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 f79670d5b..63aec7455 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 @@ import javax.inject.Named; * 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 c5b520138..5f0bec32b 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 @@ import org.codehaus.plexus.util.StringUtils; * 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 5c8fc95fd..20349f24d 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 @@ import org.springframework.stereotype.Service; * 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 9499a5897..0efd4630e 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 @@ import java.util.List; * 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 b49afc5a8..cfdd34e1a 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 @@ import java.util.List; * 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 3530607ce..65d013426 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 @@ import org.extremecomponents.table.view.html.BuilderUtils; * 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 b51966bae..ecb982761 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 @@ import org.extremecomponents.table.core.TableModel; * 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 eae448aed..5f5a4d6ba 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 @@ import org.extremecomponents.table.limit.Sort; * 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 cb27063ae..f6c65c37e 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 @@ import org.extremecomponents.util.HtmlBuilder; * 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 ac95f8bca..94dde66cd 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 @@ import org.extremecomponents.util.HtmlBuilder; * 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 729866d1e..6283be4ec 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 @@ import org.extremecomponents.util.HtmlBuilder; * 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 8c5a2c5c7..f91bd6e5b 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 @@ import javax.servlet.ServletException; * 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 4be9cc5a9..2a4bea873 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 @@ import org.apache.archiva.redback.integration.filter.SpringServletFilter; * 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 c087ef699..e03608a90 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 @@ import org.apache.archiva.redback.authentication.AuthenticationException; * 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 4e1b97f56..1747a799e 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 @@ import java.io.IOException; * 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 4fb4e8c2c..e940c7c9e 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 @@ import org.springframework.stereotype.Service; * 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 0bef4e5e8..bbef62155 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 @@ import java.io.IOException; * 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 750541a2a..9b4b8c702 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 @@ import java.security.NoSuchAlgorithmException; * 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 1d8c9b26e..f38c6abfa 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 @@ package org.apache.archiva.redback.integration.filter.authentication.digest; * 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 0bb1ac30d..ef6632e9d 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 @@ import java.io.IOException; * 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 69a7b3511..986f64942 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 @@ import java.io.IOException; * * * @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 dc999bacd..fc432ee6f 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 @@ import java.util.Properties; * 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 c143c2e2b..685322601 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 @@ import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenti * 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 7523d4f4b..3f259a281 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 @@ import java.io.IOException; * 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 c6546cbb8..b4fad5daf 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 @@ package org.apache.archiva.redback.integration.interceptor; * * @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 e7ae43448..b9b009e2f 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 @@ import org.apache.archiva.redback.keys.AuthenticationKey; * 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 b4aa023c8..b2599db4a 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 @@ import java.util.Collection; /** * @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 2ed4a4fdd..efba805ac 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 @@ import org.springframework.stereotype.Service; * 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 ab298b08c..eb5ed2ca7 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 @@ import java.util.Locale; * 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 7b6284068..6270ca175 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 @@ import org.apache.archiva.redback.users.User; * 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 5e7b07849..4c1fbcaab 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 @@ package org.apache.archiva.redback.integration.model; * 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 54cef2bfb..5c65600f5 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 @@ package org.apache.archiva.redback.integration.model; * 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 fdcb8e563..0d87cbae3 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 @@ import org.apache.archiva.redback.rbac.Role; * 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 0986560fc..8f71c80b8 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 @@ import org.apache.archiva.redback.integration.util.DateUtils; * 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 a2944f8a7..88e13fe2e 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 @@ import java.util.List; * 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 bb055a147..d7a08208e 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 @@ package org.apache.archiva.redback.integration.model; * 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 b07edb3a9..dcb4135f2 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 @@ import java.io.Serializable; * 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 7fa41cefe..b73e98edb 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 @@ import java.util.Map; * 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 2cc3083d6..4e7e51468 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 @@ import java.util.Map; * 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 5fa1b58fd..f96ae4067 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 @@ import java.io.OutputStream; * 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 fa4595439..547e7a8ed 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 @@ package org.apache.archiva.redback.integration.reports; * 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 1adbfe6f6..8ccb59fd8 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 @@ import java.util.Map; * 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 bfa4fff93..656448b9c 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 @@ import javax.servlet.jsp.jstl.core.ConditionalTagSupport; * 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 aab577da0..a6df0a89b 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 @@ import java.util.StringTokenizer; * 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 3682ec695..5c8a78fcc 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 @@ import javax.servlet.jsp.jstl.core.ConditionalTagSupport; * 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 35ed9723a..fd9e52acf 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 @@ import javax.servlet.jsp.jstl.core.ConditionalTagSupport; * 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 a2b41de29..4002fa7e5 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 @@ import javax.servlet.jsp.jstl.core.ConditionalTagSupport; * 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 132592478..09dfb7364 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 @@ import javax.servlet.jsp.jstl.core.ConditionalTagSupport; * 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 9e85ae553..32303df77 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 @@ import org.springframework.stereotype.Service; * 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 b7e8e91bd..f59e0f1aa 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 @@ import java.util.Date; * 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 f1655a9b6..49830cb31 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 @@ import java.util.Comparator; * 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 399326b15..6708c5939 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 @@ import org.apache.archiva.redback.rbac.Operation; * 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 e5387de40..cb8dc167a 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 @@ import org.apache.archiva.redback.rbac.Permission; * 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 ae82c6812..260e1b120 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 @@ import org.apache.archiva.redback.rbac.Resource; * 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 cf752f59b..4807cdbdf 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 @@ import org.apache.archiva.redback.rbac.Role; * 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 8ddc364d4..603e2f280 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 @@ import org.apache.archiva.redback.rbac.TemplatedRole; * 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 b4bf89306..7fcb39007 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 @@ import org.apache.archiva.redback.users.User; * 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 87ab447b8..13ad628c5 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 @@ import org.apache.archiva.redback.integration.HttpUtils; * 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 57f1d199b..d0a43f0f0 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 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; /** * @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 3c41a3323..9211a2112 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 @@ import java.util.List; /** * @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 d76036806..562441da4 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 @@ import org.apache.archiva.redback.integration.interceptor.SecureActionException; * 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 478a1825c..a7791efda 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 @@ import java.util.Map; * 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 9d7f80897..cf30f48ad 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 @@ import java.util.Arrays; * 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 b2242394e..ea6fade89 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 @@ import java.util.Date; * * @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 e2daf81d9..7abd00a18 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 @@ import javax.inject.Named; * 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 c913b77d4..5ac26e713 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 @@ import java.util.Map; * 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 e686277c2..b6cdb4dbf 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 @@ import java.util.Arrays; * 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 4615355cd..e35e02a27 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 @@ import java.util.Arrays; * 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 0c7b84029..f21e0d2d2 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 @@ import org.springframework.stereotype.Controller; * 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 eab88a148..5903a3e5b 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 @@ import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction; * 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 fe12f83f3..9173a1c16 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 @@ import java.util.Date; * 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 3af427c4d..f8242a7c3 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 @@ import org.springframework.stereotype.Controller; * 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 15bd4c5d7..74b7eff84 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 @@ import java.util.Set; * 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 925ac0a74..77a6924e3 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 @@ import java.util.Map; * 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 77d75de43..2253b5cf9 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 @@ import java.util.List; * 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 806036e21..8f5d0d156 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 @@ import java.util.List; * 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 b413e1ba0..dc86e8e89 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 @@ import org.springframework.stereotype.Controller; * 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 8ab53582d..bd3c6832e 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 @@ import java.util.List; * 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 74bd8caa0..07d16aa3a 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 @@ import java.util.List; * 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 282efe835..938236c1e 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 @@ import javax.inject.Inject; * 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 414f70ee8..92272d0e9 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 @@ import java.util.List; * 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 76422e894..4f67651eb 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 @@ import java.util.Set; * 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 83d46b74b..158b5f963 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 @@ import org.springframework.stereotype.Controller; * 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 2f8d4e7a8..13a867d0e 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 @@ import java.util.Arrays; * 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 b50600291..b9728c9f5 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 @@ import java.util.List; * 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 6ce6ef8ba..b50a97ab9 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 @@ import java.util.Set; * 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 53ebc174c..21ef7ea07 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 @@ import com.opensymphony.xwork2.config.entities.PackageConfig; * 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 583d13599..21472a33f 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 @@ import com.opensymphony.xwork2.config.ConfigurationManager; *

* * @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 dd40493d8..28905f2de 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 @@ import java.util.List; * 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 b77c04949..798087585 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 @@ import java.util.Properties; * 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 5bd7e1df8..9454c963b 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 @@ import java.util.List; * * @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 0552dc4b3..3964ee168 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 @@ import org.springframework.stereotype.Controller; * 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 84d127944..1600451ea 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 @@ import org.junit.runners.JUnit4; * 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 f8c814c61..073769c13 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 @@ import javax.inject.Named; /** * * @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 049ef6ae3..8421e149b 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 @@ import org.springframework.stereotype.Service; /** * @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 e5d74bc69..d1619c422 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 @@ import org.slf4j.LoggerFactory; * 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 1ddf00d89..c0f49cabb 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 @@ import java.util.Date; * 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 4853080a4..12df9c7a4 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 @@ import java.util.List; * 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 1cf53446c..47b6cc6e5 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 @@ package org.apache.archiva.redback.keys; * 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 f43d2486b..8294c10d1 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 @@ import org.apache.archiva.redback.keys.KeyManagerException; * 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 20730d258..f1c49c644 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 @@ import org.springframework.stereotype.Service; * 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 1974cb909..d32393123 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 @@ import javax.inject.Named; * 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 908ec4465..dab078b00 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 @@ import java.util.List; * 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 c7430cb17..70f6d73a0 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 @@ import java.util.Properties; * 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 fb0b6d0eb..a464e8cad 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 @@ import java.util.Date; * 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 6db386445..2695f3f16 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 @@ import java.util.Map; * 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 ad10015bd..a03a4cc18 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 @@ import javax.inject.Named; * 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 56d167693..f5e8afe1d 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 @@ import java.util.List; * 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 9352346bd..67cc309a5 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 @@ import org.apache.archiva.redback.users.User; * 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 c28f117bf..e4cf16a2c 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 @@ package org.apache.archiva.redback.policy; * 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 000e7ac2a..b393a7667 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 @@ import java.util.List; * 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 bf1c348f0..9b913fc82 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 @@ import javax.annotation.Resource; * 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 1170d0158..5b919886e 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 @@ import org.apache.archiva.redback.users.User; * 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 c7560a55e..6fd2da95d 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 @@ package org.apache.archiva.redback.policy; * * @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 8755ff14d..9544bdec8 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 @@ package org.apache.archiva.redback.policy; * 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 043d491fb..1f11d1408 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 @@ import org.apache.archiva.redback.users.User; * 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 b45d38831..8a94eff94 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 @@ package org.apache.archiva.redback.policy; * 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 caa579354..1bb57c186 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 @@ import java.util.List; * 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 aea7b56a6..326debe8e 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 @@ import java.util.Map; * 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 ac2b4415b..ce8005c4a 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 @@ package org.apache.archiva.redback.policy; * 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 bb6688c5c..8a32f7add 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 @@ import javax.annotation.PostConstruct; * 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 9a0293a76..28e0c4683 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 @@ import javax.annotation.PostConstruct; * 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 50a77d14b..3555d359a 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 @@ import java.util.List; /** * 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 b8d396389..d0b0cddc3 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 @@ package org.apache.archiva.redback.policy; * 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 0a80fa411..c0a067d6d 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 @@ import java.security.NoSuchAlgorithmException; * 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 4929c87ef..8ddbb461a 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 @@ import org.springframework.stereotype.Service; * 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 a1abdac6f..6a70fe58e 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 @@ import org.springframework.stereotype.Service; * * * @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 0531b0c2f..6d72e4752 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 @@ import org.springframework.stereotype.Service; * 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 9407b8b5e..73183e0ed 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 @@ import javax.inject.Named; * 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 31e2f8374..8329f32fd 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 @@ import javax.annotation.PostConstruct; * 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 61d7c9173..9aa6b221a 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 @@ import javax.annotation.PostConstruct; * {@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 e62ed8e23..818f7d310 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 @@ import javax.annotation.PostConstruct; * 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 eef40573c..5bde337ac 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 @@ import javax.annotation.PostConstruct; * 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 0d4988dfb..2a4b2b531 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 @@ import java.util.Iterator; * 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 caa7b0722..806e195ae 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 @@ import javax.inject.Named; * 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 896ade572..5a3c0026d 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 @@ import java.util.Map; * 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 9947ea863..6e6949180 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 @@ import javax.inject.Named; * 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 6b0380f43..15d4c8361 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 @@ package org.apache.archiva.redback.authorization.rbac.evaluator; * 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 f64231502..8b7d4a2c9 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 @@ import org.apache.archiva.redback.rbac.Permission; * 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 c90ac555d..81841e5e6 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 @@ import java.util.Set; * 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 97a743917..19e660242 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 @@ package org.apache.archiva.redback.rbac; * 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 375a09e70..80dabf0eb 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 @@ import java.util.List; * 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 14a4c6fdd..12988cefe 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 @@ package org.apache.archiva.redback.rbac; * * @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 eaba55db4..397a32f9f 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 @@ package org.apache.archiva.redback.rbac; * * @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 15f4cbc10..3cf1699d9 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 @@ import java.util.Set; * * @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 77ed07086..205219dde 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 @@ package org.apache.archiva.redback.rbac; * 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 d8fac1c62..42502f191 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 @@ import org.codehaus.plexus.util.StringUtils; * 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 6d1d0ad1f..7c4dceb09 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 @@ package org.apache.archiva.redback.rbac; * 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 b816ea93f..d74123cdf 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 @@ package org.apache.archiva.redback.rbac; * 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 a5eca1087..60033e44c 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 @@ package org.apache.archiva.redback.rbac; * 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 cf95ae2bd..f9097d8bd 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 @@ package org.apache.archiva.redback.rbac; * 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 2eac18fc1..9518fda75 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 @@ package org.apache.archiva.redback.rbac; * * @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 a065ce2ab..32c220a2d 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 @@ import java.util.List; * * @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 e2274a274..ed0caf984 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 @@ import java.util.List; * * @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 fe80b4c9e..9306f454d 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 @@ import java.util.Set; * 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 10167fc0d..0b03c7841 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 @@ import javax.inject.Named; * 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 9135d0fb7..090b0a4e6 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 @@ import java.util.List; * * @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 655b682b0..48677aa74 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 @@ import java.util.List; * 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 8f2739ab4..afbed39bb 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 @@ import java.util.Properties; * * @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 21ccaa6c7..2fb03f7b6 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 @@ import org.apache.archiva.redback.users.User; * 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 ab01232c1..698cdf072 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 @@ import org.apache.archiva.redback.rbac.Operation; * 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 b9275e9b0..5c120bb7f 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 @@ import org.apache.archiva.redback.rbac.Permission; * 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 2c14b3116..c3ca827a9 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 @@ import java.util.Map; * * @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 1bc24170c..8baf8df96 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 @@ import org.apache.archiva.redback.rbac.Resource; * 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 5f7b8fa60..9a42433cc 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 @@ import java.util.List; * 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 a5990c41e..403a6e07c 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 @@ import java.util.List; * 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 00c0c6a52..e2eb252b4 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 @@ import javax.inject.Named; * 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 c02af3302..f8e6d639f 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 @@ package org.apache.archiva.redback.role; * 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 672e37ebb..f533a6c0c 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 @@ package org.apache.archiva.redback.role.template; * 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 dfd2597ab..e3dc48dab 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 @@ import java.util.Set; * 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 b5f86fa57..912e15058 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 @@ import java.util.List; * 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 ca8bfd49d..2f65fcfc2 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 @@ package org.apache.archiva.redback.system; * 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 b8872aa72..4d9699ac6 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 @@ import java.util.List; * 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 f07774fbe..865b226fe 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 @@ import java.util.Map; * {@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 ae43e0232..49b6fd0a2 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 @@ import org.slf4j.LoggerFactory; * 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 c3b617efe..3244031eb 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 @@ import java.util.ResourceBundle; * 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 4bf4b2ce9..c1852626c 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 @@ package org.apache.archiva.redback.users; * 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 a7a26bd09..84f95fd49 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 @@ package org.apache.archiva.redback.users; * 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 763681fd3..67d50aba8 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 @@ package org.apache.archiva.redback.users; * 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 5de746590..36241b075 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 @@ import java.util.List; * 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 e18ed634a..24d44abfb 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 @@ import javax.inject.Named; * 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 ce33caa93..9b6e7273e 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 @@ import java.util.List; * 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 b206f72cd..d0675484e 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 @@ import java.util.ResourceBundle; * 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 f0279b837..bc11f245e 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 @@ import java.util.Properties; * 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 4abf54935..eb147fcbd 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.Collection; 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 97767c049..d60d0e470 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 @@ import java.util.List; * 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 f0f0800d4..927e4ba1d 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 java.util.Properties; 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 2179497ee..1f9e6e544 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 @@ import java.util.List; * 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 ea6a56509..80dcbe1fc 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 @@ import java.util.List; * UserManagerEventTracker * * @author Joakim Erdfelt - * @version $Id$ + * */ public class UserManagerEventTracker implements UserManagerListener