From 2ab87f190776ece15838b3cc87bef553d8b58d81 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 7 Jan 2013 16:23:14 +0000
Subject: [PATCH] move this module in the correct place

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1429879 13f79535-47bb-0310-9956-ffa450edef68
---
 redback-authorization/redback-authorization-providers/pom.xml    | 1 +
 .../redback-authorization-rbac/pom.xml                           | 1 -
 .../archiva/redback/authorization/rbac/RbacAuthorizer.java       | 0
 .../authorization/rbac/evaluator/DefaultPermissionEvaluator.java | 0
 .../rbac/evaluator/PermissionEvaluationException.java            | 0
 .../authorization/rbac/evaluator/PermissionEvaluator.java        | 0
 .../src/main/resources/META-INF/spring-context.xml               | 0
 .../authorization/rbac/evaluator/PermissionEvaluatorTest.java    | 0
 .../src/test/resources/spring-context.xml                        | 0
 redback-rbac/pom.xml                                             | 1 -
 10 files changed, 1 insertion(+), 2 deletions(-)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/pom.xml (96%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java (100%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java (100%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java (100%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java (100%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml (100%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java (100%)
 rename {redback-rbac => redback-authorization/redback-authorization-providers}/redback-authorization-rbac/src/test/resources/spring-context.xml (100%)

diff --git a/redback-authorization/redback-authorization-providers/pom.xml b/redback-authorization/redback-authorization-providers/pom.xml
index 6ca72844e..30752876c 100644
--- a/redback-authorization/redback-authorization-providers/pom.xml
+++ b/redback-authorization/redback-authorization-providers/pom.xml
@@ -28,6 +28,7 @@
   <name>Redback :: Authorization Providers</name>
   <packaging>pom</packaging>
   <modules>
+    <module>redback-authorization-rbac</module>
     <module>redback-authorization-open</module>
     <module>redback-authorization-ldap</module>
   </modules>  
diff --git a/redback-rbac/redback-authorization-rbac/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
similarity index 96%
rename from redback-rbac/redback-authorization-rbac/pom.xml
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
index 7dab09593..b2eed3651 100644
--- a/redback-rbac/redback-authorization-rbac/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -25,7 +25,6 @@
     <groupId>org.apache.archiva.redback</groupId>
     <artifactId>redback-authorization-providers</artifactId>
     <version>2.1-SNAPSHOT</version>
-    <relativePath>../../redback-authorization/redback-authorization-providers/pom.xml</relativePath>
   </parent>
 
   <artifactId>redback-authorization-rbac</artifactId>
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluationException.java
diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluator.java
diff --git a/redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/resources/META-INF/spring-context.xml
diff --git a/redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/java/org/apache/archiva/redback/authorization/rbac/evaluator/PermissionEvaluatorTest.java
diff --git a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
similarity index 100%
rename from redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
rename to redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
diff --git a/redback-rbac/pom.xml b/redback-rbac/pom.xml
index f22411d19..08e0bd670 100644
--- a/redback-rbac/pom.xml
+++ b/redback-rbac/pom.xml
@@ -32,6 +32,5 @@
     <module>redback-rbac-providers</module>
     <module>redback-rbac-role-manager</module>
     <module>redback-rbac-tests</module>
-    <module>redback-authorization-rbac</module>
   </modules>
 </project>
-- 
2.39.5