From: Olivier Lamy Date: Wed, 11 Apr 2012 16:16:57 +0000 (+0000) Subject: @since 1.5 is now @since 2.0 X-Git-Tag: redback-2.0~162 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=17800b2d557b433bc4b03e8885ea5c781f010933;p=archiva.git @since 1.5 is now @since 2.0 git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1324841 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java index 3a06e1a81..6aca7a9ec 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java @@ -49,7 +49,7 @@ import java.util.Properties; /** * @author Olivier Lamy - * @since 1.5 + * @since 2.0 */ @Service( "AdminAutoCreateCheck" ) public class AdminAutoCreateCheck diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java index 8c4985b97..794b53745 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java @@ -25,7 +25,7 @@ import java.util.Collection; /** * @author Olivier Lamy - * @since 1.5 + * @since 2.0 */ @XmlRootElement( name = "applicationRole" ) public class ApplicationRoles diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java index 78131a021..72965b191 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java @@ -24,7 +24,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.5 + * @since 2.0 */ @XmlRootElement( name = "roleTemplate" ) public class RoleTemplate diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java index e560efe80..2ce545f16 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java @@ -64,7 +64,7 @@ public class User /** * for roles update only not return on user read * - * @since 1.5 + * @since 2.0 */ private List assignedRoles; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java index 0a48f2212..8cea4fd83 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java @@ -224,7 +224,7 @@ public interface RoleManagementService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ List getAllRoles() throws RedbackServiceException; @@ -234,7 +234,7 @@ public interface RoleManagementService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ List getDetailedAllRoles() throws RedbackServiceException; @@ -245,7 +245,7 @@ public interface RoleManagementService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ List getApplications( @PathParam( "username" ) String username ) throws RedbackServiceException; @@ -256,7 +256,7 @@ public interface RoleManagementService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ Role getRole( @PathParam( "roleName" ) String roleName ) throws RedbackServiceException; @@ -266,7 +266,7 @@ public interface RoleManagementService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ Boolean updateRoleDescription( @QueryParam( "roleName" ) String roleName, @QueryParam( "roleDescription" ) String description ) @@ -279,7 +279,7 @@ public interface RoleManagementService @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** * update users assigned to a role - * @since 1.5 + * @since 2.0 */ Boolean updateRoleUsers( Role role ) throws RedbackServiceException; @@ -289,7 +289,7 @@ public interface RoleManagementService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ List getApplicationRoles( @PathParam( "username" ) String username ) throws RedbackServiceException; @@ -301,7 +301,7 @@ public interface RoleManagementService @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION ) /** * update roles assigned to a user - * @since 1.5 + * @since 2.0 */ Boolean updateUserRoles( User user ) throws RedbackServiceException; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java index 239169f90..9c7cc06ac 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java @@ -101,7 +101,7 @@ public interface UserService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ Boolean lockUser( @PathParam( "username" ) String username ) throws RedbackServiceException; @@ -111,7 +111,7 @@ public interface UserService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ Boolean unlockUser( @PathParam( "username" ) String username ) throws RedbackServiceException; @@ -122,7 +122,7 @@ public interface UserService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ Boolean passwordChangeRequired( @PathParam( "username" ) String username ) throws RedbackServiceException; @@ -132,7 +132,7 @@ public interface UserService @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION ) /** - * @since 1.5 + * @since 2.0 */ Boolean passwordChangeNotRequired( @PathParam( "username" ) String username ) throws RedbackServiceException; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java index 29a3584ac..bac0f7a2c 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java @@ -30,7 +30,7 @@ import javax.inject.Inject; * to setup some ObjectMapper configuration * * @author Olivier Lamy - * @since 1.5 + * @since 2.0 */ @Service("redbackJacksonJsonConfigurator") public class JacksonJsonConfigurator