directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1026676 - in /directory: apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ apacheds/branches/apacheds-config/server-config/src/test/resources/ shared/branches/shared-config/ldap-schema/...
Date Sat, 23 Oct 2010 20:25:50 GMT
Author: elecharny
Date: Sat Oct 23 20:25:49 2010
New Revision: 1026676

URL: http://svn.apache.org/viewvc?rev=1026676&view=rev
Log:
Added the code and test for replication provider. Works fine.

Added:
    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
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.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/JdbmPartitionBean.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/PasswordPolicyBean.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/TransportBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapserver.ldif
    directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif

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=1026676&r1=1026675&r2=1026676&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
Sat Oct 23 20:25:49 2010
@@ -81,7 +81,7 @@ public abstract class AdsBaseBean 
     }
     
     
-    protected String toStringBoolean( String tabs, String name, boolean value )
+    protected String toString( String tabs, String name, boolean value )
     {
         StringBuilder sb = new StringBuilder();
 
@@ -122,7 +122,7 @@ public abstract class AdsBaseBean 
     {
         StringBuilder sb = new StringBuilder();
         
-        sb.append( toStringBoolean( tabs, "enabled", enabled ) );
+        sb.append( toString( tabs, "enabled", enabled ) );
         
         if ( !StringTools.isEmpty( description ) )
         {

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
Sat Oct 23 20:25:49 2010
@@ -91,7 +91,7 @@ public class ChangeLogBean extends AdsBa
         
         sb.append( tabs ).append( "ChangeLog :\n" );
         sb.append( tabs ).append( "  changeLog id :" ).append( changelogid ).append( '\n'
);
-        sb.append( toStringBoolean( tabs, "  changeLog exposed", changelogexposed ) );
+        sb.append( toString( tabs, "  changeLog exposed", changelogexposed ) );
         
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
Sat Oct 23 20:25:49 2010
@@ -232,7 +232,7 @@ public class ChangePasswordServerBean ex
         sb.append( tabs ).append( "  change password policy password length : " ).append(
chgpwdpolicypasswordlength ).append( '\n' );
         sb.append( tabs ).append( "  change password policy token size : " ).append( chgpwdpolicytokensize
).append( '\n' );
         sb.append( tabs ).append( "  KRB allowable clock skew : " ).append( krballowableclockskew
).append( '\n' );
-        sb.append( toStringBoolean( tabs, "  KRB empty addresses allowed", krbemptyaddressesallowed
) );
+        sb.append( toString( tabs, "  KRB empty addresses allowed", krbemptyaddressesallowed
) );
 
         return sb.toString();
     }

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=1026676&r1=1026675&r2=1026676&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
Sat Oct 23 20:25:49 2010
@@ -417,10 +417,10 @@ public class DirectoryServiceBean extend
             }
         }
 
-        sb.append( toStringBoolean( "  ", "accessControl enabled", dsaccesscontrolenabled
) );
-        sb.append( toStringBoolean( "  ", "allow anonymous access", dsallowanonymousaccess
) );
-        sb.append( toStringBoolean( "  ", "denormalized attributes enabled", dsdenormalizeopattrsenabled
) );
-        sb.append( toStringBoolean( "  ", "password hidden", dspasswordhidden ) );
+        sb.append( toString( "  ", "accessControl enabled", dsaccesscontrolenabled ) );
+        sb.append( toString( "  ", "allow anonymous access", dsallowanonymousaccess ) );
+        sb.append( toString( "  ", "denormalized attributes enabled", dsdenormalizeopattrsenabled
) );
+        sb.append( toString( "  ", "password hidden", dspasswordhidden ) );
         sb.append( "  max PDU size : " ).append( dsmaxpdusize ).append( '\n' );
         sb.append( "  sync period millisecond : " ).append( dssyncperiodmillis ).append(
'\n' );
         sb.append( "  test entries : " ).append( dstestentries ).append( '\n' );

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
Sat Oct 23 20:25:49 2010
@@ -96,7 +96,7 @@ public class JdbmPartitionBean extends P
         sb.append( tabs ).append( "JdbmPartitionBean :\n" );
         sb.append( super.toString( tabs + "  " ) );
         sb.append( tabs ).append( "  partition cache size" ).append( partitioncachesize ).append(
'\n' );
-        sb.append( toStringBoolean( tabs, "  jdbm partition optimizer enabled", jdbmpartitionoptimizerenabled
) );
+        sb.append( toString( tabs, "  jdbm partition optimizer enabled", jdbmpartitionoptimizerenabled
) );
         
         return sb.toString();
     }

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=1026676&r1=1026675&r2=1026676&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
Sat Oct 23 20:25:49 2010
@@ -65,7 +65,8 @@ public class LdapServerBean extends DSBa
     /** The replication consumer Bean */
     private ReplConsumerBean replconsumer;
     
-    private int replprovider;
+    /** The replication producer Bean */
+    private ReplProviderBean replprovider;
     
     /** The list of supported mechanisms */
     private List<SaslMechHandlerBean> saslmechhandlers = new ArrayList<SaslMechHandlerBean>();
@@ -358,18 +359,36 @@ public class LdapServerBean extends DSBa
     /**
      * @return the Replication Consumer Bean
      */
-    public ReplConsumerBean getReplconsumer()
+    public ReplConsumerBean getReplConsumer()
     {
         return replconsumer;
     }
 
 
     /**
-     * @param replconsumer the Replication Consumer Bean to set
+     * @param replConsumer the Replication Consumer Bean to set
      */
-    public void setReplconsumer( ReplConsumerBean replconsumer )
+    public void setReplConsumer( ReplConsumerBean replConsumer )
     {
-        this.replconsumer = replconsumer;
+        this.replconsumer = replConsumer;
+    }
+
+
+    /**
+     * @return the replProvider
+     */
+    public ReplProviderBean getReplProvider()
+    {
+        return replprovider;
+    }
+
+
+    /**
+     * @param replProvider the replProvider to set
+     */
+    public void setReplProvider( ReplProviderBean replProvider )
+    {
+        this.replprovider = replProvider;
     }
 
     
@@ -388,8 +407,8 @@ 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( toStringBoolean( tabs, "  confidentiality required", confidentialityrequired
) );
-        sb.append( toStringBoolean( tabs, "  enable replication provider", enablereplprovider
) );
+        sb.append( toString( tabs, "  confidentiality required", confidentialityrequired
) );
+        sb.append( toString( tabs, "  enable replication provider", enablereplprovider )
);
         
         if ( ( extendedophandlers != null ) && ( extendedophandlers.size() > 0
) )
         {
@@ -431,6 +450,11 @@ public class LdapServerBean extends DSBa
             sb.append( tabs ).append( replconsumer.toString( tabs + "  " ) );
         }
         
+        if ( replprovider != null )
+        {
+            sb.append( tabs ).append( replprovider.toString( tabs + "  " ) );
+        }
+        
         return sb.toString();
     }
     

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=1026676&r1=1026675&r2=1026676&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
Sat Oct 23 20:25:49 2010
@@ -132,7 +132,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( toStringBoolean( tabs, "  sync on write", partitionsynconwrite ) );
+        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/PasswordPolicyBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
Sat Oct 23 20:25:49 2010
@@ -439,10 +439,10 @@ public class PasswordPolicyBean extends 
         sb.append( tabs ).append( "  password in history : " ).append( pwdinhistory ).append(
'\n' );
         sb.append( tabs ).append( "  password check quality : " ).append( pwdcheckquality
).append( '\n' );
         sb.append( tabs ).append( "  password failure count interval : " ).append( pwdfailurecountinterval
).append( '\n' );
-        sb.append( toStringBoolean( tabs, "  password lockout", pwdlockout ) );
-        sb.append( toStringBoolean( tabs, "  password must change", pwdmustchange ) );
-        sb.append( toStringBoolean( tabs, "  password allow user change", pwdallowuserchange
) );
-        sb.append( toStringBoolean( tabs, "  password safe modify", pwdsafemodify ) );
+        sb.append( toString( tabs, "  password lockout", pwdlockout ) );
+        sb.append( toString( tabs, "  password must change", pwdmustchange ) );
+        sb.append( toString( tabs, "  password allow user change", pwdallowuserchange ) );
+        sb.append( toString( tabs, "  password safe modify", pwdsafemodify ) );
 
         return sb.toString();
     }

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=1026676&r1=1026675&r2=1026676&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
Sat Oct 23 20:25:49 2010
@@ -27,7 +27,10 @@ package org.apache.directory.server.conf
  */
 public class ReplConsumerBean extends AdsBaseBean
 {
-    /** The replicaConsumer unique ID */
+    /** The consumer id */
+    private String replconsumerid;
+    
+    /** The replication unique ID */
     private String dsreplicaid;
     
     /** The Alias Dereferencing mode */
@@ -70,6 +73,24 @@ public class ReplConsumerBean extends Ad
 
     
     /**
+     * @return the replConsumerId
+     */
+    public String getReplConsumerId()
+    {
+        return replconsumerid;
+    }
+
+
+    /**
+     * @param replConsumerId the replConsumerId to set
+     */
+    public void setReplConsumerId( String replConsumerId )
+    {
+        this.replconsumerid = replConsumerId;
+    }
+
+    
+    /**
      * @return the dsreplicaid
      */
     public String getDsreplicaid()
@@ -256,9 +277,10 @@ public class ReplConsumerBean extends Ad
     {
         StringBuilder sb = new StringBuilder();
         
-        sb.append( tabs ).append( "replication consumer :\n" );
+        sb.append( tabs ).append( "Replication consumer :\n" );
         sb.append( super.toString( tabs + "  " ) );
 
+        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' );
@@ -267,9 +289,9 @@ public class ReplConsumerBean extends Ad
         sb.append( tabs ).append( "  alias dereferencing mode : " ).append( replaliasderefmode
).append( '\n' );
 
         sb.append( toString( tabs, "  peer certificate", replpeercertificate ) );
-        sb.append( toStringBoolean( tabs, "  refresh and persist mode", replrefreshnpersist
) );
-        sb.append( toStringBoolean( tabs, "  struct certivicate validation", replstrictcertvalidation
) );
-        sb.append( toStringBoolean( tabs, "  use TLS", replusetls ) );
+        sb.append( toString( tabs, "  refresh and persist mode", replrefreshnpersist ) );
+        sb.append( toString( tabs, "  struct certivicate validation", replstrictcertvalidation
) );
+        sb.append( toString( tabs, "  use TLS", replusetls ) );
 
         return sb.toString();
     }

Added: 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=1026676&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
(added)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
Sat Oct 23 20:25:49 2010
@@ -0,0 +1,416 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.server.config.beans;
+
+
+/**
+ * A class used to store the Replication Producer configuration.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ReplProviderBean extends AdsBaseBean
+{
+    /** The provider id */
+    private String replproviderid;
+    
+    /** The replication unique ID */
+    private String dsreplicaid;
+    
+    /** The Search Base DN */
+    private String searchbasedn;
+    
+    /** The replication provider host name */
+    private String replprovhostname;
+    
+    /** The replication provider port */
+    private String replprovport;
+    
+    /** The Alias Dereferencing mode */
+    private String replaliasderefmode;
+    
+    /** The replication provider attribute */
+    private String replattribute;
+    
+    /** The refresh interval */
+    private String replrefreshinterval;
+    
+    /** Tells if we should persist */
+    private boolean replrefreshnpersist;
+    
+    /** The search scope */
+    private String replsearchscope;
+    
+    /** The replication search filter */
+    private String replsearchfilter;
+
+    /** The search size limit */
+    private int replsearchsizelimit;
+    
+    /** The search time limit */
+    private int replsearchtimeout;
+    
+    /** The replication user DN */
+    private String repluserdn;
+    
+    /** The replication user password */
+    private String repluserpassword;
+    
+    /** The replication cookie */
+    private String replcookie;
+
+    /**
+     * Create a new Replication Consumer instance
+     */
+    public ReplProviderBean()
+    {
+        super();
+        
+        // Enabled by default
+        setEnabled( true );
+    }
+
+
+    /**
+     * @return the replProviderId
+     */
+    public String getReplProviderId()
+    {
+        return replproviderid;
+    }
+
+
+    /**
+     * @param replProviderId the replProviderId to set
+     */
+    public void setReplProviderId( String replProviderId )
+    {
+        this.replproviderid = replProviderId;
+    }
+
+    
+    /**
+     * @return the dsreplicaid
+     */
+    public String getDsReplicaId()
+    {
+        return dsreplicaid;
+    }
+
+
+    /**
+     * @param dsreplicaid the Replica ID to set
+     */
+    public void setDsReplicaId( String dsReplicaId )
+    {
+        this.dsreplicaid = dsReplicaId;
+    }
+
+
+    /**
+     * @return the searchBaseDn
+     */
+    public String getSearchBaseDn()
+    {
+        return searchbasedn;
+    }
+
+
+    /**
+     * @param searchbasedn the searchBaseDn to set
+     */
+    public void setSearchBaseDn( String searchBaseDn )
+    {
+        this.searchbasedn = searchBaseDn;
+    }
+
+
+    /**
+     * @return the replProvHostName
+     */
+    public String getReplProvHostName()
+    {
+        return replprovhostname;
+    }
+
+
+    /**
+     * @param replProvHostName the replProvHostName to set
+     */
+    public void setReplProvHostName( String replProvHostName )
+    {
+        this.replprovhostname = replProvHostName;
+    }
+
+
+    /**
+     * @return the replProvPort
+     */
+    public String getReplProvPort()
+    {
+        return replprovport;
+    }
+
+
+    /**
+     * @param replProvPort the replProvPort to set
+     */
+    public void setReplProvPort( String replProvPort )
+    {
+        this.replprovport = replProvPort;
+    }
+
+
+    /**
+     * @return the replAliasDerefMode
+     */
+    public String getReplAliasDerefMode()
+    {
+        return replaliasderefmode;
+    }
+
+
+    /**
+     * @param replAliasDerefMode the replAliasDerefMode to set
+     */
+    public void setReplAliasDerefMode( String replAliasDerefMode )
+    {
+        this.replaliasderefmode = replAliasDerefMode;
+    }
+
+
+    /**
+     * @return the replAttribute
+     */
+    public String getReplAttribute()
+    {
+        return replattribute;
+    }
+
+
+    /**
+     * @param replAttribute the replAttribute to set
+     */
+    public void setReplAttribute( String replAttribute )
+    {
+        this.replattribute = replAttribute;
+    }
+
+
+    /**
+     * @return the replRefreshInterval
+     */
+    public String getReplRefreshInterval()
+    {
+        return replrefreshinterval;
+    }
+
+
+    /**
+     * @param replRefreshInterval the replRefreshInterval to set
+     */
+    public void setReplRefreshInterval( String replRefreshInterval )
+    {
+        this.replrefreshinterval = replRefreshInterval;
+    }
+
+
+    /**
+     * @return the replRefreshNPersist
+     */
+    public boolean isReplRefreshNPersist()
+    {
+        return replrefreshnpersist;
+    }
+
+
+    /**
+     * @param replRefreshNPersist the replRefreshNPersist to set
+     */
+    public void setReplRefreshNPersist( boolean replRefreshNPersist )
+    {
+        this.replrefreshnpersist = replRefreshNPersist;
+    }
+
+
+    /**
+     * @return the replSearchScope
+     */
+    public String getReplSearchScope()
+    {
+        return replsearchscope;
+    }
+
+
+    /**
+     * @param replSearchScope the replSearchScope to set
+     */
+    public void setReplSearchScope( String replSearchScope )
+    {
+        this.replsearchscope = replSearchScope;
+    }
+
+
+    /**
+     * @return the replSearchFilter
+     */
+    public String getReplSearchFilter()
+    {
+        return replsearchfilter;
+    }
+
+
+    /**
+     * @param replsearchfilter the replSearchFilter to set
+     */
+    public void setReplSearchFilter( String replSearchFilter )
+    {
+        this.replsearchfilter = replSearchFilter;
+    }
+
+
+    /**
+     * @return the replSearchSizeLimit
+     */
+    public int isReplSearchSizeLimit()
+    {
+        return replsearchsizelimit;
+    }
+
+
+    /**
+     * @param replSearchSizeLimit the replSearchSizeLimit to set
+     */
+    public void setReplSearchSizeLimit( int replSearchSizeLimit )
+    {
+        this.replsearchsizelimit = replSearchSizeLimit;
+    }
+
+
+    /**
+     * @return the replSearchTimeOut
+     */
+    public int isReplSearchTimeOut()
+    {
+        return replsearchtimeout;
+    }
+
+
+    /**
+     * @param replSearchTimeOut the replSearchTimeOut to set
+     */
+    public void setReplSearchTimeLimit( int replSearchTimeOut )
+    {
+        this.replsearchtimeout = replSearchTimeOut;
+    }
+
+
+    /**
+     * @return the replUserDn
+     */
+    public String isReplUserDn()
+    {
+        return repluserdn;
+    }
+
+
+    /**
+     * @param replUserDn the replUserDn to set
+     */
+    public void setReplUserDn( String replUserDn )
+    {
+        this.repluserdn = replUserDn;
+    }
+
+
+    /**
+     * @return the replUserPassword
+     */
+    public String isReplUserPassword()
+    {
+        return repluserpassword;
+    }
+
+
+    /**
+     * @param replUserPassword the replUserPassword to set
+     */
+    public void setReplUserPassword( String replUserPassword )
+    {
+        this.repluserpassword = replUserPassword;
+    }
+
+
+    /**
+     * @return the replCookie
+     */
+    public String isReplCookie()
+    {
+        return replcookie;
+    }
+
+
+    /**
+     * @param replCookie the replCookie to set
+     */
+    public void setReplCookie( String replCookie )
+    {
+        this.replcookie = replCookie;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "Replication provider :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+
+        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( "  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 ) );
+        sb.append( toString( tabs, "  attribute", replattribute ) );
+        sb.append( tabs ).append( "  refresh interval : " ).append( replrefreshinterval ).append(
'\n' );
+        sb.append( toString( tabs, "  refresh and persist mode", replrefreshnpersist ) );
+        sb.append( toString( tabs, "  search scope", replsearchscope ) );
+        sb.append( toString( tabs, "  search filter", replsearchfilter ) );
+        sb.append( tabs ).append( "  search size limit : " ).append( replsearchsizelimit
).append( '\n' );
+        sb.append( tabs ).append( "  search time limit : " ).append( replsearchtimeout ).append(
'\n' );
+        sb.append( toString( tabs, "  user DN", repluserdn ) );
+        sb.append( toString( tabs, "  user password", repluserpassword ) );
+        sb.append( toString( tabs, "  cookie", replcookie ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
+}

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
Sat Oct 23 20:25:49 2010
@@ -192,7 +192,7 @@ public class TransportBean extends AdsBa
         sb.append( tabs ).append( "transport port : " ).append( systemport ).append( '\n'
);
         sb.append( tabs ).append( "transport backlog : " ).append( transportbacklog ).append(
'\n' );
         sb.append( tabs ).append( "transport nb threads : " ).append( transportnbthreads
).append( '\n' );
-        sb.append( toStringBoolean( tabs, "SSL enabled", transportenablessl ) );
+        sb.append( toString( tabs, "SSL enabled", transportenablessl ) );
 
         return sb.toString();
     }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapserver.ldif?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapserver.ldif
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapserver.ldif
Sat Oct 23 20:25:49 2010
@@ -191,10 +191,11 @@ ads-pwdMinDelay: 20
 ads-pwdMaxDelay: 200
 ads-pwdMaxIdle: 100
 
-dn: ads-dsReplicaId=test,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-replConsumerId=test,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
 objectclass: top
 objectclass: ads-base
 objectclass: ads-replConsumer
+ads-replConsumerId: test
 ads-dsReplicaId: test
 ads-replAliasDerefMode: NEVER_DEREF
 ads-searchBaseDN: ads-directoryServiceId=default,ou=config
@@ -205,3 +206,24 @@ ads-replRefreshNPersist: TRUE
 ads-replUseTls: TRUE
 ads-replStrictCertValidation: TRUE
 ads-replPeerCertificate: ABCD
+
+dn: ads-replProviderId=test,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-replProvider
+ads-replProducerId: test
+ads-dsReplicaId: test
+ads-searchBaseDN: ads-directoryServiceId=default,ou=config
+ads-replProvHostName: localhost
+ads-replProvPort: 12345
+ads-replAliasDerefMode: NEVER_DEREF
+ads-replAttribute: acme
+ads-replRefreshInterval: 100
+ads-replRefreshNPersist: TRUE
+ads-replSearchScope: SUBTREE
+ads-replSearchFilter: (&(objectClass=top)(ou=test))
+ads-replSearchSizeLimit: 100
+ads-replSearchTimeOut: 100
+ads-replUserDn: ou=config
+ads-replUserPassword: secret
+ads-replCookie: abcdef

Modified: directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.806.ldif?rev=1026676&r1=1026675&r2=1026676&view=diff
==============================================================================
--- directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
(original)
+++ directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
Sat Oct 23 20:25:49 2010
@@ -10,7 +10,7 @@ m-supobjectclass: ads-base
 entrycsn: 20100511145902.546000Z#000000#000#000000
 createtimestamp: 20100116052129Z
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-m-must: ads-replProducerId
+m-must: ads-replProviderId
 m-must: ads-dsReplicaId
 m-must: ads-searchBaseDN
 m-must: ads-replProvHostName



Mime
View raw message