You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/07 22:50:24 UTC
svn commit: r1310861 - in /archiva/redback/redback-core/trunk:
redback-authorization/redback-authorization-api/src/main/java/org/apache/
redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/
redback-authorization/redback-aut...
Author: olamy
Date: Sat Apr 7 20:50:23 2012
New Revision: 1310861
URL: http://svn.apache.org/viewvc?rev=1310861&view=rev
Log:
package move to o.a.a.r module redback-authorization-api
Added:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java
- copied, changed from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java
Removed:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,14 @@ package org.codehaus.plexus.redback.auth
* under the License.
*/
+import org.apache.archiva.redback.authorization.AuthorizationDataSource;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
+
/**
* Authorizer:
*
* @author: Jesse McConnell <je...@codehaus.org>
- * @version: $ID:$
* @todo chain of command rule processing
*/
public interface Authorizer
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java (from r1310860, archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java?p2=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java&p1=archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java&r1=1310860&r2=1310861&rev=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java Sat Apr 7 20:50:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.authorization;
+package org.apache.archiva.redback.authorization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java Sat Apr 7 20:50:23 2012
@@ -16,10 +16,10 @@ package org.codehaus.plexus.redback.auth
* limitations under the License.
*/
-import org.codehaus.plexus.redback.authorization.AuthorizationDataSource;
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
-import org.codehaus.plexus.redback.authorization.Authorizer;
+import org.apache.archiva.redback.authorization.AuthorizationDataSource;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.Authorizer;
import org.springframework.stereotype.Service;
/**
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java Sat Apr 7 20:50:23 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java Sat Apr 7 20:50:23 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java Sat Apr 7 20:50:23 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java Sat Apr 7 20:50:23 2012
@@ -19,8 +19,7 @@ package org.codehaus.redback.rest.api.se
* under the License.
*/
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.redback.rest.api.model.User;
import javax.ws.rs.GET;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java Sat Apr 7 20:50:23 2012
@@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.se
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.redback.rest.api.model.User;
import javax.ws.rs.GET;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java Sat Apr 7 20:50:23 2012
@@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.se
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.Application;
import org.codehaus.redback.rest.api.model.ApplicationRoles;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java Sat Apr 7 20:50:23 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.rest.api.se
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.Operation;
import org.codehaus.redback.rest.api.model.Permission;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java Sat Apr 7 20:50:23 2012
@@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.se
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java Sat Apr 7 20:50:23 2012
@@ -21,7 +21,7 @@ package org.codehaus.redback.rest.servic
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.message.Message;
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java Sat Apr 7 20:50:23 2012
@@ -27,7 +27,7 @@ import org.apache.cxf.jaxrs.model.ClassR
import org.apache.cxf.message.Message;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java Sat Apr 7 20:50:23 2012
@@ -24,8 +24,8 @@ import org.apache.cxf.jaxrs.ext.RequestH
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.message.Message;
import org.apache.archiva.redback.authentication.AuthenticationResult;
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java Sat Apr 7 20:50:23 2012
@@ -18,7 +18,7 @@ package org.codehaus.redback.rest.servic
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import org.apache.archiva.redback.authorization.RedbackAuthorization;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java Sat Apr 7 20:50:23 2012
@@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionInv
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.struts2.ServletActionContext;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java Sat Apr 7 20:50:23 2012
@@ -24,7 +24,7 @@ import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxy;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java Sat Apr 7 20:50:23 2012
@@ -20,11 +20,11 @@ package org.codehaus.plexus.redback.auth
*/
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.authorization.AuthorizationDataSource;
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
-import org.codehaus.plexus.redback.authorization.Authorizer;
-import org.codehaus.plexus.redback.authorization.NotAuthorizedException;
+import org.apache.archiva.redback.authorization.AuthorizationDataSource;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.Authorizer;
+import org.apache.archiva.redback.authorization.NotAuthorizedException;
import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluationException;
import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluator;
import org.codehaus.plexus.redback.rbac.Permission;
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java Sat Apr 7 20:50:23 2012
@@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.rbac
* under the License.
*/
-import org.codehaus.plexus.redback.authorization.AuthorizationDataSource;
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
-import org.codehaus.plexus.redback.authorization.Authorizer;
+import org.apache.archiva.redback.authorization.AuthorizationDataSource;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.Authorizer;
import org.springframework.stereotype.Service;
/**
Modified: archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java (original)
+++ archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java Sat Apr 7 20:50:23 2012
@@ -26,10 +26,10 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationManager;
import org.apache.archiva.redback.authentication.AuthenticationResult;
-import org.codehaus.plexus.redback.authorization.AuthorizationDataSource;
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
-import org.codehaus.plexus.redback.authorization.Authorizer;
+import org.apache.archiva.redback.authorization.AuthorizationDataSource;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.Authorizer;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
Modified: archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java?rev=1310861&r1=1310860&r2=1310861&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java (original)
+++ archiva/redback/redback-core/trunk/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java Sat Apr 7 20:50:23 2012
@@ -22,8 +22,8 @@ package org.codehaus.plexus.redback.syst
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
-import org.codehaus.plexus.redback.authorization.AuthorizationException;
-import org.codehaus.plexus.redback.authorization.AuthorizationResult;
+import org.apache.archiva.redback.authorization.AuthorizationException;
+import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;