You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/05/07 02:51:02 UTC
svn commit: r535698 - in
/directory/apacheds/branches/kerberos-encryption-types:
protocol-changepw/src/main/java/org/apache/directory/server/changepw/
protocol-dns/src/main/java/org/apache/directory/server/dns/
protocol-kerberos/src/main/java/org/apach...
Author: erodriguez
Date: Sun May 6 17:51:01 2007
New Revision: 535698
URL: http://svn.apache.org/viewvc?view=rev&rev=535698
Log:
Opened type safety on configuration maps to allow object passing as values.
Modified:
directory/apacheds/branches/kerberos-encryption-types/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java
directory/apacheds/branches/kerberos-encryption-types/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
directory/apacheds/branches/kerberos-encryption-types/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java?view=diff&rev=535698&r1=535697&r2=535698
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java Sun May 6 17:51:01 2007
@@ -111,20 +111,20 @@
* Creates a new instance with default settings that operates on the
* {@link DirectoryService} with the specified ID.
*/
- public ChangePasswordConfiguration(String instanceId)
+ public ChangePasswordConfiguration( String instanceId )
{
this( getDefaultConfig(), LoadStrategy.LDAP );
setInstanceId( instanceId );
}
- public ChangePasswordConfiguration( Map<String, String> properties )
+ public ChangePasswordConfiguration( Map<String, Object> properties )
{
this( properties, LoadStrategy.LDAP );
}
- public ChangePasswordConfiguration( Map<String, String> properties, int strategy )
+ public ChangePasswordConfiguration( Map<String, Object> properties, int strategy )
{
if ( properties == null )
{
@@ -146,9 +146,9 @@
}
- public static Map<String, String> getDefaultConfig()
+ public static Map<String, Object> getDefaultConfig()
{
- Map<String, String> defaults = new HashMap<String, String>();
+ Map<String, Object> defaults = new HashMap<String, Object>();
defaults.put( SERVICE_PID, DEFAULT_PID );
defaults.put( IP_PORT_KEY, DEFAULT_IP_PORT );
@@ -208,7 +208,7 @@
}
- public Map<String, String> getProperties()
+ public Map<String, Object> getProperties()
{
// Request that the krb5key value be returned as binary
configuration.put( JndiPropertyConstants.JNDI_LDAP_ATTRIBUTES_BINARY, "krb5Key" );
@@ -338,9 +338,9 @@
List<EncryptionType> encTypes = new ArrayList<EncryptionType>();
- for ( String enc:encryptionTypeStrings )
+ for ( String enc : encryptionTypeStrings )
{
- for ( EncryptionType type:EncryptionType.VALUES )
+ for ( EncryptionType type : EncryptionType.VALUES )
{
if ( type.toString().equalsIgnoreCase( enc ) )
{
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java?view=diff&rev=535698&r1=535697&r2=535698
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java Sun May 6 17:51:01 2007
@@ -64,20 +64,20 @@
* Creates a new instance with default settings that operates on the
* {@link DirectoryService} with the specified ID.
*/
- public DnsConfiguration(String instanceId)
+ public DnsConfiguration( String instanceId )
{
this( getDefaultConfig(), LoadStrategy.LDAP );
setInstanceId( instanceId );
}
- public DnsConfiguration( Map<String, String> properties )
+ public DnsConfiguration( Map<String, Object> properties )
{
this( properties, LoadStrategy.LDAP );
}
- public DnsConfiguration( Map<String, String> properties, int strategy )
+ public DnsConfiguration( Map<String, Object> properties, int strategy )
{
if ( properties == null )
{
@@ -97,9 +97,9 @@
}
- public static Map<String, String> getDefaultConfig()
+ public static Map<String, Object> getDefaultConfig()
{
- Map<String, String> defaults = new HashMap<String, String>();
+ Map<String, Object> defaults = new HashMap<String, Object>();
defaults.put( SERVICE_PID, DEFAULT_PID );
defaults.put( IP_PORT_KEY, DEFAULT_IP_PORT );
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java?view=diff&rev=535698&r1=535697&r2=535698
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java Sun May 6 17:51:01 2007
@@ -144,20 +144,20 @@
* Creates a new instance with default settings that operates on the
* {@link DirectoryService} with the specified ID.
*/
- public KdcConfiguration(String instanceId)
+ public KdcConfiguration( String instanceId )
{
this( getDefaultConfig(), LoadStrategy.LDAP );
setInstanceId( instanceId );
}
- public KdcConfiguration( Map<String, String> properties )
+ public KdcConfiguration( Map<String, Object> properties )
{
this( properties, LoadStrategy.LDAP );
}
- public KdcConfiguration( Map<String, String> properties, int strategy )
+ public KdcConfiguration( Map<String, Object> properties, int strategy )
{
if ( properties == null )
{
@@ -179,9 +179,9 @@
}
- public static Map<String, String> getDefaultConfig()
+ public static Map<String, Object> getDefaultConfig()
{
- Map<String, String> defaults = new HashMap<String, String>();
+ Map<String, Object> defaults = new HashMap<String, Object>();
defaults.put( SERVICE_PID, DEFAULT_PID );
defaults.put( IP_PORT_KEY, DEFAULT_IP_PORT );
@@ -254,7 +254,7 @@
}
- public Map<String, String> getProperties()
+ public Map<String, Object> getProperties()
{
// Request that the krb5key value be returned as binary
configuration.put( JndiPropertyConstants.JNDI_LDAP_ATTRIBUTES_BINARY, "krb5Key" );
@@ -423,9 +423,9 @@
List<EncryptionType> encTypes = new ArrayList<EncryptionType>();
- for ( String enc:encryptionTypeStrings )
+ for ( String enc : encryptionTypeStrings )
{
- for ( EncryptionType type:EncryptionType.VALUES )
+ for ( EncryptionType type : EncryptionType.VALUES )
{
if ( type.getName().equalsIgnoreCase( enc ) )
{
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java?view=diff&rev=535698&r1=535697&r2=535698
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java Sun May 6 17:51:01 2007
@@ -65,20 +65,20 @@
* Creates a new instance with default settings that operates on the
* {@link DirectoryService} with the specified ID.
*/
- public NtpConfiguration(String instanceId)
+ public NtpConfiguration( String instanceId )
{
this( getDefaultConfig(), LoadStrategy.LDAP );
setInstanceId( instanceId );
}
- public NtpConfiguration( Map<String, String> properties )
+ public NtpConfiguration( Map<String, Object> properties )
{
this( properties, LoadStrategy.LDAP );
}
- public NtpConfiguration( Map<String, String> properties, int strategy )
+ public NtpConfiguration( Map<String, Object> properties, int strategy )
{
if ( properties == null )
{
@@ -98,9 +98,9 @@
}
- public static Map<String, String> getDefaultConfig()
+ public static Map<String, Object> getDefaultConfig()
{
- Map<String, String> defaults = new HashMap<String, String>();
+ Map<String, Object> defaults = new HashMap<String, Object>();
defaults.put( SERVICE_PID, DEFAULT_PID );
defaults.put( IP_PORT_KEY, DEFAULT_IP_PORT );