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/11 18:13:06 UTC
svn commit: r1444880 - 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: Mon Feb 11 17:13:06 2013
New Revision: 1444880
URL: http://svn.apache.org/r1444880
Log:
add baseGroupDn 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-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
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=1444880&r1=1444879&r2=1444880&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 Mon Feb 11 17:13:06 2013
@@ -1572,6 +1572,12 @@
<type>String</type>
</field>
<field>
+ <name>baseGroupsDn</name>
+ <description>The LDAP base dn for groups (if empty baseDn is used).</description>
+ <version>1.4.0+</version>
+ <type>String</type>
+ </field>
+ <field>
<name>contextFactory</name>
<description>contextFactory to use.</description>
<version>1.4.0+</version>
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=1444880&r1=1444879&r2=1444880&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 Mon Feb 11 17:13:06 2013
@@ -66,6 +66,11 @@ public class LdapConfiguration
private String bindDn;
/**
+ * The LDAP base dn for groups (if empty baseDn is used).
+ */
+ private String baseGroupsDn;
+
+ /**
* The LDAP password.
*/
private String password;
@@ -216,4 +221,14 @@ public class LdapConfiguration
}
}
}
+
+ public String getBaseGroupsDn()
+ {
+ return baseGroupsDn;
+ }
+
+ public void setBaseGroupsDn( String baseGroupsDn )
+ {
+ this.baseGroupsDn = baseGroupsDn;
+ }
}
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=1444880&r1=1444879&r2=1444880&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 Mon Feb 11 17:13:06 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
@@ -118,6 +118,11 @@ public class DefaultRedbackRuntimeConfig
ldapConfiguration.setSsl( userConfiguration.getBoolean( UserConfigurationKeys.LDAP_SSL, false ) );
ldapConfiguration.setBaseDn(
userConfiguration.getConcatenatedList( UserConfigurationKeys.LDAP_BASEDN, null ) );
+
+ ldapConfiguration.setBaseGroupsDn(
+ userConfiguration.getConcatenatedList( UserConfigurationKeys.LDAP_GROUPS_BASEDN,
+ ldapConfiguration.getBaseDn() ) );
+
ldapConfiguration.setContextFactory(
userConfiguration.getString( UserConfigurationKeys.LDAP_CONTEX_FACTORY, null ) );
ldapConfiguration.setBindDn(
@@ -520,6 +525,10 @@ public class DefaultRedbackRuntimeConfig
{
return getRedbackRuntimeConfiguration().getLdapConfiguration().getBindDn();
}
+ if ( UserConfigurationKeys.LDAP_GROUPS_BASEDN.equals( key ) )
+ {
+ return getRedbackRuntimeConfiguration().getLdapConfiguration().getBaseGroupsDn();
+ }
return userConfiguration.getConcatenatedList( key, defaultValue );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java?rev=1444880&r1=1444879&r2=1444880&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java Mon Feb 11 17:13:06 2013
@@ -35,6 +35,7 @@ import org.springframework.context.Appli
import org.springframework.stereotype.Service;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.core.Response;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -63,6 +64,9 @@ public class DefaultSystemStatusService
private RepositoryScanner scanner;
+ // display spring scheduled
+ //@Inject @Named (value="springScheduler");
+
@Inject
public DefaultSystemStatusService( ApplicationContext applicationContext, RepositoryScanner scanner )