svn commit: r1445579 - in /directory/apacheds/trunk: server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java

[pa...@apache.org]

Author: pamarcelot
Date: Wed Feb 13 13:12:12 2013
New Revision: 1445579

URL: http://svn.apache.org/r1445579
Log:
Fixed ApacheDS classes after the removal of the 'ads-replPeerCertificate' attribute type.

Modified:
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java

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=1445579&r1=1445578&r2=1445579&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 Feb 13 13:12:12 2013
@@ -102,10 +102,6 @@ public class ReplConsumerBean extends Ad
     @ConfigurationElement(attributeType = SchemaConstants.ADS_REPL_STRICT_CERT_VALIDATION, isOptional = true)
     private boolean replStrictCertValidation;
 
-    /** The peer certificate */
-    @ConfigurationElement(attributeType = SchemaConstants.ADS_REPL_PEER_CERTIFICATE, isOptional = true)
-    private byte[] replPeerCertificate;
-
     /** The FQCN of replication client implementation */
     @ConfigurationElement(attributeType = SchemaConstants.ADS_REPL_CONSUMER_IMPL, isOptional = true)
     private String replConsumerImpl;
@@ -442,24 +438,6 @@ public class ReplConsumerBean extends Ad
 
 
     /**
-     * @return the replPeerCertificate
-     */
-    public byte[] getReplPeerCertificate()
-    {
-        return replPeerCertificate;
-    }
-
-
-    /**
-     * @param replPeerCertificate the replPeerCertificate to set
-     */
-    public void setReplPeerCertificate( byte[] replPeerCertificate )
-    {
-        this.replPeerCertificate = replPeerCertificate;
-    }
-
-
-    /**
      * @return the replConsumerImpl
      */
     public String getReplConsumerImpl()
@@ -504,9 +482,6 @@ public class ReplConsumerBean extends Ad
         sb.append( toString( tabs, "  cookie", replCookie ) );
         sb.append( tabs ).append( "  consumer implementation's FQCN : " ).append( replConsumerImpl ).append( '\n' );
 
-        // a hex dump would be good but printing the address is better to just know null or not
-        sb.append( toString( tabs, "  peer certificate", String.valueOf( replPeerCertificate ) ) );
-
         sb.append( toString( tabs, "  struct certivicate validation", replStrictCertValidation ) );
         sb.append( toString( tabs, "  use TLS", replUseTls ) );
 

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=1445579&r1=1445578&r2=1445579&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 Wed Feb 13 13:12:12 2013
@@ -100,7 +100,6 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.LdapServer;
 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.consumer.ReplicationConsumer;
 import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumerImpl;
@@ -1105,12 +1104,6 @@ public class ServiceBuilder
 
                 config.setConfigEntryDn( replBean.getDn() );
 
-                if ( replBean.getReplPeerCertificate() != null )
-                {
-                    ReplicationTrustManager.addCertificate( replBean.getReplConsumerId(),
-                        replBean.getReplPeerCertificate() );
-                }
-
                 consumer.setConfig( config );
 
                 lst.add( consumer );