archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1165203 - in /archiva/trunk: ./ archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-repository-admin/ archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ archiva-m...
Date Mon, 05 Sep 2011 08:31:36 GMT
Author: olamy
Date: Mon Sep  5 08:31:35 2011
New Revision: 1165203

URL: http://svn.apache.org/viewvc?rev=1165203&view=rev
Log:
[MRM-1504] Add a new module for repository administration management : move redback configuration
and role constants to a new module in archiva-base called archiva-security-common

Added:
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
      - copied, changed from r1165044, archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/
    archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml
      - copied, changed from r1165044, archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
    archiva/trunk/archiva-modules/archiva-base/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java
    archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml Mon Sep  5
08:31:35 2011
@@ -32,12 +32,9 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
-    <!-- FIXME should not be a dependency role constants must be moved in a new module
-    archiva-security-common
-     -->
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-security</artifactId>
+      <artifactId>archiva-security-common</artifactId>
     </dependency>
      <dependency>
       <groupId>org.apache.archiva</groupId>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
Mon Sep  5 08:31:35 2011
@@ -29,7 +29,7 @@ import org.apache.archiva.metadata.repos
 import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
 import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
 import org.apache.archiva.scheduler.repository.RepositoryTask;
-import org.apache.archiva.security.ArchivaRoleConstants;
+import org.apache.archiva.security.common.ArchivaRoleConstants;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.validator.GenericValidator;

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
Mon Sep  5 08:31:35 2011
@@ -18,16 +18,12 @@ package org.apache.archiva.admin.reposit
  * under the License.
  */
 
-import org.apache.archiva.admin.AuditInformation;
-import org.apache.archiva.admin.mock.MockAuditListener;
 import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest;
 import org.apache.archiva.audit.AuditEvent;
-import org.apache.archiva.security.ArchivaRoleConstants;
+import org.apache.archiva.security.common.ArchivaRoleConstants;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.redback.role.RoleManager;
-import org.codehaus.plexus.redback.users.User;
-import org.codehaus.plexus.redback.users.memory.SimpleUser;
 import org.junit.Test;
 
 import javax.inject.Inject;

Added: archiva/trunk/archiva-modules/archiva-base/archiva-security-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-security-common/pom.xml?rev=1165203&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-security-common/pom.xml (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-security-common/pom.xml Mon Sep  5
08:31:35 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>archiva-base</artifactId>
+    <groupId>org.apache.archiva</groupId>
+    <version>1.4-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.archiva</groupId>
+  <artifactId>archiva-security-common</artifactId>
+  <name>archiva-security-common</name>
+</project>

Copied: archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
(from r1165044, archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java&r1=1165044&r2=1165203&rev=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
Mon Sep  5 08:31:35 2011
@@ -1,4 +1,4 @@
-package org.apache.archiva.security;
+package org.apache.archiva.security.common;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml
(from r1165044, archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml&r1=1165044&r2=1165203&rev=1165203&view=diff
==============================================================================
    (empty)

Modified: archiva/trunk/archiva-modules/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/pom.xml?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/pom.xml Mon Sep  5 08:31:35 2011
@@ -47,5 +47,6 @@
     <module>archiva-repository-scanner</module>
     <module>archiva-proxy-common</module>
     <module>archiva-repository-admin</module>
+    <module>archiva-security-common</module>
   </modules>
 </project>
\ No newline at end of file

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml Mon Sep  5 08:31:35
2011
@@ -33,6 +33,10 @@
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-security-common</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaRoleConstants.java
Mon Sep  5 08:31:35 2011
@@ -19,68 +19,11 @@ package org.apache.archiva.security;
  * under the License.
  */
 
+/**
+ * @deprecated you must now use org.apache.archiva.security.common.ArchivaRoleConstants
+ */
 public class ArchivaRoleConstants
+    extends org.apache.archiva.security.common.ArchivaRoleConstants
 {
-    public static final String DELIMITER = " - ";
-
-    // globalish roles
-    public static final String SYSTEM_ADMINISTRATOR_ROLE = "System Administrator";
-
-    public static final String USER_ADMINISTRATOR_ROLE = "User Administrator";
-    
-    public static final String GLOBAL_REPOSITORY_MANAGER_ROLE = "Global Repository Manager";
-
-    public static final String GLOBAL_REPOSITORY_OBSERVER_ROLE = "Global Repository Observer";
-    
-    public static final String REGISTERED_USER_ROLE = "Registered User";
-
-    public static final String GUEST_ROLE = "Guest";
-    
-    // dynamic role prefixes
-    public static final String REPOSITORY_MANAGER_ROLE_PREFIX = "Repository Manager";
-
-    public static final String REPOSITORY_OBSERVER_ROLE_PREFIX = "Repository Observer";
-
-    // operations
-    public static final String OPERATION_MANAGE_USERS = "archiva-manage-users";
-
-    public static final String OPERATION_MANAGE_CONFIGURATION = "archiva-manage-configuration";
-
-    public static final String OPERATION_ACTIVE_GUEST = "archiva-guest";
-
-    public static final String OPERATION_RUN_INDEXER = "archiva-run-indexer";
-
-    public static final String OPERATION_REGENERATE_INDEX = "archiva-regenerate-index";
-
-    public static final String OPERATION_ACCESS_REPORT = "archiva-access-reports";
-
-    public static final String OPERATION_ADD_REPOSITORY = "archiva-add-repository";
-
-    public static final String OPERATION_REPOSITORY_ACCESS = "archiva-read-repository";
-
-    public static final String OPERATION_DELETE_REPOSITORY = "archiva-delete-repository";
-
-    public static final String OPERATION_EDIT_REPOSITORY = "archiva-edit-repository";
-
-    public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository";
-
-    public static final String OPERATION_REPOSITORY_DELETE = "archiva-delete-artifact";
-    
-    public static final String OPERATION_VIEW_AUDIT_LOG = "archiva-view-audit-logs";
-
-    // Role templates
-    public static final String TEMPLATE_REPOSITORY_MANAGER = "archiva-repository-manager";
-    
-    public static final String TEMPLATE_REPOSITORY_OBSERVER = "archiva-repository-observer";
-    
-    public static final String TEMPLATE_GLOBAL_REPOSITORY_OBSERVER = "archiva-global-repository-observer";

-    
-    public static final String TEMPLATE_SYSTEM_ADMIN = "archiva-system-administrator";
-    
-    public static final String TEMPLATE_GUEST = "archiva-guest";
-    
-    public static String toRepositoryObserverRoleName( String repoId )
-    {
-        return REPOSITORY_OBSERVER_ROLE_PREFIX + " - " + repoId;
-    }
+    // no op only here for backward comp
 }

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1165203&r1=1165202&r2=1165203&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Sep  5 08:31:35 2011
@@ -334,6 +334,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
+        <artifactId>archiva-security-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-signature-consumers</artifactId>
         <version>${project.version}</version>
       </dependency>



Mime
View raw message