directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1151534 - in /directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config: ConfigSchemaConstants.java beans/DSBasedServerBean.java beans/DirectoryServiceBean.java beans/ReplConsumerBean.java
Date Wed, 27 Jul 2011 17:02:27 GMT
Author: elecharny
Date: Wed Jul 27 17:02:26 2011
New Revision: 1151534

URL: http://svn.apache.org/viewvc?rev=1151534&view=rev
Log:
Forgot to commit those patches (replication constants moved to SchemaConstants)

Modified:
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=1151534&r1=1151533&r2=1151534&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
(original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
Wed Jul 27 17:02:26 2011
@@ -79,7 +79,7 @@ public enum ConfigSchemaConstants
 
     ADS_HTTP_SERVER_OC( "ads-httpServer", "1.3.6.1.4.1.18060.0.4.1.3.804" ),
 
-    ADS_REPL_CONSUMER_OC( "ads-replConsumer", "1.3.6.1.4.1.18060.0.4.1.3.805" ),
+    //ADS_REPL_CONSUMER_OC( "ads-replConsumer", "1.3.6.1.4.1.18060.0.4.1.3.805" ),
     
     ADS_REPL_PROVIDER_OC( "ads-replProvider", "1.3.6.1.4.1.18060.0.4.1.3.806" ),
     
@@ -125,7 +125,7 @@ public enum ConfigSchemaConstants
 
     ADS_DIRECTORYSERVICE_ID( "ads-directoryServiceId", "" ),
 
-    ADS_DS_REPLICA_ID( "ads-dsReplicaId", "" ),
+    //ADS_DS_REPLICA_ID( "ads-dsReplicaId", "" ),
 
     ADS_DSINTERCEPTORS( "ads-dsInterceptors", "" ),
 
@@ -221,43 +221,43 @@ public enum ConfigSchemaConstants
     
     ADS_CHANGEPWD_SERVICE_PRINCIPAL( "ads-chgPwdServicePrincipal", "" ),
     
-    ADS_REPL_SEARCH_FILTER( "ads-replSearchFilter", "" ),
+    //ADS_REPL_SEARCH_FILTER( "ads-replSearchFilter", "" ),
     
-    ADS_REPL_LAST_SENT_CSN( "ads-replLastSentCsn", "" ),
+    //ADS_REPL_LAST_SENT_CSN( "ads-replLastSentCsn", "" ),
     
-    ADS_REPL_ALIAS_DEREF_MODE( "ads-replAliasDerefMode", "" ),
+    //ADS_REPL_ALIAS_DEREF_MODE( "ads-replAliasDerefMode", "" ),
     
-    ADS_SEARCH_BASE( "ads-searchBaseDN", "" ),
+    //ADS_SEARCH_BASE( "ads-searchBaseDN", "" ),
     
-    ADS_REPL_SEARCH_SCOPE( "ads-replSearchScope", "" ),
+    //ADS_REPL_SEARCH_SCOPE( "ads-replSearchScope", "" ),
     
-    ADS_REPL_REFRESH_N_PERSIST( "ads-replRefreshNPersist", "" ),
+    //ADS_REPL_REFRESH_N_PERSIST( "ads-replRefreshNPersist", "" ),
     
-    ADS_REPL_PROV_HOST_NAME( "ads-replProvHostName", "" ),
+    //ADS_REPL_PROV_HOST_NAME( "ads-replProvHostName", "" ),
     
-    ADS_REPL_PROV_PORT( "ads-replProvPort", "" ),
+    //ADS_REPL_PROV_PORT( "ads-replProvPort", "" ),
     
-    ADS_REPL_USER_DN( "ads-replUserDn", "" ),
+    //ADS_REPL_USER_DN( "ads-replUserDn", "" ),
     
-    ADS_REPL_USER_PASSWORD( "ads-replUserPassword", "" ),
+    //ADS_REPL_USER_PASSWORD( "ads-replUserPassword", "" ),
     
-    ADS_REPL_REFRESH_INTERVAL( "ads-replRefreshInterval", "" ),
+    //ADS_REPL_REFRESH_INTERVAL( "ads-replRefreshInterval", "" ),
     
-    ADS_REPL_ATTRIBUTE( "ads-replAttributes", "" ),
+    //ADS_REPL_ATTRIBUTE( "ads-replAttributes", "" ),
     
-    ADS_REPL_SEARCH_SIZE_LIMIT( "ads-replSearchSizeLimit", "" ),
+    //ADS_REPL_SEARCH_SIZE_LIMIT( "ads-replSearchSizeLimit", "" ),
     
-    ADS_REPL_SEARCH_TIMEOUT( "ads-replSearchTimeOut", "" ),
+    //ADS_REPL_SEARCH_TIMEOUT( "ads-replSearchTimeOut", "" ),
     
-    ADS_REPL_COOKIE( "ads-replCookie", "" ),
+    //ADS_REPL_COOKIE( "ads-replCookie", "" ),
     
     ADS_REPL_REQ_HANDLER( "ads-replReqHandler", "" ),
     
     ADS_REPL_ENABLE_PROVIDER( "ads-enableReplProvider", "" ),
     
-    ADS_REPL_PEER_CERTIFICATE( "ads-replPeerCertificate", "" ),
+    //ADS_REPL_PEER_CERTIFICATE( "ads-replPeerCertificate", "" ),
     
-    ADS_REPL_USE_TLS( "ads-replUseTls", "" ),
+    //ADS_REPL_USE_TLS( "ads-replUseTls", "" ),
     
     ADS_LDAP_SERVER_SASL_MECH_NAME( "ads-ldapServerSaslMechName", "" ),
     

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java?rev=1151534&r1=1151533&r2=1151534&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
(original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
Wed Jul 27 17:02:26 2011
@@ -21,6 +21,7 @@ package org.apache.directory.server.conf
 
 
 import org.apache.directory.server.config.ConfigurationElement;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.name.Dn;
 
 
@@ -37,7 +38,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.
      */
-    @ConfigurationElement(attributeType = "ads-searchBaseDn")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_SEARCH_BASE_DN )
     private Dn searchBaseDn;
 
 
@@ -77,7 +78,7 @@ public class DSBasedServerBean extends S
         StringBuilder sb = new StringBuilder();
 
         sb.append( super.toString( tabs ) );
-        sb.append( toString( tabs, "searchBaseDn", searchBaseDn) );
+        sb.append( toString( tabs, SchemaConstants.ADS_SEARCH_BASE_DN, searchBaseDn) );
 
         return sb.toString();
     }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1151534&r1=1151533&r2=1151534&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
(original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
Wed Jul 27 17:02:26 2011
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.server.config.ConfigurationElement;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 
 
 /**
@@ -38,7 +39,7 @@ public class DirectoryServiceBean extend
     private String directoryServiceId;
 
     /** The directory instance replication ID */
-    @ConfigurationElement(attributeType = "ads-dsReplicaId")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_DS_REPLICA_ID )
     private int dsReplicaId;
 
     /** The flag that tells if the AccessControl system is activated */

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1151534&r1=1151533&r2=1151534&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
(original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
Wed Jul 27 17:02:26 2011
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.server.config.ConfigurationElement;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 
 
 /**
@@ -34,79 +35,79 @@ import org.apache.directory.server.confi
 public class ReplConsumerBean extends AdsBaseBean
 {
     /** The consumer id */
-    @ConfigurationElement(attributeType = "ads-replConsumerId", isRdn = true)
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_CONSUMER_ID, isRdn =
true )
     private String replConsumerId;
 
     /** The Search Base Dn */
-    @ConfigurationElement(attributeType = "ads-searchBaseDn")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_SEARCH_BASE_DN )
     private String searchBaseDn;
 
     /** The replication provider host name */
-    @ConfigurationElement(attributeType = "ads-replProvHostName")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_PROV_HOST_NAME )
     private String replProvHostName;
 
     /** The replication provider port */
-    @ConfigurationElement(attributeType = "ads-replProvPort")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_PROV_PORT )
     private int replProvPort;
 
     /** The Alias Dereferencing mode */
-    @ConfigurationElement(attributeType = "ads-replAliasDerefMode")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_ALIAS_DEREF_MODE )
     private String replAliasDerefMode;
 
     /** The replication provider attribute */
-    @ConfigurationElement(attributeType = "ads-replAttributes")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_ATTRIBUTES )
     private List<String> replAttributes = new ArrayList<String>();
 
     /** The refresh interval */
-    @ConfigurationElement(attributeType = "ads-replRefreshInterval")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_REFRESH_INTERVAL )
     private long replRefreshInterval;
 
     /** Tells if we should persist */
-    @ConfigurationElement(attributeType = "ads-replRefreshNPersist")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_REFRESH_N_PERSIST )
     private boolean replRefreshNPersist;
 
     /** The search scope */
-    @ConfigurationElement(attributeType = "ads-replSearchScope")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_SEARCH_SCOPE )
     private String replSearchScope;
 
     /** The replication search filter */
-    @ConfigurationElement(attributeType = "ads-replSearchFilter")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_SEARCH_FILTER )
     private String replSearchFilter;
 
     /** The search size limit */
-    @ConfigurationElement(attributeType = "ads-replSearchSizeLimit")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_SEARCH_SIZE_LIMIT )
     private int replSearchSizeLimit;
 
     /** The search time limit */
-    @ConfigurationElement(attributeType = "ads-replSearchTimeout")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_SEARCH_TIMEOUT )
     private int replSearchTimeout;
 
     /** The replication user Dn */
-    @ConfigurationElement(attributeType = "ads-replUserDn")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_USER_DN )
     private String replUserDn;
 
     /** The replication user password */
-    @ConfigurationElement(attributeType = "ads-replUserPassword")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_USER_PASSWORD )
     private byte[] replUserPassword;
 
     /** The replication cookie */
-    @ConfigurationElement(attributeType = "ads-replCookie")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_COOKIE )
     private String replCookie;
 
     /** Tells if TLS should be used during replication */
-    @ConfigurationElement(attributeType = "ads-replUseTls")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_USE_TLS )
     private boolean replUseTls;
 
     /** Tells if the certificate validation should be strict or not */
-    @ConfigurationElement(attributeType = "ads-replStrictCertValidation")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_STRICT_CERT_VALIDATION
)
     private boolean replStrictCertValidation;
 
     /** The peer certificate */
-    @ConfigurationElement(attributeType = "ads-replPeerCertificate")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_PEER_CERTIFICATE )
     private byte[] replPeerCertificate;
 
     /** The FQCN of replication client implementation */
-    @ConfigurationElement(attributeType = "ads-replConsumerImpl")
+    @ConfigurationElement( attributeType = SchemaConstants.ADS_REPL_CONSUMER_IMPL )
     private String replConsumerImpl;
 
     /**



Mime
View raw message