From 91af10462cbfea8985ca944b21a7530633e73bf2 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 7 Apr 2012 22:49:09 +0000 Subject: [PATCH] package move to o.a.a.r module redback-authorization-rbac git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310901 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva}/redback/authorization/rbac/RbacAuthorizer.java | 6 +++--- .../rbac/evaluator/DefaultPermissionEvaluator.java | 2 +- .../rbac/evaluator/PermissionEvaluationException.java | 2 +- .../authorization/rbac/evaluator/PermissionEvaluator.java | 2 +- .../src/main/resources/META-INF/spring-context.xml | 2 +- .../rbac/evaluator/PermissionEvaluatorTest.java | 4 +++- 6 files changed, 10 insertions(+), 8 deletions(-) rename redback-rbac/redback-authorization-rbac/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/rbac/RbacAuthorizer.java (96%) rename redback-rbac/redback-authorization-rbac/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java (98%) rename redback-rbac/redback-authorization-rbac/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/rbac/evaluator/PermissionEvaluationException.java (94%) rename redback-rbac/redback-authorization-rbac/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/rbac/evaluator/PermissionEvaluator.java (94%) rename redback-rbac/redback-authorization-rbac/src/test/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java (91%) diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java similarity index 96% rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java index f39a219a..896ade57 100644 --- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java +++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization.rbac; +package org.apache.archiva.redback.authorization.rbac; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,8 +28,8 @@ 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.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluationException; +import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluator; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java similarity index 98% rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java index 39ab53c8..9947ea86 100644 --- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java +++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization.rbac.evaluator; +package org.apache.archiva.redback.authorization.rbac.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java similarity index 94% rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java index 92e7652a..6b0380f4 100644 --- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java +++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization.rbac.evaluator; +package org.apache.archiva.redback.authorization.rbac.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java similarity index 94% rename from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java rename to redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java index 922be0c2..f6423150 100644 --- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java +++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization.rbac.evaluator; +package org.apache.archiva.redback.authorization.rbac.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml index 26062d5f..9a306403 100644 --- a/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml +++ b/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml @@ -29,6 +29,6 @@ + base-package="org.apache.archiva.redback.authorization.rbac"/> \ No newline at end of file diff --git a/redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java b/redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java similarity index 91% rename from redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java rename to redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java index d96636da..ef678971 100644 --- a/redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java +++ b/redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization.rbac.evaluator; +package org.apache.archiva.redback.authorization.rbac.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,8 @@ package org.codehaus.plexus.redback.authorization.rbac.evaluator; */ import junit.framework.TestCase; +import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluationException; +import org.apache.archiva.redback.authorization.rbac.evaluator.PermissionEvaluator; import org.apache.archiva.redback.rbac.Permission; import org.apache.archiva.redback.rbac.Operation; import org.apache.archiva.redback.rbac.Resource;