You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/12 21:38:31 UTC
svn commit: r1445346 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-configuration/src/main/mdo/
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/
archiva-base/archiva-repos...
Author: olamy
Date: Tue Feb 12 20:38:31 2013
New Revision: 1445346
URL: http://svn.apache.org/r1445346
Log:
map property ldap.config.groups.use.rolename in archiva configuration
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.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
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1445346&r1=1445345&r2=1445346&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Tue Feb 12 20:38:31 2013
@@ -1617,6 +1617,13 @@
<defaultValue>false</defaultValue>
</field>
<field>
+ <name>useRoleNameAsGroup</name>
+ <description>Will use role name as LDAP group.</description>
+ <version>1.4.0+</version>
+ <type>boolean</type>
+ <defaultValue>false</defaultValue>
+ </field>
+ <field>
<name>extraProperties</name>
<version>1.4.0+</version>
<type>Map</type>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.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/LdapConfiguration.java?rev=1445346&r1=1445345&r2=1445346&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java Tue Feb 12 20:38:31 2013
@@ -86,6 +86,11 @@ public class LdapConfiguration
private boolean bindAuthenticatorEnabled;
/**
+ * Will use role name as LDAP group.
+ */
+ private boolean useRoleNameAsGroup = false;
+
+ /**
* Field extraProperties.
*/
private Map<String, String> extraProperties = new HashMap<String, String>();
@@ -246,4 +251,14 @@ public class LdapConfiguration
{
this.writable = writable;
}
+
+ public boolean isUseRoleNameAsGroup()
+ {
+ return useRoleNameAsGroup;
+ }
+
+ public void setUseRoleNameAsGroup( boolean useRoleNameAsGroup )
+ {
+ this.useRoleNameAsGroup = useRoleNameAsGroup;
+ }
}
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=1445346&r1=1445345&r2=1445346&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 Tue Feb 12 20:38:31 2013
@@ -135,6 +135,9 @@ public class DefaultRedbackRuntimeConfig
ldapConfiguration.setWritable(
userConfiguration.getBoolean( UserConfigurationKeys.LDAP_WRITABLE, false ) );
+ ldapConfiguration.setUseRoleNameAsGroup(
+ userConfiguration.getBoolean( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME, false ) );
+
redbackRuntimeConfiguration.setMigratedFromRedbackConfiguration( true );
updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration );
@@ -452,6 +455,11 @@ public class DefaultRedbackRuntimeConfig
return conf.getLdapConfiguration().isWritable();
}
+ if ( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME.equals( key ) )
+ {
+ return conf.getLdapConfiguration().isUseRoleNameAsGroup();
+ }
+
if ( conf.getConfigurationProperties().containsKey( key ) )
{
return Boolean.valueOf( conf.getConfigurationProperties().get( key ) );
@@ -485,6 +493,11 @@ public class DefaultRedbackRuntimeConfig
return getRedbackRuntimeConfiguration().getLdapConfiguration().isWritable();
}
+ if ( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME.equals( key ) )
+ {
+ return getRedbackRuntimeConfiguration().getLdapConfiguration().isUseRoleNameAsGroup();
+ }
+
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=1445346&r1=1445345&r2=1445346&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 Tue Feb 12 20:38:31 2013
@@ -1290,7 +1290,7 @@ define("archiva.general-admin",["jquery"
}
LdapConfiguration=function(hostName,port,ssl,baseDn,baseGroupsDn,contextFactory,bindDn,password,authenticationMethod,
- extraPropertiesEntries,writable){
+ extraPropertiesEntries,writable,useRoleNameAsGroup){
var self=this;
this.modified=ko.observable(false);
@@ -1338,6 +1338,10 @@ define("archiva.general-admin",["jquery"
this.writable=ko.observable(writable);
this.writable.subscribe(function(newValue){self.modified(true)});
+ // useRoleNameAsGroup
+ this.useRoleNameAsGroup=ko.observable(useRoleNameAsGroup);
+ this.useRoleNameAsGroup.subscribe(function(newValue){self.modified(true)});
+
}
mapLdapConfiguration=function(data){
@@ -1351,7 +1355,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.authenticationMethod,extraPropertiesEntries,data.writable,data.useRoleNameAsGroup);
}
return null;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html?rev=1445346&r1=1445345&r2=1445346&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html Tue Feb 12 20:38:31 2013
@@ -1071,6 +1071,16 @@
</div>
</div>
<div class="control-group">
+ <label for="ldap-useRoleNameAsGroup" class="control-label">
+ ${$.i18n.prop('redback.runtime.ldap.useRoleNameAsGroup.label')}
+ </label>
+ <div class="controls">
+ <input type="checkbox" id="ldap-useRoleNameAsGroup" name="ldap-useRoleNameAsGroup"
+ data-bind="checked: redbackRuntimeConfiguration().ldapConfiguration().useRoleNameAsGroup"/>
+ </div>
+ </div>
+
+ <div class="control-group">
<label for="ldapPassword" class="control-label">
${$.i18n.prop('redback.runtime.ldap.password.label')}
</label>