directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r730026 [2/2] - in /directory/apacheds/trunk: protocol-changepw/src/main/java/org/apache/directory/server/changepw/ protocol-dns/src/main/java/org/apache/directory/server/dns/ protocol-kerberos/src/main/java/org/apache/directory/server/kerb...
Date Tue, 30 Dec 2008 01:22:36 GMT
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
Mon Dec 29 17:22:35 2008
@@ -37,6 +37,7 @@
 import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.OidNormalizer;
@@ -94,9 +95,10 @@
 
             LdapService ldapService = new LdapService();
             ldapService.setDirectoryService( service );
+            int port = AvailablePortFinder.getNextAvailable( 1024 );
+            ldapService.setTcpTransport( new TcpTransport( port ) );
             ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
-            ldapService.setNbTcpThreads( 3 );
+            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.setEnabled( true );
             ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler()
);
 
@@ -134,7 +136,7 @@
     {
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
-        env.put( "java.naming.provider.url", "ldap://localhost:" + ldapService.getIpPort()
+ "/ou=system" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + ldapService.getPort()
+ "/ou=system" );
         env.put( "java.naming.security.principal", "uid=admin,ou=system" );
         env.put( "java.naming.security.credentials", "secret" );
         env.put( "java.naming.security.authentication", "simple" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
Mon Dec 29 17:22:35 2008
@@ -58,6 +58,7 @@
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
@@ -136,8 +137,9 @@
             LdapService ldapService = new LdapService();
             ldapService.setDirectoryService( service );
             ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
-            ldapService.setNbTcpThreads( 3 );
+            int port = AvailablePortFinder.getNextAvailable( 1024 );
+            ldapService.setTcpTransport( new TcpTransport( port ) );
+            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.addExtendedOperationHandler( new StartTlsHandler() );
             ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler()
);
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
Mon Dec 29 17:22:35 2008
@@ -44,6 +44,7 @@
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
@@ -182,9 +183,10 @@
 
             LdapService ldapService = new LdapService();
             ldapService.setDirectoryService( service );
+            int port = AvailablePortFinder.getNextAvailable( 1024 );
+            ldapService.setTcpTransport( new TcpTransport( port ) );
             ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
-            ldapService.setNbTcpThreads( 3 );
+            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.addExtendedOperationHandler( new StartTlsHandler() );
             ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler()
);
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
Mon Dec 29 17:22:35 2008
@@ -130,14 +130,14 @@
         "objectClass: referral\n" +
         "objectClass: extensibleObject\n" +
         "c: europ\n" +
-        "ref: ldap://localhost:" + ldapService.getIpPort() + "/c=france,ou=system\n\n" +
+        "ref: ldap://localhost:" + ldapService.getPort() + "/c=france,ou=system\n\n" +
 
         "dn: c=america,ou=Countries,ou=system\n" +
         "objectClass: top\n" +
         "objectClass: referral\n" +
         "objectClass: extensibleObject\n" +
         "c: america\n" +
-        "ref: ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system\n\n";
+        "ref: ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system\n\n";
 
         LdifReader reader = new LdifReader( new StringReader( ldif ) );
         while ( reader.hasNext() )
@@ -314,7 +314,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??sub",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??sub",
referral );
         }
     }
 
@@ -342,7 +342,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
     }
 
@@ -371,7 +371,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
         
         Control manageDsaItControl = new ManageReferralControl();
@@ -392,7 +392,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
         
     }
@@ -422,7 +422,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
         
         Control manageDsaItControl = new ManageReferralControl();
@@ -443,7 +443,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
         
     }
@@ -473,7 +473,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
         
         Control manageDsaItControl = new ManageReferralControl();
@@ -494,7 +494,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??base",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base",
referral );
         }
         
     }
@@ -523,7 +523,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getIpPort() + "/c=usa,ou=system??one",
referral );
+            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??one",
referral );
         }
     }
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
Mon Dec 29 17:22:35 2008
@@ -36,6 +36,7 @@
 import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.server.ssl.SSLSocketFactory;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
@@ -90,9 +91,10 @@
 
             LdapService ldapService = new LdapService();
             ldapService.setDirectoryService( service );
+            int port = AvailablePortFinder.getNextAvailable( 1024 );
+            ldapService.setTcpTransport( new TcpTransport( port ) );
             ldapService.setSocketAcceptor( new NioSocketAcceptor() );
-            ldapService.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) );
-            ldapService.setNbTcpThreads( 3 );
+            ldapService.getTcpTransport().setNbThreads( 3 );
             ldapService.setEnabled( true );
             ldapService.setEnableLdaps( true );
             ldapService.setConfidentialityRequired( true );
@@ -130,7 +132,7 @@
     {
         Hashtable<String, String> env = new Hashtable<String, String>();
         env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
-        env.put( "java.naming.provider.url", "ldap://localhost:" + ldapService.getIpPort()
+ "/ou=system" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + ldapService.getPort()
+ "/ou=system" );
         env.put( "java.naming.ldap.factory.socket", SSLSocketFactory.class.getName() );
         env.put( "java.naming.security.principal", "uid=admin,ou=system" );
         env.put( "java.naming.security.credentials", "secret" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
Mon Dec 29 17:22:35 2008
@@ -164,7 +164,7 @@
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
         
         // Must use the name of the server that is found in its certificate?
-        env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapService.getIpPort() );
+        env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapService.getPort() );
 
         // Create initial context
         LOG.debug( "About to get initial context" );
@@ -364,7 +364,7 @@
             env.put( "java.naming.security.authentication", "simple" );
             
             // Must use the name of the server that is found in its certificate?
-            env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapService.getIpPort()
);
+            env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapService.getPort() );
     
             // Create initial context
             LOG.debug( "About to get initial context" );

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
(original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
Mon Dec 29 17:22:35 2008
@@ -222,7 +222,7 @@
         }
         else if ( getApacheDS() != null )
         {
-            port = getApacheDS().getLdapService().getIpPort();
+            port = getApacheDS().getLdapService().getPort();
 
             if ( isDebugEnabled() )
             {

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
(original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
Mon Dec 29 17:22:35 2008
@@ -130,7 +130,7 @@
         }
         else if ( getApacheDS() != null )
         {
-            port = getApacheDS().getLdapService().getIpPort();
+            port = getApacheDS().getLdapService().getPort();
 
             if ( isDebugEnabled() )
             {

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
(original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
Mon Dec 29 17:22:35 2008
@@ -228,7 +228,7 @@
         }
         else if ( getApacheDS() != null )
         {
-            port = getApacheDS().getLdapService().getIpPort();
+            port = getApacheDS().getLdapService().getPort();
 
             if ( isDebugEnabled() )
             {

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
(original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
Mon Dec 29 17:22:35 2008
@@ -222,7 +222,7 @@
         }
         else if ( getApacheDS() != null )
         {
-            port = getApacheDS().getLdapService().getIpPort();
+            port = getApacheDS().getLdapService().getPort();
 
             if ( isDebugEnabled() )
             {

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
(original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
Mon Dec 29 17:22:35 2008
@@ -799,7 +799,7 @@
         }
         else if ( getApacheDS() != null )
         {
-            port = getApacheDS().getLdapService().getIpPort();
+            port = getApacheDS().getLdapService().getPort();
 
             if ( isDebugEnabled() )
             {

Modified: directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
(original)
+++ directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
Mon Dec 29 17:22:35 2008
@@ -54,6 +54,7 @@
 import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -252,12 +253,13 @@
         start++;
         directoryService = new DefaultDirectoryService();
         directoryService.setShutdownHookEnabled( false );
-        socketAcceptor = new NioSocketAcceptor();
+        port = AvailablePortFinder.getNextAvailable( 1024 );
         ldapService = new LdapService();
+        ldapService.setTcpTransport( new TcpTransport( port ) );
+        ldapService.getTcpTransport().setNbThreads( 3 );
+        socketAcceptor = new NioSocketAcceptor();
         ldapService.setSocketAcceptor( socketAcceptor );
         ldapService.setDirectoryService( directoryService );
-        ldapService.setIpPort( port = AvailablePortFinder.getNextAvailable( 1024 ) );
-        ldapService.setNbTcpThreads( 3 );
 
         setupSaslMechanisms( ldapService );
 

Modified: directory/apacheds/trunk/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/server.xml?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/server.xml Mon Dec 29 17:22:35
2008
@@ -106,40 +106,101 @@
     </interceptors>
   </defaultDirectoryService>
 
-<!--  missing  atou=users,dc=example,dc=com
-  <changePasswordServer ipPort="60464" nbThreads="8">
+  <!-- 
+  +============================================================+
+  | ChangePassword server configuration                        |
+  +============================================================+
+  -->
+  <!--  missing  atou=users,dc=example,dc=com
+  <changePasswordServer>
+    <tcpTransport>
+      <tcpTransport port="60464" nbThreads="2" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60464" nbThreads="2" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </changePasswordServer>
 -->
-<!--  missing atou=users,dc=example,dc=com
-  <kdcServer ipPort="60088" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | Kerberos server configuration                              |
+  +============================================================+
+  -->
+  <!--  missing atou=users,dc=example,dc=com
+  <kdcServer>
+    <tcpTransport>
+      <tcpTransport port="60088" nbThreads="4" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60088" nbThreads="4" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </kdcServer>
 -->
-  <ntpServer ipPort="60123" nbThreads="8"/>
-<!--  missing atou=users,dc=example,dc=com
-  <dnsServer ipPort="8053" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | NtpServer configuration                                    |
+  +============================================================+
+  -->
+  <ntpServer>
+    <tcpTransport>
+      <tcpTransport port="60123"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60123" nbThreads="1"/>
+    </udpTransport>
+  </ntpServer>
+
+  <!-- 
+  +============================================================+
+  | DnsServer configuration                                    |
+  +============================================================+
+  -->
+  
+  <!--  missing atou=users,dc=example,dc=com
+  <dnsServer>
+    <tcpTransport>
+      <tcpTransport port="8053"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="8053"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </dnsServer>
 -->
 
+  <!-- 
+  +============================================================+
+  | LDAPS Service configuration                                 |
+  +============================================================+
+  -->
   <ldapService id="ldapsService"
               enabled="true"
-              tcpPort="10636"
-              enableLdaps="true"
-              nbTcpThreads="8">
+              enableLdaps="true">
+    <tcpTransport>
+      <tcpTransport port="10686"/>
+    </tcpTransport>
     <directoryService>#directoryService</directoryService>
   </ldapService>
 
+  <!-- 
+  +============================================================+
+  | LDAP Service configuration                                 |
+  +============================================================+
+  -->
   <ldapService id="ldapService"
-              tcpPort="10389"
               allowAnonymousAccess="false"
               saslHost="ldap.example.com"
               saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
               searchBaseDn="ou=users,ou=system"
               maxTimeLimit="15000"
-              maxSizeLimit="1000"
-              nbTcpThreads="8">
+              maxSizeLimit="1000">
+    <tcpTransport>
+      <tcpTransport port="10389" nbThreads="8" backLog="50"/>
+    </tcpTransport>
 
     <directoryService>#directoryService</directoryService>
 

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
(original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverAuthenticatorInAuthenticationInterceptor.xml
Mon Dec 29 17:22:35 2008
@@ -117,40 +117,104 @@
     </interceptors>
   </defaultDirectoryService>
 
-<!--  missing  atou=users,dc=example,dc=com
-  <changePasswordServer ipPort="60464" nbThreads="8">
+  <!-- 
+  +============================================================+
+  | ChangePassword server configuration                        |
+  +============================================================+
+  -->
+  <!--  missing  atou=users,dc=example,dc=com
+  <changePasswordServer>
+    <tcpTransport>
+      <tcpTransport port="60464" nbThreads="2" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60464" nbThreads="2" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </changePasswordServer>
 -->
-<!--  missing atou=users,dc=example,dc=com
-  <kdcServer ipPort="60088" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | Kerberos server configuration                              |
+  +============================================================+
+  -->
+  <!--  missing atou=users,dc=example,dc=com
+  <kdcServer>
+    <tcpTransport>
+      <tcpTransport port="60088" nbThreads="4" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60088" nbThreads="4" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </kdcServer>
 -->
-  <ntpServer ipPort="60123" nbThreads="8"/>
-<!--  missing atou=users,dc=example,dc=com
-  <dnsServer ipPort="8053" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | NtpServer configuration                                    |
+  +============================================================+
+  -->
+  <ntpServer>
+    <tcpTransport>
+      <tcpTransport port="60123"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60123" nbThreads="1"/>
+    </udpTransport>
+  </ntpServer>
+  
+  <!-- 
+  +============================================================+
+  | DnsServer configuration                                    |
+  +============================================================+
+  -->
+  
+  <!--  missing atou=users,dc=example,dc=com
+  <dnsServer>
+    <tcpTransport>
+      <tcpTransport port="8053"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="8053"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </dnsServer>
 -->
 
+  <!-- 
+  +============================================================+
+  | LDAPS Service configuration                                |
+  +============================================================+
+  -->
   <ldapService id="ldapsService"
               enabled="true"
-              tcpPort="10636"
-              enableLdaps="true"
-              nbTcpThreads="8">
+              enableLdaps="true">
+              
+    <tcpTransport>
+      <tcpTransport port="10686" nbThreads="8" backLog="50"/>
+    </tcpTransport>
+    
     <directoryService>#directoryService</directoryService>
   </ldapService>
 
+  <!-- 
+  +============================================================+
+  | LDAP Service configuration                                 |
+  +============================================================+
+  -->
   <ldapService id="ldapService"
-              tcpPort="10389"
               allowAnonymousAccess="false"
               saslHost="ldap.example.com"
               saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
               searchBaseDn="ou=users,ou=system"
               maxTimeLimit="15000"
-              maxSizeLimit="1000"
-              nbTcpThreads="8">
+              maxSizeLimit="1000">
+
+    <tcpTransport>
+      <tcpTransport port="10389" nbThreads="8" backLog="50"/>
+    </tcpTransport>
 
     <directoryService>#directoryService</directoryService>
 

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverJdbmPartition.xml Mon Dec
29 17:22:35 2008
@@ -106,40 +106,104 @@
     </interceptors>
   </defaultDirectoryService>
 
-<!--  missing  atou=users,dc=example,dc=com
-  <changePasswordServer ipPort="60464" nbThreads="8">
+  <!-- 
+  +============================================================+
+  | ChangePassword server configuration                        |
+  +============================================================+
+  -->
+  <!--  missing  atou=users,dc=example,dc=com
+  <changePasswordServer>
+    <tcpTransport>
+      <tcpTransport port="60464" nbThreads="2" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60464" nbThreads="2" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </changePasswordServer>
 -->
-<!--  missing atou=users,dc=example,dc=com
-  <kdcServer ipPort="60088" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | Kerberos server configuration                              |
+  +============================================================+
+  -->
+  <!--  missing atou=users,dc=example,dc=com
+  <kdcServer>
+    <tcpTransport>
+      <tcpTransport port="60088" nbThreads="4" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60088" nbThreads="4" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </kdcServer>
 -->
-  <ntpServer ipPort="60123" nbThreads="8"/>
-<!--  missing atou=users,dc=example,dc=com
-  <dnsServer ipPort="8053" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | NtpServer configuration                                    |
+  +============================================================+
+  -->
+  <ntpServer>
+    <tcpTransport>
+      <tcpTransport port="60123"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60123" nbThreads="1"/>
+    </udpTransport>
+  </ntpServer>
+
+  <!-- 
+  +============================================================+
+  | DnsServer configuration                                    |
+  +============================================================+
+  -->
+  
+  <!--  missing atou=users,dc=example,dc=com
+  <dnsServer>
+    <tcpTransport>
+      <tcpTransport port="8053"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="8053"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </dnsServer>
 -->
 
+  <!-- 
+  +============================================================+
+  | LDAPS Service configuration                                |
+  +============================================================+
+  -->
   <ldapService id="ldapsService"
               enabled="true"
-              tcpPort="10636"
-              enableLdaps="true"
-              nbTcpThreads="8">
+              enableLdaps="true">
+              
+    <tcpTransport>
+      <tcpTransport port="10686" nbThreads="8" backLog="50"/>
+    </tcpTransport>
+
     <directoryService>#directoryService</directoryService>
   </ldapService>
 
+  <!-- 
+  +============================================================+
+  | LDAP Service configuration                                 |
+  +============================================================+
+  -->
   <ldapService id="ldapService"
-              tcpPort="10389"
               allowAnonymousAccess="false"
               saslHost="ldap.example.com"
               saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
               searchBaseDn="ou=users,ou=system"
               maxTimeLimit="15000"
-              maxSizeLimit="1000"
-              nbTcpThreads="8">
+              maxSizeLimit="1000">
+
+    <tcpTransport>
+      <tcpTransport port="10389" nbThreads="8" backLog="50"/>
+    </tcpTransport>
 
     <directoryService>#directoryService</directoryService>
 

Modified: directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml?rev=730026&r1=730025&r2=730026&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml
(original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/serverReplicationInterceptor.xml
Mon Dec 29 17:22:35 2008
@@ -111,40 +111,104 @@
     </interceptors>
   </defaultDirectoryService>
 
-<!--  missing  atou=users,dc=example,dc=com
-  <changePasswordServer ipPort="60464" nbThreads="8">
+  <!-- 
+  +============================================================+
+  | ChangePassword server configuration                        |
+  +============================================================+
+  -->
+  <!--  missing  atou=users,dc=example,dc=com
+  <changePasswordServer>
+    <tcpTransport>
+      <tcpTransport port="60464" nbThreads="2" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60464" nbThreads="2" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </changePasswordServer>
 -->
-<!--  missing atou=users,dc=example,dc=com
-  <kdcServer ipPort="60088" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | Kerberos server configuration                              |
+  +============================================================+
+  -->
+  <!--  missing atou=users,dc=example,dc=com
+  <kdcServer>
+    <tcpTransport>
+      <tcpTransport port="60088" nbThreads="4" backLog="50"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60088" nbThreads="4" backLog="50"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </kdcServer>
 -->
-  <ntpServer ipPort="60123" nbThreads="8"/>
-<!--  missing atou=users,dc=example,dc=com
-  <dnsServer ipPort="8053" nbThreads="8">
+
+  <!-- 
+  +============================================================+
+  | NtpServer configuration                                    |
+  +============================================================+
+  -->
+  <ntpServer>
+    <tcpTransport>
+      <tcpTransport port="60123"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="60123" nbThreads="1"/>
+    </udpTransport>
+  </ntpServer>
+
+  <!-- 
+  +============================================================+
+  | DnsServer configuration                                    |
+  +============================================================+
+  -->
+  
+  <!--  missing atou=users,dc=example,dc=com
+  <dnsServer>
+    <tcpTransport>
+      <tcpTransport port="8053"/>
+    </tcpTransport>
+    <udpTransport>
+      <udpTransport port="8053"/>
+    </udpTransport>
     <directoryService>#directoryService</directoryService>
   </dnsServer>
 -->
 
+  <!-- 
+  +============================================================+
+  | LDAPS Service configuration                                |
+  +============================================================+
+  -->
   <ldapService id="ldapsService"
               enabled="true"
-              tcpPort="10636"
-              enableLdaps="true"
-              nbTcpThreads="8">
+              enableLdaps="true">
+              
+    <tcpTransport>
+      <tcpTransport port="10686" nbThreads="8" backLog="50"/>
+    </tcpTransport>
+
     <directoryService>#directoryService</directoryService>
   </ldapService>
 
+  <!-- 
+  +============================================================+
+  | LDAP Service configuration                                 |
+  +============================================================+
+  -->
   <ldapService id="ldapService"
-              tcpPort="10389"
               allowAnonymousAccess="false"
               saslHost="ldap.example.com"
               saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
               searchBaseDn="ou=users,ou=system"
               maxTimeLimit="15000"
-              maxSizeLimit="1000"
-              nbTcpThreads="8">
+              maxSizeLimit="1000">
+
+    <tcpTransport>
+      <tcpTransport port="10389" nbThreads="8" backLog="50"/>
+    </tcpTransport>
 
     <directoryService>#directoryService</directoryService>
 



Mime
View raw message