Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 6611 invoked from network); 27 Aug 2006 00:54:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Aug 2006 00:54:44 -0000 Received: (qmail 40533 invoked by uid 500); 27 Aug 2006 00:54:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40504 invoked by uid 500); 27 Aug 2006 00:54:44 -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 40493 invoked by uid 99); 27 Aug 2006 00:54:44 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Aug 2006 17:54:44 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Aug 2006 17:54:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 816F41A981A; Sat, 26 Aug 2006 17:54:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r437262 - in /directory/branches/apacheds/1.0: core-unit/src/test/java/org/apache/directory/server/core/jndi/ core/src/main/java/org/apache/directory/server/core/ server-jndi/src/main/java/org/apache/directory/server/jndi/ server-unit/src/t... Date: Sun, 27 Aug 2006 00:54:22 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060827005423.816F41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Sat Aug 26 17:54:20 2006 New Revision: 437262 URL: http://svn.apache.org/viewvc?rev=437262&view=rev Log: changes ... o Fix for DIRSERVER-588 o Fix for DIRSERVER-589 o Fixed broken delete test after these changes o Remove System.out.printlns from contributed test case Modified: directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/DelITest.java Modified: directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java?rev=437262&r1=437261&r2=437262&view=diff ============================================================================== --- directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java (original) +++ directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java Sat Aug 26 17:54:20 2006 @@ -68,7 +68,6 @@ user.put( "sn", "Hamilton" ); sysRoot.createSubcontext( "uid=bob,ou=people", user ); - System.out.println( sysRoot.getNameInNamespace() ); } Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=437262&r1=437261&r2=437262&view=diff ============================================================================== --- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Aug 26 17:54:20 2006 @@ -275,10 +275,10 @@ } finally { + serviceListener.afterShutdown( this ); environment = null; interceptorChain = null; startupConfiguration = null; - serviceListener.afterShutdown( this ); } } Modified: directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?rev=437262&r1=437261&r2=437262&view=diff ============================================================================== --- directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java (original) +++ directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java Sat Aug 26 17:54:20 2006 @@ -417,6 +417,7 @@ ServerContextFactory.class.getClassLoader() ).getMethod( "init", new Class[] { ServerStartupConfiguration.class } ).invoke( null, new Object[] { cfg } ); + ldapsStarted = true; } catch ( InvocationTargetException e ) { @@ -465,7 +466,8 @@ ((SocketSessionConfig)(acceptorCfg.getSessionConfig())).setTcpNoDelay( true ); tcpAcceptor.bind( new InetSocketAddress( port ), protocolProvider.getHandler(), acceptorCfg ); - + ldapStarted = true; + if ( log.isInfoEnabled() ) { log.info( "Successful bind of an LDAP Service (" + port + ") is complete." ); Modified: directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/DelITest.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/DelITest.java?rev=437262&r1=437261&r2=437262&view=diff ============================================================================== --- directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/DelITest.java (original) +++ directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/DelITest.java Sat Aug 26 17:54:20 2006 @@ -50,8 +50,8 @@ } protected void tearDown() throws LDAPException, Exception { - super.tearDown(); con.disconnect(); + super.tearDown(); } /**