Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 38343 invoked from network); 26 May 2007 00:35:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 May 2007 00:35:26 -0000 Received: (qmail 22248 invoked by uid 500); 26 May 2007 00:35:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 22210 invoked by uid 500); 26 May 2007 00:35:31 -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 22199 invoked by uid 99); 26 May 2007 00:35:31 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 17:35:31 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 17:35:25 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 878941A981A; Fri, 25 May 2007 17:35:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r541829 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: jndi/ sp/ trigger/ Date: Sat, 26 May 2007 00:35:05 -0000 To: commits@directory.apache.org From: erodriguez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070526003505.878941A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: erodriguez Date: Fri May 25 17:35:04 2007 New Revision: 541829 URL: http://svn.apache.org/viewvc?view=rev&rev=541829 Log: Removed unnecessary semicolons from core. Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Fri May 25 17:35:04 2007 @@ -166,7 +166,7 @@ this.env = ( Hashtable ) service.getConfiguration().getEnvironment().clone(); this.env.put( PROVIDER_URL, dn.toString() ); this.nexusProxy = new PartitionNexusProxy( this, service ); - ; + this.principal = principal; } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Fri May 25 17:35:04 2007 @@ -184,7 +184,7 @@ */ public void ldapUnbind() throws NamingException { - Object dn = getEnvironment().get( Context.SECURITY_PRINCIPAL );; + Object dn = getEnvironment().get( Context.SECURITY_PRINCIPAL ); if ( dn instanceof LdapDN ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Fri May 25 17:35:04 2007 @@ -167,8 +167,8 @@ } finally { - if ( defaultSearchContexts != null ) { try { defaultSearchContexts.close(); } catch( Exception e ) {} }; - if ( namingContexts != null ) { try { namingContexts.close(); } catch( Exception e ) {} }; + if ( defaultSearchContexts != null ) { try { defaultSearchContexts.close(); } catch( Exception e ) {} } + if ( namingContexts != null ) { try { namingContexts.close(); } catch( Exception e ) {} } } return defineClass( name, classBytes, 0, classBytes.length ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java Fri May 25 17:35:04 2007 @@ -92,7 +92,7 @@ public Object inject( StoredProcedureParameter param ) throws NamingException { return getOperationPrincipal(); - }; + } }; MicroInjector $ldapContextInjector = new MicroInjector() @@ -102,7 +102,7 @@ Generic_LDAP_CONTEXT ldapCtxParam = ( Generic_LDAP_CONTEXT ) param; LdapDN ldapCtxName = ldapCtxParam.getCtxName(); return ( ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller() ).getRootContext()).lookup( ldapCtxName ); - }; + } }; } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java Fri May 25 17:35:04 2007 @@ -50,7 +50,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( addedEntryName.getUpName() ); - }; + } }; MicroInjector $attributesInjector = new MicroInjector() @@ -58,7 +58,7 @@ public Object inject( StoredProcedureParameter param ) throws NamingException { return addedEntry.clone(); - }; + } }; } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Fri May 25 17:35:04 2007 @@ -54,7 +54,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( deletedEntryName.getUpName() ); - }; + } }; MicroInjector $deletedEntryInjector = new MicroInjector() @@ -62,7 +62,7 @@ public Object inject( StoredProcedureParameter param ) throws NamingException { return deletedEntry; - }; + } }; private Attributes getDeletedEntry() throws NamingException Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Fri May 25 17:35:04 2007 @@ -70,7 +70,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( oldDN.getUpName() ); - }; + } }; /** @@ -82,7 +82,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( newRDN.getUpName() ); - }; + } }; /** @@ -94,7 +94,7 @@ { // Return a safe copy constructed with user provided name. return new Boolean( deleteOldRn ); - }; + } }; /** @@ -106,7 +106,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( newSuperiorDN.getUpName() ); - }; + } }; /** @@ -118,7 +118,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( oldRDN.getUpName() ); - }; + } }; /** @@ -130,7 +130,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( oldSuperiorDN.getUpName() ); - }; + } }; /** @@ -142,7 +142,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( newDN.getUpName() ); - }; + } }; } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?view=diff&rev=541829&r1=541828&r2=541829 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Fri May 25 17:35:04 2007 @@ -60,7 +60,7 @@ { // Return a safe copy constructed with user provided name. return new LdapDN( modifiedEntryName.getUpName() ); - }; + } }; MicroInjector $modificationInjector = new MicroInjector() @@ -68,7 +68,7 @@ public Object inject( StoredProcedureParameter param ) throws NamingException { return modifications.clone(); - }; + } }; MicroInjector $oldEntryInjector = new MicroInjector() @@ -76,7 +76,7 @@ public Object inject( StoredProcedureParameter param ) throws NamingException { return oldEntry; - }; + } }; MicroInjector $newEntryInjector = new MicroInjector() @@ -84,7 +84,7 @@ public Object inject( StoredProcedureParameter param ) throws NamingException { return getEntry(); - }; + } }; private Attributes getEntry() throws NamingException