directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1408378 - in /directory/apacheds/trunk: protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ server-annotations/src/main/java/org/apach...
Date Mon, 12 Nov 2012 17:56:27 GMT
Author: elecharny
Date: Mon Nov 12 17:56:23 2012
New Revision: 1408378

URL: http://svn.apache.org/viewvc?rev=1408378&view=rev
Log:
Renamed the SyncreplConfiguration class to SynReplConfiguration (all the other classes are
starting with SyncRepl, with a 'R')

Added:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConfiguration.java
      - copied, changed from r1407922, directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
Removed:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java

Copied: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConfiguration.java
(from r1407922, directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConfiguration.java?p2=directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConfiguration.java&p1=directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java&r1=1407922&r2=1408378&rev=1408378&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncreplConfiguration.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConfiguration.java
Mon Nov 12 17:56:23 2012
@@ -62,7 +62,7 @@ import org.apache.directory.shared.util.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncreplConfiguration implements ReplicationConsumerConfig
+public class SyncReplConfiguration implements ReplicationConsumerConfig
 {
     /** host name of the syncrepl remote server, default value is localhost */
     private String remoteHost = "localhost";
@@ -132,7 +132,7 @@ public class SyncreplConfiguration imple
     /**
      * Creates a new instance of SyncreplConfiguration
      */
-    public SyncreplConfiguration()
+    public SyncReplConfiguration()
     {
         attributes = new HashSet<String>();
         attributes.add( SchemaConstants.ALL_USER_ATTRIBUTES );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1408378&r1=1408377&r2=1408378&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
Mon Nov 12 17:56:23 2012
@@ -45,7 +45,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.ldap.LdapProtocolUtils;
 import org.apache.directory.server.ldap.replication.ReplicationConsumerConfig;
-import org.apache.directory.server.ldap.replication.SyncreplConfiguration;
+import org.apache.directory.server.ldap.replication.SyncReplConfiguration;
 import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
@@ -105,7 +105,7 @@ public class ReplicationConsumerImpl imp
     private static final Logger CONSUMER_LOG = LoggerFactory.getLogger( "CONSUMER_LOG" );
 
     /** the syncrepl configuration */
-    private SyncreplConfiguration config;
+    private SyncReplConfiguration config;
 
     /** the sync cookie sent by the server */
     private byte[] syncCookie;
@@ -164,7 +164,7 @@ public class ReplicationConsumerImpl imp
     /**
      * @return the config
      */
-    public SyncreplConfiguration getConfig()
+    public SyncReplConfiguration getConfig()
     {
         return config;
     }
@@ -544,7 +544,7 @@ public class ReplicationConsumerImpl imp
      */
     public void setConfig( ReplicationConsumerConfig config )
     {
-        this.config = ( SyncreplConfiguration ) config;
+        this.config = ( SyncReplConfiguration ) config;
     }
 
 

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java?rev=1408378&r1=1408377&r2=1408378&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
(original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
Mon Nov 12 17:56:23 2012
@@ -38,7 +38,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmProvider;
-import org.apache.directory.server.ldap.replication.SyncreplConfiguration;
+import org.apache.directory.server.ldap.replication.SyncReplConfiguration;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumerImpl;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
@@ -232,7 +232,7 @@ public class ServerAnnotationProcessor
     {
         ReplicationConsumer consumer = new ReplicationConsumerImpl();
 
-        SyncreplConfiguration config = new SyncreplConfiguration();
+        SyncReplConfiguration config = new SyncReplConfiguration();
         config.setRemoteHost( createConsumer.remoteHost() );
         config.setRemotePort( createConsumer.remotePort() );
         config.setReplUserDn( createConsumer.replUserDn() );

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=1408378&r1=1408377&r2=1408378&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
Mon Nov 12 17:56:23 2012
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 public class DirectoryServiceBean extends AdsBaseBean
 {
     /** The DS instance Id */
-    @ConfigurationElement(attributeType = "ads-directoryServiceId", isRdn = true)
+    @ConfigurationElement(attributeType = SchemaConstants.ADS_DIRECTORY_SERVICE_ID, isRdn
= true)
     private String directoryServiceId;
 
     /** The directory instance replication ID */

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java?rev=1408378&r1=1408377&r2=1408378&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
Mon Nov 12 17:56:23 2012
@@ -44,7 +44,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.factory.ServerAnnotationProcessor;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.server.ldap.replication.SyncreplConfiguration;
+import org.apache.directory.server.ldap.replication.SyncReplConfiguration;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer;
 import org.apache.directory.server.ldap.replication.provider.SyncReplRequestHandler;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -267,7 +267,7 @@ public class ClientInitialRefreshIT
     private ReplicationConsumer createConsumer() throws Exception
     {
         final ReplicationConsumer syncreplClient = new MockSyncReplConsumer();
-        final SyncreplConfiguration config = new SyncreplConfiguration();
+        final SyncReplConfiguration config = new SyncReplConfiguration();
         config.setRemoteHost( "localhost" );
         config.setRemotePort( 16000 );
         config.setReplUserDn( "uid=admin,ou=system" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java?rev=1408378&r1=1408377&r2=1408378&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
Mon Nov 12 17:56:23 2012
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.ldap.LdapProtocolUtils;
 import org.apache.directory.server.ldap.replication.ReplicationConsumerConfig;
-import org.apache.directory.server.ldap.replication.SyncreplConfiguration;
+import org.apache.directory.server.ldap.replication.SyncReplConfiguration;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
@@ -101,7 +101,7 @@ public class MockSyncReplConsumer implem
     private LdapApiService ldapCodecService = LdapApiServiceFactory.getSingleton();
 
     /** the syncrepl configuration */
-    private SyncreplConfiguration config;
+    private SyncReplConfiguration config;
 
     /** the sync cookie sent by the server */
     private byte[] syncCookie;
@@ -162,7 +162,7 @@ public class MockSyncReplConsumer implem
     /**
      * @return the config
      */
-    public SyncreplConfiguration getConfig()
+    public SyncReplConfiguration getConfig()
     {
         return config;
     }
@@ -490,7 +490,7 @@ public class MockSyncReplConsumer implem
      */
     public void setConfig( ReplicationConsumerConfig config )
     {
-        this.config = ( SyncreplConfiguration ) config;
+        this.config = ( SyncReplConfiguration ) config;
     }
 
 

Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1408378&r1=1408377&r2=1408378&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
(original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
Mon Nov 12 17:56:23 2012
@@ -86,7 +86,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.replication.ReplicationTrustManager;
-import org.apache.directory.server.ldap.replication.SyncreplConfiguration;
+import org.apache.directory.server.ldap.replication.SyncReplConfiguration;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumerImpl;
 import org.apache.directory.server.ldap.replication.provider.ReplicationRequestHandler;
@@ -1029,7 +1029,7 @@ public class ServiceBuilder
 
             ReplicationConsumer consumer = null;
             Class<?> consumerClass = null;
-            SyncreplConfiguration config = null;
+            SyncReplConfiguration config = null;
 
             try
             {
@@ -1045,7 +1045,7 @@ public class ServiceBuilder
                 consumer = ( ReplicationConsumer ) consumerClass.newInstance();
 
                 // we don't support any other configuration impls atm, but this configuration
should suffice for many needs
-                config = new SyncreplConfiguration();
+                config = new SyncReplConfiguration();
 
                 config.setBaseDn( replBean.getSearchBaseDn() );
                 config.setRemoteHost( replBean.getReplProvHostName() );



Mime
View raw message