summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-04-07 22:49:09 +0000
committerOlivier Lamy <olamy@apache.org>2012-04-07 22:49:09 +0000
commit91af10462cbfea8985ca944b21a7530633e73bf2 (patch)
tree4dcff3f1f6d4365ca21a447808c4708200b9afc0
parentd8b78846755aca200164a0f44915346e8e98f9e6 (diff)
downloadarchiva-91af10462cbfea8985ca944b21a7530633e73bf2.tar.gz
archiva-91af10462cbfea8985ca944b21a7530633e73bf2.zip
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
-rw-r--r--redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java (renamed from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java)6
-rw-r--r--redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java (renamed from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java)2
-rw-r--r--redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java (renamed from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluationException.java)2
-rw-r--r--redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java (renamed from redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluator.java)2
-rw-r--r--redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml2
-rw-r--r--redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java (renamed from redback-rbac/redback-authorization-rbac/src/test/java/org/codehaus/plexus/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java)4
6 files changed, 10 insertions, 8 deletions
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
index f39a219ad..896ade572 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
index 39ab53c81..9947ea863 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
index 92e7652a4..6b0380f43 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
index 922be0c28..f64231502 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 26062d5fc..9a306403a 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 @@
<context:annotation-config />
<context:component-scan
- base-package="org.codehaus.plexus.redback.authorization.rbac"/>
+ base-package="org.apache.archiva.redback.authorization.rbac"/>
</beans> \ 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
index d96636da6..ef6789714 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;