archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1445544 - in /archiva/trunk/archiva-modules: archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/ archiva-web/archiva-webapp/src/main/webapp/js/archiva/
Date Wed, 13 Feb 2013 10:31:28 GMT
Author: olamy
Date: Wed Feb 13 10:31:28 2013
New Revision: 1445544

URL: http://svn.apache.org/r1445544
Log:
add ldap bind authenticator enabled as a archiva config

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
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js

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=1445544&r1=1445543&r2=1445544&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 Feb 13 10:31:28 2013
@@ -138,6 +138,9 @@ public class DefaultRedbackRuntimeConfig
                 ldapConfiguration.setUseRoleNameAsGroup(
                     userConfiguration.getBoolean( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME,
false ) );
 
+                ldapConfiguration.setBindAuthenticatorEnabled(
+                    userConfiguration.getBoolean( UserConfigurationKeys.LDAP_BIND_AUTHENTICATOR_ENABLED,
false ) );
+
                 redbackRuntimeConfiguration.setMigratedFromRedbackConfiguration( true );
 
                 updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration );
@@ -460,6 +463,11 @@ public class DefaultRedbackRuntimeConfig
             return conf.getLdapConfiguration().isUseRoleNameAsGroup();
         }
 
+        if ( UserConfigurationKeys.LDAP_BIND_AUTHENTICATOR_ENABLED.equals( key ) )
+        {
+            return conf.getLdapConfiguration().isBindAuthenticatorEnabled();
+        }
+
         if ( conf.getConfigurationProperties().containsKey( key ) )
         {
             return Boolean.valueOf( conf.getConfigurationProperties().get( key ) );
@@ -498,6 +506,11 @@ public class DefaultRedbackRuntimeConfig
             return getRedbackRuntimeConfiguration().getLdapConfiguration().isUseRoleNameAsGroup();
         }
 
+        if ( UserConfigurationKeys.LDAP_BIND_AUTHENTICATOR_ENABLED.equals( key ) )
+        {
+            return getRedbackRuntimeConfiguration().getLdapConfiguration().isBindAuthenticatorEnabled();
+        }
+
         RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
 
         if ( conf.getConfigurationProperties().containsKey( key ) )

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1445544&r1=1445543&r2=1445544&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
Wed Feb 13 10:31:28 2013
@@ -1290,7 +1290,7 @@ define("archiva.general-admin",["jquery"
   }
 
   LdapConfiguration=function(hostName,port,ssl,baseDn,baseGroupsDn,contextFactory,bindDn,password,authenticationMethod,
-                             extraPropertiesEntries,writable,useRoleNameAsGroup){
+                             extraPropertiesEntries,writable,useRoleNameAsGroup,bindAuthenticatorEnabled){
 
     var self=this;
     this.modified=ko.observable(false);
@@ -1342,6 +1342,8 @@ define("archiva.general-admin",["jquery"
     this.useRoleNameAsGroup=ko.observable(useRoleNameAsGroup);
     this.useRoleNameAsGroup.subscribe(function(newValue){self.modified(true)});
 
+    //bindAuthenticatorEnabled
+
   }
 
   mapLdapConfiguration=function(data){
@@ -1355,7 +1357,7 @@ define("archiva.general-admin",["jquery"
         }
         $.log("mapLdapConfiguration done");
         return new LdapConfiguration(data.hostName,data.port,data.ssl,data.baseDn,data.baseGroupsDn,data.contextFactory,data.bindDn,data.password,
-                                    data.authenticationMethod,extraPropertiesEntries,data.writable,data.useRoleNameAsGroup);
+                                    data.authenticationMethod,extraPropertiesEntries,data.writable,data.useRoleNameAsGroup,data.bindAuthenticatorEnabled);
       }
       return null;
   }



Mime
View raw message