Author: olamy
Date: Mon Dec 10 22:33:25 2012
New Revision: 1419841
URL: http://svn.apache.org/viewvc?rev=1419841&view=rev
Log:
make that more easy to override
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java?rev=1419841&r1=1419840&r2=1419841&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
Mon Dec 10 22:33:25 2012
@@ -59,7 +59,7 @@ public class ConfigurableLdapConnectionF
private Properties extraProperties;
- private LdapConnectionConfiguration configuration;
+ private LdapConnectionConfiguration ldapConnectionConfiguration;
@Inject
@@ -74,18 +74,18 @@ public class ConfigurableLdapConnectionF
{
try
{
- configuration = new LdapConnectionConfiguration();
- configuration.setHostname( userConf.getString(
UserConfigurationKeys.LDAP_HOSTNAME, hostname ) );
- configuration.setPort( userConf.getInt(
UserConfigurationKeys.LDAP_PORT, port ) );
- configuration.setSsl( userConf.getBoolean(
UserConfigurationKeys.LDAP_SSL, ssl ) );
- configuration.setBaseDn( userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_BASEDN, baseDn ) );
- configuration.setContextFactory(
+ ldapConnectionConfiguration = new LdapConnectionConfiguration();
+ ldapConnectionConfiguration.setHostname( userConf.getString(
UserConfigurationKeys.LDAP_HOSTNAME, hostname ) );
+ ldapConnectionConfiguration.setPort( userConf.getInt(
UserConfigurationKeys.LDAP_PORT, port ) );
+ ldapConnectionConfiguration.setSsl( userConf.getBoolean(
UserConfigurationKeys.LDAP_SSL, ssl ) );
+ ldapConnectionConfiguration.setBaseDn(
userConf.getConcatenatedList( UserConfigurationKeys.LDAP_BASEDN, baseDn ) );
+ ldapConnectionConfiguration.setContextFactory(
userConf.getString( UserConfigurationKeys.LDAP_CONTEX_FACTORY,
contextFactory ) );
- configuration.setBindDn( userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_BINDDN, bindDn ) );
- configuration.setPassword( userConf.getString(
UserConfigurationKeys.LDAP_PASSWORD, password ) );
- configuration.setAuthenticationMethod(
+ ldapConnectionConfiguration.setBindDn(
userConf.getConcatenatedList( UserConfigurationKeys.LDAP_BINDDN, bindDn ) );
+ ldapConnectionConfiguration.setPassword( userConf.getString(
UserConfigurationKeys.LDAP_PASSWORD, password ) );
+ ldapConnectionConfiguration.setAuthenticationMethod(
userConf.getString(
UserConfigurationKeys.LDAP_AUTHENTICATION_METHOD, authenticationMethod ) );
- configuration.setExtraProperties( extraProperties );
+ ldapConnectionConfiguration.setExtraProperties( extraProperties );
}
catch ( InvalidNameException e )
{
@@ -100,19 +100,19 @@ public class ConfigurableLdapConnectionF
public LdapConnection getConnection()
throws LdapException
{
- return new LdapConnection( configuration, null );
+ return new LdapConnection( getLdapConnectionConfiguration(), null );
}
public LdapConnection getConnection( Rdn subRdn )
throws LdapException
{
- return new LdapConnection( configuration, subRdn );
+ return new LdapConnection( getLdapConnectionConfiguration(), subRdn );
}
public LdapConnection getConnection( String bindDn, String password )
throws LdapException
{
- return new LdapConnection( configuration, bindDn, password );
+ return new LdapConnection( getLdapConnectionConfiguration(), bindDn,
password );
}
public LdapName getBaseDnLdapName()
@@ -130,12 +130,12 @@ public class ConfigurableLdapConnectionF
public void addObjectFactory( Class<? extends ObjectFactory>
objectFactoryClass )
{
- configuration.getObjectFactories().add( objectFactoryClass );
+ getLdapConnectionConfiguration().getObjectFactories().add(
objectFactoryClass );
}
public void addStateFactory( Class<? extends StateFactory>
stateFactoryClass )
{
- configuration.getStateFactories().add( stateFactoryClass );
+ getLdapConnectionConfiguration().getStateFactories().add(
stateFactoryClass );
}
// ----------------------------------------------------------------------
@@ -144,12 +144,17 @@ public class ConfigurableLdapConnectionF
public String toString()
{
- return "{ConfigurableLdapConnectionFactory: configuration: " +
configuration + "}";
+ return "{ConfigurableLdapConnectionFactory: configuration: " +
getLdapConnectionConfiguration() + "}";
}
- public LdapConnectionConfiguration getConfiguration()
+ public LdapConnectionConfiguration getLdapConnectionConfiguration()
{
- return configuration;
+ return ldapConnectionConfiguration;
+ }
+
+ public void setLdapConnectionConfiguration( LdapConnectionConfiguration
ldapConnectionConfiguration )
+ {
+ this.ldapConnectionConfiguration = ldapConnectionConfiguration;
}
public String getHostname()
