svn commit: r1418312 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java

[olamy]

Author: olamy
Date: Fri Dec  7 13:54:36 2012
New Revision: 1418312

URL: http://svn.apache.org/viewvc?rev=1418312&view=rev
Log:
fix bean mapping

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.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/DefaultArchivaRuntimeConfigurationAdmin.java?rev=1418312&r1=1418311&r2=1418312&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
 Fri Dec  7 13:54:36 2012
@@ -78,8 +78,7 @@ public class DefaultArchivaRuntimeConfig
 
                 // now ldap
 
-                LdapConfiguration ldapConfiguration =
-                    archivaRuntimeConfiguration.getLdapConfiguration();
+                LdapConfiguration ldapConfiguration = 
archivaRuntimeConfiguration.getLdapConfiguration();
                 if ( ldapConfiguration == null )
                 {
                     ldapConfiguration = new LdapConfiguration();
@@ -89,8 +88,7 @@ public class DefaultArchivaRuntimeConfig
                 ldapConfiguration.setHostName(
                     userConfiguration.getString( 
UserConfigurationKeys.LDAP_HOSTNAME, null ) );
                 ldapConfiguration.setPort( userConfiguration.getInt( 
UserConfigurationKeys.LDAP_PORT, -1 ) );
-                ldapConfiguration.setSsl(
-                    userConfiguration.getBoolean( 
UserConfigurationKeys.LDAP_SSL, false ) );
+                ldapConfiguration.setSsl( userConfiguration.getBoolean( 
UserConfigurationKeys.LDAP_SSL, false ) );
                 ldapConfiguration.setBaseDn(
                     userConfiguration.getConcatenatedList( 
UserConfigurationKeys.LDAP_BASEDN, null ) );
                 ldapConfiguration.setContextFactory(
@@ -141,9 +139,10 @@ public class DefaultArchivaRuntimeConfig
 
     private ArchivaRuntimeConfiguration build( RedbackRuntimeConfiguration 
runtimeConfiguration )
     {
-        ArchivaRuntimeConfiguration archivaRuntimeConfiguration = new 
BeanReplicator().replicateBean( runtimeConfiguration, 
ArchivaRuntimeConfiguration.class );
+        ArchivaRuntimeConfiguration archivaRuntimeConfiguration =
+            new BeanReplicator().replicateBean( runtimeConfiguration, 
ArchivaRuntimeConfiguration.class );
 
-        if (archivaRuntimeConfiguration.getLdapConfiguration() == null)
+        if ( archivaRuntimeConfiguration.getLdapConfiguration() == null )
         {
             // prevent NPE
             archivaRuntimeConfiguration.setLdapConfiguration( new 
LdapConfiguration() );
@@ -154,7 +153,13 @@ public class DefaultArchivaRuntimeConfig
 
     private RedbackRuntimeConfiguration build( ArchivaRuntimeConfiguration 
archivaRuntimeConfiguration )
     {
-        RedbackRuntimeConfiguration redbackRuntimeConfiguration = new 
BeanReplicator().replicateBean( archivaRuntimeConfiguration, 
RedbackRuntimeConfiguration.class );
+        RedbackRuntimeConfiguration redbackRuntimeConfiguration =
+            new BeanReplicator().replicateBean( archivaRuntimeConfiguration, 
RedbackRuntimeConfiguration.class );
+
+        redbackRuntimeConfiguration.setLdapConfiguration(
+            new BeanReplicator().replicateBean( 
archivaRuntimeConfiguration.getLdapConfiguration(),
+                                                
org.apache.archiva.configuration.LdapConfiguration.class ) );
+
         return redbackRuntimeConfiguration;
     }
 
@@ -274,7 +279,6 @@ public class DefaultArchivaRuntimeConfig
             return 
getArchivaRuntimeConfiguration().getLdapConfiguration().getPort();
         }
 
-
         ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
 
         if ( conf.getConfigurationProperties().containsKey( key ) )
@@ -339,7 +343,6 @@ public class DefaultArchivaRuntimeConfig
 
         boolean value = userConfiguration.getBoolean( key );
 
-
         conf.getConfigurationProperties().put( key, Boolean.toString( value ) 
);
         try
         {