Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 64120E580 for ; Wed, 2 Jan 2013 18:22:05 +0000 (UTC) Received: (qmail 53093 invoked by uid 500); 2 Jan 2013 18:22:05 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 53040 invoked by uid 500); 2 Jan 2013 18:22:05 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 53024 invoked by uid 99); 2 Jan 2013 18:22:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 18:22:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 18:22:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 35B6B238890D; Wed, 2 Jan 2013 18:21:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1427890 - in /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap: LdapServer.java replication/SyncReplConfiguration.java Date: Wed, 02 Jan 2013 18:21:40 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102182140.35B6B238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Jan 2 18:21:39 2013 New Revision: 1427890 URL: http://svn.apache.org/viewvc?rev=1427890&view=rev Log: Minor formatting Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java 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/LdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1427890&r1=1427889&r2=1427890&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Wed Jan 2 18:21:39 2013 @@ -130,7 +130,7 @@ public class LdapServer extends Director /** logger for this class */ private static final Logger LOG = LoggerFactory.getLogger( LdapServer.class.getName() ); - + /** Logger for the replication consumer */ private static final Logger CONSUMER_LOG = LoggerFactory.getLogger( "CONSUMER_LOG" ); @@ -213,7 +213,7 @@ public class LdapServer extends Director private LdapRequestHandler modifyDnRequestHandler; private LdapRequestHandler searchRequestHandler; private LdapRequestHandler unbindRequestHandler; - + // MessageSent handlers private LdapResponseHandler addResponseHandler; private LdapResponseHandler bindResponseHandler; @@ -242,6 +242,7 @@ public class LdapServer extends Director */ private boolean confidentialityRequired; + /** The used Keystore */ private KeyStore keyStore = null; private List chainBuilders = new ArrayList(); @@ -251,7 +252,8 @@ public class LdapServer extends Director private List replConsumers; private KeyManagerFactory keyManagerFactory; - + + /** * Creates an LDAP protocol provider. */ @@ -294,7 +296,7 @@ public class LdapServer extends Director { BindRequestHandler bindRequestHandler = new BindRequestHandler(); bindRequestHandler.setSaslMechanismHandlers( saslMechanismHandlers ); - + setBindHandlers( bindRequestHandler, new BindResponseHandler() ); } @@ -330,11 +332,10 @@ public class LdapServer extends Director if ( getSearchRequestHandler() == null ) { - setSearchHandlers( new SearchRequestHandler(), + setSearchHandlers( new SearchRequestHandler(), new SearchResultEntryHandler(), new SearchResultReferenceHandler(), - new SearchResultDoneHandler() - ); + new SearchResultDoneHandler() ); } if ( getUnbindRequestHandler() == null ) @@ -386,7 +387,7 @@ public class LdapServer extends Director } } } - + // Set up key manager factory to use our key store String algorithm = Security.getProperty( "ssl.KeyManagerFactory.algorithm" ); @@ -394,9 +395,9 @@ public class LdapServer extends Director { algorithm = KeyManagerFactory.getDefaultAlgorithm(); } - + keyManagerFactory = KeyManagerFactory.getInstance( algorithm ); - + if ( Strings.isEmpty( certificatePassword ) ) { keyManagerFactory.init( keyStore, null ); @@ -431,7 +432,8 @@ public class LdapServer extends Director DefaultIoFilterChainBuilder dfcb = ( ( DefaultIoFilterChainBuilder ) chainBuilder ); if ( dfcb.contains( sslFilterName ) ) { - DefaultIoFilterChainBuilder newChain = ( DefaultIoFilterChainBuilder ) LdapsInitializer.init( keyManagerFactory ); + DefaultIoFilterChainBuilder newChain = ( DefaultIoFilterChainBuilder ) LdapsInitializer + .init( keyManagerFactory ); dfcb.replace( sslFilterName, newChain.get( sslFilterName ) ); newChain = null; } @@ -459,7 +461,7 @@ public class LdapServer extends Director } loadKeyStore(); - + for ( Transport transport : transports ) { if ( !( transport instanceof TcpTransport ) ) @@ -469,7 +471,7 @@ public class LdapServer extends Director } IoFilterChainBuilder chain; - + if ( transport.isSSLEnabled() ) { chain = LdapsInitializer.init( keyManagerFactory ); @@ -693,7 +695,7 @@ public class LdapServer extends Director { final PingerThread pingerThread = new PingerThread(); pingerThread.start(); - + for ( final ReplicationConsumer consumer : replConsumers ) { consumer.init( getDirectoryService() ); @@ -710,22 +712,24 @@ public class LdapServer extends Director { MDC.put( "Replica", consumer.getId() ); } - + LOG.info( "starting the replication consumer with {}", consumer ); CONSUMER_LOG.info( "starting the replication consumer with {}", consumer ); boolean isConnected = consumer.connect( ReplicationConsumer.NOW ); - + if ( isConnected ) { pingerThread.addConsumer( consumer ); // We are now connected, start the replication ReplicationStatusEnum status = null; - - do { + + do + { status = consumer.startSync(); - } while ( status == ReplicationStatusEnum.REFRESH_REQUIRED ); - + } + while ( status == ReplicationStatusEnum.REFRESH_REQUIRED ); + if ( status == ReplicationStatusEnum.STOPPED ) { // Exit the loop @@ -1099,7 +1103,7 @@ public class LdapServer extends Director { super.setDirectoryService( directoryService ); Iterator itr = directoryService.getLdapCodecService().registeredControls(); - while( itr.hasNext() ) + while ( itr.hasNext() ) { supportedControls.add( itr.next() ); } @@ -1159,14 +1163,14 @@ public class LdapServer extends Director * @param addRequestHandler The AddRequest message received handler * @param addResponseHandler The AddResponse message sent handler */ - public void setAddHandlers( LdapRequestHandler addRequestHandler, + public void setAddHandlers( LdapRequestHandler addRequestHandler, LdapResponseHandler addResponseHandler ) { this.handler.removeReceivedMessageHandler( AddRequest.class ); this.addRequestHandler = addRequestHandler; this.addRequestHandler.setLdapServer( this ); this.handler.addReceivedMessageHandler( AddRequest.class, this.addRequestHandler ); - + this.handler.removeSentMessageHandler( AddResponse.class ); this.addResponseHandler = addResponseHandler; this.addResponseHandler.setLdapServer( this ); @@ -1199,13 +1203,13 @@ public class LdapServer extends Director * @param bindResponseHandler The BindResponse message sent handler */ public void setBindHandlers( LdapRequestHandler bindRequestHandler, - LdapResponseHandler bindResponseHandler) + LdapResponseHandler bindResponseHandler ) { handler.removeReceivedMessageHandler( BindRequest.class ); this.bindRequestHandler = bindRequestHandler; this.bindRequestHandler.setLdapServer( this ); handler.addReceivedMessageHandler( BindRequest.class, this.bindRequestHandler ); - + handler.removeSentMessageHandler( BindResponse.class ); this.bindResponseHandler = bindResponseHandler; this.bindResponseHandler.setLdapServer( this ); @@ -1238,7 +1242,7 @@ public class LdapServer extends Director * @param compareResponseHandler The CompareResponse message sent handler */ public void setCompareHandlers( LdapRequestHandler compareRequestHandler, - LdapResponseHandler compareResponseHandler) + LdapResponseHandler compareResponseHandler ) { handler.removeReceivedMessageHandler( CompareRequest.class ); this.compareRequestHandler = compareRequestHandler; @@ -1277,7 +1281,7 @@ public class LdapServer extends Director * @param deleteResponseHandler The DeleteResponse message sent handler */ public void setDeleteHandlers( LdapRequestHandler deleteRequestHandler, - LdapResponseHandler deleteResponseHandler) + LdapResponseHandler deleteResponseHandler ) { handler.removeReceivedMessageHandler( DeleteRequest.class ); this.deleteRequestHandler = deleteRequestHandler; @@ -1298,8 +1302,8 @@ public class LdapServer extends Director { return extendedRequestHandler; } - - + + /** * @return The MessageSent handler for the ExtendedResponse */ @@ -1323,12 +1327,13 @@ public class LdapServer extends Director handler.removeReceivedMessageHandler( ExtendedRequest.class ); this.extendedRequestHandler = extendedRequestHandler; this.extendedRequestHandler.setLdapServer( this ); - this.handler.addReceivedMessageHandler( ExtendedRequest.class, ( LdapRequestHandler ) this.extendedRequestHandler ); + this.handler.addReceivedMessageHandler( ExtendedRequest.class, + ( LdapRequestHandler ) this.extendedRequestHandler ); handler.removeSentMessageHandler( ExtendedResponse.class ); this.extendedResponseHandler = extendedResponseHandler; this.extendedResponseHandler.setLdapServer( this ); - this.handler.addSentMessageHandler( ExtendedResponse.class, ( LdapResponseHandler ) this.extendedResponseHandler ); + this.handler.addSentMessageHandler( ExtendedResponse.class, this.extendedResponseHandler ); } @@ -1346,7 +1351,7 @@ public class LdapServer extends Director * * @param intermediateResponseHandler The IntermediateResponse message sent handler */ - public void setIntermediateHandler( LdapResponseHandler intermediateResponseHandler) + public void setIntermediateHandler( LdapResponseHandler intermediateResponseHandler ) { handler.removeSentMessageHandler( IntermediateResponse.class ); this.intermediateResponseHandler = intermediateResponseHandler; @@ -1380,7 +1385,7 @@ public class LdapServer extends Director * @param modifyResponseHandler The ModifyResponse message sent handler */ public void setModifyHandlers( LdapRequestHandler modifyRequestHandler, - LdapResponseHandler modifyResponseHandler) + LdapResponseHandler modifyResponseHandler ) { handler.removeReceivedMessageHandler( ModifyRequest.class ); this.modifyRequestHandler = modifyRequestHandler; @@ -1419,13 +1424,13 @@ public class LdapServer extends Director * @param modifyDnResponseHandler The ModifyDnResponse message sent handler */ public void setModifyDnHandlers( LdapRequestHandler modifyDnRequestHandler, - LdapResponseHandler modifyDnResponseHandler) + LdapResponseHandler modifyDnResponseHandler ) { handler.removeReceivedMessageHandler( ModifyDnRequest.class ); this.modifyDnRequestHandler = modifyDnRequestHandler; this.modifyDnRequestHandler.setLdapServer( this ); this.handler.addReceivedMessageHandler( ModifyDnRequest.class, this.modifyDnRequestHandler ); - + handler.removeSentMessageHandler( ModifyDnResponse.class ); this.modifyDnResponseHandler = modifyDnResponseHandler; this.modifyDnResponseHandler.setLdapServer( this ); @@ -1655,8 +1660,8 @@ public class LdapServer extends Director { return keyManagerFactory; } - - + + /** * @return The maximum allowed size for an incoming PDU */ @@ -1681,7 +1686,7 @@ public class LdapServer extends Director this.maxPDUSize = maxPDUSize; } - + /** * @see Object#toString() */ Modified: 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?rev=1427890&r1=1427889&r2=1427890&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 Wed Jan 2 18:21:39 2013 @@ -160,8 +160,8 @@ public class SyncReplConfiguration imple this.remoteHost = remoteHost; producer = remoteHost + ":" + remotePort; } - - + + /** * A convenient method that concatenates the host and port of the producer * @return The : the consumer is connected to @@ -319,7 +319,7 @@ public class SyncReplConfiguration imple public void setAttributes( String[] attrs ) { attributes.clear(); - + for ( String attr : attrs ) { attributes.add( attr ); @@ -571,25 +571,25 @@ public class SyncReplConfiguration imple this.mmrMode = mmrMode; } - + public String toString() { StringBuilder sb = new StringBuilder(); - + sb.append( "[" ); - sb.append( "rid:" ).append( replicaId ).append( ", " ); - sb.append( "base:'" ).append( baseDn ).append( "', " ); + sb.append( "rid:" ).append( replicaId ).append( ", " ); + sb.append( "base:'" ).append( baseDn ).append( "', " ); sb.append( "filter:" ).append( filter ).append( ", " ); - sb.append( "scope:" ).append( searchScope ).append( ", " ); - sb.append( "alias:" ).append( aliasDerefMode ).append( ", " ); - sb.append( "chase referrals:" ).append( chaseReferrals ).append( ", " ); + sb.append( "scope:" ).append( searchScope ).append( ", " ); + sb.append( "alias:" ).append( aliasDerefMode ).append( ", " ); + sb.append( "chase referrals:" ).append( chaseReferrals ).append( ", " ); boolean isFirst = true; - + if ( attributes != null ) { sb.append( "attributes:{" ); - + for ( String attribute : attributes ) { if ( isFirst ) @@ -600,22 +600,22 @@ public class SyncReplConfiguration imple { sb.append( "/" ); } - + sb.append( attribute ); } - + sb.append( "}, " ); } - + if ( refreshNPersist ) { - sb.append( "refresh:" ).append( refreshInterval ).append( ", " ); + sb.append( "refresh:" ).append( refreshInterval ).append( ", " ); } else { - sb.append( "refreshOnly, "); + sb.append( "refreshOnly, " ); } - + if ( mmrMode ) { sb.append( "MMR, " ); @@ -624,17 +624,16 @@ public class SyncReplConfiguration imple { sb.append( "MS, " ); } - - sb.append( "provider:" ).append( producer ).append( ", " ); - sb.append( "user:'" ).append( replUserDn ).append( "', " ); - + + sb.append( "provider:" ).append( producer ).append( ", " ); + sb.append( "user:'" ).append( replUserDn ).append( "', " ); + if ( strictCertVerification ) { sb.append( "strict" ).append( ", " ); } sb.append( "TLS:" ).append( useTls ).append( "]" ); - return sb.toString(); }