svn commit: r1434422 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin: archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/rep...

[olamy]

Author: olamy
Date: Wed Jan 16 21:48:35 2013
New Revision: 1434422

URL: http://svn.apache.org/viewvc?rev=1434422&view=rev
Log:
fix dynamic usage of rbac manager impl

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java?rev=1434422&r1=1434421&r2=1434422&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
 Wed Jan 16 21:48:35 2013
@@ -42,7 +42,7 @@ public class RedbackRuntimeConfiguration
     /**
      * Field rbacManagerImpls.
      */
-    private java.util.List<String> rbacManagerImpls;
+    private java.util.List<String> rbacManagerImpls = new ArrayList<String>();
 
     private LdapConfiguration ldapConfiguration;
 

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1434422&r1=1434421&r2=1434422&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
 Wed Jan 16 21:48:35 2013
@@ -49,7 +49,7 @@ import java.util.Set;
  * @author Olivier Lamy
  * @since 1.4-M4
  */
-@Service("userConfiguration#archiva")
+@Service( "userConfiguration#archiva" )
 public class DefaultRedbackRuntimeConfigurationAdmin
     implements RedbackRuntimeConfigurationAdmin, UserConfiguration
 {
@@ -60,11 +60,11 @@ public class DefaultRedbackRuntimeConfig
     private ArchivaConfiguration archivaConfiguration;
 
     @Inject
-    @Named(value = "userConfiguration#redback")
+    @Named( value = "userConfiguration#redback" )
     UserConfiguration userConfiguration;
 
     @Inject
-    @Named(value = "cache#users")
+    @Named( value = "cache#users" )
     private Cache usersCache;
 
     @PostConstruct
@@ -77,22 +77,17 @@ public class DefaultRedbackRuntimeConfig
             // migrate or not data from redback
             if ( 
!redbackRuntimeConfiguration.isMigratedFromRedbackConfiguration() )
             {
+                // not migrated so build a new fresh one
+                redbackRuntimeConfiguration = new 
RedbackRuntimeConfiguration();
                 // so migrate if available
                 String userManagerImpl =
                     userConfiguration.getConcatenatedList( 
UserConfigurationKeys.USER_MANAGER_IMPL, "jdo" );
                 if ( StringUtils.isNotEmpty( userManagerImpl ) )
                 {
-                    if ( StringUtils.contains( userManagerImpl, ',' ) )
+                    String[] impls = StringUtils.split( userManagerImpl, ',' );
+                    for ( String impl : impls )
                     {
-                        String[] impls = StringUtils.split( userManagerImpl, 
',' );
-                        for ( String impl : impls )
-                        {
-                            
redbackRuntimeConfiguration.getUserManagerImpls().add( impl );
-                        }
-                    }
-                    else
-                    {
-                        redbackRuntimeConfiguration.getUserManagerImpls().add( 
userManagerImpl );
+                        redbackRuntimeConfiguration.getUserManagerImpls().add( 
impl );
                     }
                 }
 
@@ -101,17 +96,10 @@ public class DefaultRedbackRuntimeConfig
 
                 if ( StringUtils.isNotEmpty( rbacManagerImpls ) )
                 {
-                    if ( StringUtils.contains( rbacManagerImpls, ',' ) )
-                    {
-                        String[] impls = StringUtils.split( rbacManagerImpls, 
',' );
-                        for ( String impl : impls )
-                        {
-                            
redbackRuntimeConfiguration.getRbacManagerImpls().add( impl );
-                        }
-                    }
-                    else
+                    String[] impls = StringUtils.split( rbacManagerImpls, ',' 
);
+                    for ( String impl : impls )
                     {
-                        redbackRuntimeConfiguration.getRbacManagerImpls().add( 
userManagerImpl );
+                        redbackRuntimeConfiguration.getRbacManagerImpls().add( 
impl );
                     }
                 }