You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/26 00:47:30 UTC
svn commit: r1027292 -
/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/
Author: elecharny
Date: Mon Oct 25 22:47:29 2010
New Revision: 1027292
URL: http://svn.apache.org/viewvc?rev=1027292&view=rev
Log:
Updated the fields to be able to process DNs
Modified:
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java Mon Oct 25 22:47:29 2010
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.config.beans;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -81,6 +82,9 @@ public abstract class AdsBaseBean
}
+ /**
+ * Formated print of a boolean
+ */
protected String toString( String tabs, String name, boolean value )
{
StringBuilder sb = new StringBuilder();
@@ -102,6 +106,9 @@ public abstract class AdsBaseBean
}
+ /**
+ * Formated print of a String that can be null
+ */
protected String toString( String tabs, String name, String value )
{
if ( value != null )
@@ -115,6 +122,25 @@ public abstract class AdsBaseBean
}
+ /**
+ * Formated print of a DN that can be null
+ */
+ protected String toString( String tabs, String name, DN value )
+ {
+ if ( value != null )
+ {
+ return tabs + name + " : " + value.getName() + "\n";
+ }
+ else
+ {
+ return "";
+ }
+ }
+
+
+ /**
+ * Formated print of a long
+ */
protected String toString( String tabs, String name, long value )
{
return tabs + name + " : " + value + "\n";
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java Mon Oct 25 22:47:29 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.config.beans;
+import org.apache.directory.shared.ldap.name.DN;
+
/**
* A class used to store the KdcServer configuration.
@@ -33,7 +35,7 @@ public class DSBasedServerBean extends S
* configuration for catalog entries. Otherwise it will use this
* search base as a single point of searching the DIT.
*/
- private String searchBaseDN;
+ private DN searchBaseDN;
/**
* Create a new JournalBean instance
@@ -49,7 +51,7 @@ public class DSBasedServerBean extends S
*
* @return The search base DN.
*/
- public String getSearchBaseDn()
+ public DN getSearchBaseDn()
{
return searchBaseDN;
}
@@ -58,7 +60,7 @@ public class DSBasedServerBean extends S
/**
* @param searchBaseDn The searchBaseDn to set.
*/
- public void setSearchBaseDn( String searchBaseDn )
+ public void setSearchBaseDn( DN searchBaseDn )
{
this.searchBaseDN = searchBaseDn;
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Mon Oct 25 22:47:29 2010
@@ -159,7 +159,7 @@ public class DirectoryServiceBean extend
*
* @param interceptors the interceptors to be added in the server.
*/
- public void addinterceptors( InterceptorBean... interceptors )
+ public void addInterceptors( InterceptorBean... interceptors )
{
for ( InterceptorBean interceptor : interceptors )
{
@@ -351,7 +351,7 @@ public class DirectoryServiceBean extend
/**
* @param partitions the partitions to add
*/
- public void addpartitions( PartitionBean... partitions )
+ public void addPartitions( PartitionBean... partitions )
{
for ( PartitionBean partition : partitions )
{
@@ -381,7 +381,7 @@ public class DirectoryServiceBean extend
/**
* @param servers the servers to add
*/
- public void addservers( ServerBean... servers )
+ public void addServers( ServerBean... servers )
{
for ( ServerBean server : servers )
{
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java Mon Oct 25 22:47:29 2010
@@ -104,7 +104,7 @@ public class KdcServerBean extends DSBas
private List<String> krbEncryptionTypes = new ArrayList<String>();
/** The service principal name. */
- private String krbkdcprincipal = DEFAULT_PRINCIPAL;
+ private String krbKdcPrincipal = DEFAULT_PRINCIPAL;
/**
* Create a new KdcServerBean instance
@@ -354,7 +354,7 @@ public class KdcServerBean extends DSBas
*/
public KerberosPrincipal getKrbKdcPrincipal()
{
- return new KerberosPrincipal( krbkdcprincipal );
+ return new KerberosPrincipal( krbKdcPrincipal );
}
@@ -363,7 +363,7 @@ public class KdcServerBean extends DSBas
*/
public void setKrbKdcPrincipal( String krbKdcPrincipal )
{
- this.krbkdcprincipal = krbKdcPrincipal;
+ this.krbKdcPrincipal = krbKdcPrincipal;
}
@@ -384,7 +384,7 @@ public class KdcServerBean extends DSBas
sb.append( toString( tabs, " proxiable allowed", krbProxiableAllowed ) );
sb.append( toString( tabs, " renew allowed", krbRenewableAllowed ) );
sb.append( toString( tabs, " allowable clock skew", krbAllowableClockSkew ) );
- sb.append( toString( tabs, " KDC principal", krbkdcprincipal ) );
+ sb.append( toString( tabs, " KDC principal", krbKdcPrincipal ) );
sb.append( toString( tabs, " maximum renewable lifetime", krbMaximumRenewableLifetime ) );
sb.append( toString( tabs, " maximum ticket lifetime", krbMaximumTicketLifetime ) );
sb.append( toString( tabs, " primary realm", krbPrimaryRealm ) );
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Mon Oct 25 22:47:29 2010
@@ -33,7 +33,7 @@ import java.util.Set;
public class LdapServerBean extends DSBasedServerBean
{
/** */
- private boolean confidentialityrequired;
+ private boolean confidentialityRequired;
/** The maximum number of entries returned by the server */
private int maxSizeLimit;
@@ -91,7 +91,7 @@ public class LdapServerBean extends DSBa
*/
public boolean isLdapServerConfidentialityRequired()
{
- return confidentialityrequired;
+ return confidentialityRequired;
}
@@ -100,7 +100,7 @@ public class LdapServerBean extends DSBa
*/
public void setLdapServerConfidentialityRequired( boolean ldapServerConfidentialityRequired )
{
- this.confidentialityrequired = ldapServerConfidentialityRequired;
+ this.confidentialityRequired = ldapServerConfidentialityRequired;
}
@@ -407,7 +407,7 @@ public class LdapServerBean extends DSBa
sb.append( toString( tabs, " keystore file", keystoreFile ) );
sb.append( toString( tabs, " sasl principal", saslPrincipal ) );
sb.append( tabs ).append( " sasl host : " ).append( saslHost ).append( '\n' );
- sb.append( toString( tabs, " confidentiality required", confidentialityrequired ) );
+ sb.append( toString( tabs, " confidentiality required", confidentialityRequired ) );
sb.append( toString( tabs, " enable replication provider", enableReplProvider ) );
if ( ( extendedOpHandlers != null ) && ( extendedOpHandlers.size() > 0 ) )
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Mon Oct 25 22:47:29 2010
@@ -21,6 +21,8 @@ package org.apache.directory.server.conf
import java.util.List;
+import org.apache.directory.shared.ldap.name.DN;
+
/**
* A class used to store the Partition configuration. It can't be instanciated
*
@@ -32,7 +34,7 @@ public abstract class PartitionBean exte
private String partitionId;
/** The Partition suffix */
- private String partitionSuffix;
+ private DN partitionSuffix;
/** Tells if the data should be flushed to disk immediately */
private boolean partitionSyncOnWrite;
@@ -69,7 +71,7 @@ public abstract class PartitionBean exte
/**
* @return the partitionSuffix
*/
- public String getPartitionSuffix()
+ public DN getPartitionSuffix()
{
return partitionSuffix;
}
@@ -78,7 +80,7 @@ public abstract class PartitionBean exte
/**
* @param partitionSuffix the partitionSuffix to set
*/
- public void setPartitionSuffix( String partitionSuffix )
+ public void setPartitionSuffix( DN partitionSuffix )
{
this.partitionSuffix = partitionSuffix;
}
@@ -129,7 +131,7 @@ public abstract class PartitionBean exte
sb.append( super.toString( tabs + " " ) );
sb.append( tabs ).append( " partition ID : " ).append( partitionId ).append( '\n' );
- sb.append( tabs ).append( " suffix : " ).append( partitionSuffix ).append( '\n' );
+ sb.append( tabs ).append( " suffix : " ).append( partitionSuffix.getName() ).append( '\n' );
sb.append( toString( tabs, " sync on write", partitionSyncOnWrite ) );
sb.append( tabs ).append( " indexes : \n" );
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java Mon Oct 25 22:47:29 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.config.beans;
+import org.apache.directory.shared.ldap.name.DN;
+
/**
* A class used to store the Replication Consumer configuration.
@@ -37,7 +39,7 @@ public class ReplConsumerBean extends Ad
private String replAliasDerefMode;
/** The Search Base DN */
- private String searchBaseDN;
+ private DN searchBaseDN;
/** The last CSN sent */
private String replLastSentCsn;
@@ -129,7 +131,7 @@ public class ReplConsumerBean extends Ad
/**
* @return the searchBaseDN
*/
- public String getSearchBaseDN()
+ public DN getSearchBaseDN()
{
return searchBaseDN;
}
@@ -138,7 +140,7 @@ public class ReplConsumerBean extends Ad
/**
* @param searchBaseDN the searchBaseDN to set
*/
- public void setSearchBaseDN( String searchBaseDN )
+ public void setSearchBaseDN( DN searchBaseDN )
{
this.searchBaseDN = searchBaseDN;
}
@@ -283,7 +285,7 @@ public class ReplConsumerBean extends Ad
sb.append( tabs ).append( " consumer ID : " ).append( replConsumerId ).append( '\n' );
sb.append( tabs ).append( " replica ID : " ).append( dsReplicaId ).append( '\n' );
sb.append( tabs ).append( " last sent CSN : " ).append( replLastSentCsn ).append( '\n' );
- sb.append( tabs ).append( " search base DN : " ).append( searchBaseDN ).append( '\n' );
+ sb.append( tabs ).append( " search base DN : " ).append( searchBaseDN.getName() ).append( '\n' );
sb.append( tabs ).append( " search filter : " ).append( replSearchFilter ).append( '\n' );
sb.append( tabs ).append( " search scope : " ).append( replSearchScope ).append( '\n' );
sb.append( tabs ).append( " alias dereferencing mode : " ).append( replAliasDerefMode ).append( '\n' );
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java?rev=1027292&r1=1027291&r2=1027292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java Mon Oct 25 22:47:29 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.server.config.beans;
+import org.apache.directory.shared.ldap.name.DN;
+
/**
* A class used to store the Replication Producer configuration.
@@ -34,7 +36,7 @@ public class ReplProviderBean extends Ad
private String dsReplicaId;
/** The Search Base DN */
- private String searchBaseDN;
+ private DN searchBaseDN;
/** The replication provider host name */
private String replProvHostName;
@@ -67,7 +69,7 @@ public class ReplProviderBean extends Ad
private int replSearchTimeout;
/** The replication user DN */
- private String replUserDN;
+ private DN replUserDN;
/** The replication user password */
private String replUserPassword;
@@ -126,7 +128,7 @@ public class ReplProviderBean extends Ad
/**
* @return the searchBaseDn
*/
- public String getSearchBaseDn()
+ public DN getSearchBaseDn()
{
return searchBaseDN;
}
@@ -135,7 +137,7 @@ public class ReplProviderBean extends Ad
/**
* @param searchBaseDN the searchBaseDn to set
*/
- public void setSearchBaseDn( String searchBaseDn )
+ public void setSearchBaseDn( DN searchBaseDn )
{
this.searchBaseDN = searchBaseDn;
}
@@ -324,7 +326,7 @@ public class ReplProviderBean extends Ad
/**
* @return the replUserDn
*/
- public String isReplUserDn()
+ public DN isReplUserDn()
{
return replUserDN;
}
@@ -333,7 +335,7 @@ public class ReplProviderBean extends Ad
/**
* @param replUserDn the replUserDn to set
*/
- public void setReplUserDn( String replUserDn )
+ public void setReplUserDn( DN replUserDn )
{
this.replUserDN = replUserDn;
}
@@ -387,7 +389,7 @@ public class ReplProviderBean extends Ad
sb.append( tabs ).append( " provider ID : " ).append( replProviderId ).append( '\n' );
sb.append( tabs ).append( " replica ID : " ).append( dsReplicaId ).append( '\n' );
- sb.append( tabs ).append( " search base DN : " ).append( searchBaseDN ).append( '\n' );
+ sb.append( tabs ).append( " search base DN : " ).append( searchBaseDN.getName() ).append( '\n' );
sb.append( tabs ).append( " provider host name : " ).append( replProvHostName ).append( '\n' );
sb.append( tabs ).append( " provider port : " ).append( replProvPort ).append( '\n' );
sb.append( toString( tabs, " alias dereferencing mode", replAliasDerefMode ) );