directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1296527 [1/4] - in /directory/apacheds/branches/apacheds-txns: ./ apache-felix/ core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-integ/src/test/java/org/apache/directory/server/core/configuration/ core-integ/sr...
Date Sat, 03 Mar 2012 00:20:12 GMT
Author: elecharny
Date: Sat Mar  3 00:20:10 2012
New Revision: 1296527

URL: http://svn.apache.org/viewvc?rev=1296527&view=rev
Log:
Merged trunk into txn branch

Removed:
    directory/apacheds/branches/apacheds-txns/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
Modified:
    directory/apacheds/branches/apacheds-txns/   (props changed)
    directory/apacheds/branches/apacheds-txns/apache-felix/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
    directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
    directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java
    directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java
    directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
    directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/branches/apacheds-txns/core-shared/   (props changed)
    directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/branches/apacheds-txns/dependencies/   (props changed)
    directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control
    directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/branches/apacheds-txns/interceptors/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/admin/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/authn/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/authz/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/changelog/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/collective/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/event/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/exception/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/hash/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/journal/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/logger/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/normalization/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/operational/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/referral/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/schema/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/subtree/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/trigger/   (props changed)
    directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
    directory/apacheds/branches/apacheds-txns/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
    directory/apacheds/branches/apacheds-txns/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/branches/apacheds-txns/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
    directory/apacheds/branches/apacheds-txns/protocol-changepw/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
    directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
    directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
    directory/apacheds/branches/apacheds-txns/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
    directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
    directory/apacheds/branches/apacheds-txns/server-tools/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-tools/src/main/resources/config/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=launchdiagnosticuihandler.ldif
    directory/apacheds/branches/apacheds-txns/service-osgi/   (props changed)
    directory/apacheds/branches/apacheds-txns/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java

Propchange: directory/apacheds/branches/apacheds-txns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree:965203-965686
 /directory/apacheds/branches/milestones:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1209070-1214194
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1177663-1183434,1209070-1214194
 /directory/studio/trunk:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/apache-felix:965203-965686
 /directory/apacheds/branches/milestones/apache-felix:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/apache-felix:945827-946347
-/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1185228-1201283,1209070-1214194
+/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1177663-1183434,1185228-1201283,1209070-1214194
 /directory/studio/trunk/apache-felix:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Sat Mar  3 00:20:10 2012
@@ -43,9 +43,10 @@ public class AvlPartitionFactory impleme
     /**
      * {@inheritDoc}
      */
-    public AvlPartition createPartition( SchemaManager schemaManager, String id, String suffix, int cacheSize, File workingDirectory,
-            TxnManagerFactory txnManagerFactory,
-            OperationExecutionManagerFactory executionManagerFactory )
+    public AvlPartition createPartition( SchemaManager schemaManager, String id, String suffix, int cacheSize,
+        File workingDirectory,
+        TxnManagerFactory txnManagerFactory,
+        OperationExecutionManagerFactory executionManagerFactory )
         throws Exception
     {
         AvlPartition partition = new AvlPartition( schemaManager, txnManagerFactory, executionManagerFactory );
@@ -53,7 +54,7 @@ public class AvlPartitionFactory impleme
         partition.setSuffixDn( new Dn( suffix ) );
         partition.setCacheSize( 500 );
         partition.setPartitionPath( workingDirectory.toURI() );
-        
+
         return partition;
     }
 

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Sat Mar  3 00:20:10 2012
@@ -62,6 +62,7 @@ public class DefaultDirectoryServiceFact
     /** The partition factory. */
     private PartitionFactory partitionFactory;
 
+
     public DefaultDirectoryServiceFactory()
     {
         try
@@ -70,7 +71,7 @@ public class DefaultDirectoryServiceFact
             // we we can set some properties like accesscontrol, anon access
             // before starting up the service
             directoryService = new DefaultDirectoryService();
-            
+
             // no need to register a shutdown hook during tests because this 
             // starts a lot of threads and slows down test execution
             directoryService.setShutdownHookEnabled( false );
@@ -83,7 +84,7 @@ public class DefaultDirectoryServiceFact
         try
         {
             String typeName = System.getProperty( "apacheds.partition.factory" );
-            
+
             if ( typeName != null )
             {
                 Class<? extends PartitionFactory> type = ( Class<? extends PartitionFactory> ) Class.forName( typeName );
@@ -129,19 +130,19 @@ public class DefaultDirectoryServiceFact
         }
 
         InstanceLayout instanceLayout = new InstanceLayout( instanceDirectory );
-        
+
         if ( instanceLayout.getInstanceDirectory().exists() )
         {
             try
             {
                 FileUtils.deleteDirectory( instanceLayout.getInstanceDirectory() );
             }
-            catch( IOException e )
+            catch ( IOException e )
             {
                 LOG.warn( "couldn't delete the instance directory before initializing the DirectoryService", e );
             }
         }
-        
+
         directoryService.setInstanceLayout( instanceLayout );
     }
 
@@ -156,7 +157,7 @@ public class DefaultDirectoryServiceFact
         // Extract the schema on disk (a brand new one) and load the registries
         File schemaRepository = new File( workingDirectory, "schema" );
         SchemaLdifExtractor extractor = new DefaultSchemaLdifExtractor( workingDirectory );
-        
+
         try
         {
             extractor.extractOrCopy();
@@ -168,7 +169,7 @@ public class DefaultDirectoryServiceFact
 
         SchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
-        
+
         // We have to load the schema now, otherwise we won't be able
         // to initialize the Partitions, as we won't be able to parse 
         // and normalize their suffix Dn
@@ -177,8 +178,9 @@ public class DefaultDirectoryServiceFact
         directoryService.setSchemaManager( schemaManager );
 
         // Init the LdifPartition
-        LdifPartition ldifPartition = new LdifPartition( schemaManager, getTxnManagerFactory(), getOperationExecutionManagerFactory() );
-        ldifPartition.setPartitionPath( new File(workingDirectory, "schema" ).toURI() );
+        LdifPartition ldifPartition = new LdifPartition( schemaManager, getTxnManagerFactory(),
+            getOperationExecutionManagerFactory() );
+        ldifPartition.setPartitionPath( new File( workingDirectory, "schema" ).toURI() );
         SchemaPartition schemaPartition = new SchemaPartition( schemaManager );
         schemaPartition.setWrappedPartition( ldifPartition );
         directoryService.setSchemaPartition( schemaPartition );
@@ -187,7 +189,7 @@ public class DefaultDirectoryServiceFact
 
         if ( errors.size() != 0 )
         {
-            throw new Exception( I18n.err( I18n.ERR_317, Exceptions.printErrors(errors) ) );
+            throw new Exception( I18n.err( I18n.ERR_317, Exceptions.printErrors( errors ) ) );
         }
     }
 
@@ -227,13 +229,15 @@ public class DefaultDirectoryServiceFact
         buildInstanceDirectory( name );
 
         // Initialize the txn subsystem and the operation execution manager
-        TxnManagerFactory txnManagerFactory = new TxnManagerFactory( directoryService.getInstanceLayout().getTxnLogDirectory().getPath(), 
+        TxnManagerFactory txnManagerFactory = new TxnManagerFactory( directoryService.getInstanceLayout()
+            .getTxnLogDirectory().getPath(),
             DefaultDirectoryService.TXN_LOG_BUFFER_SIZE, DefaultDirectoryService.TXN_LOG_FILE_SIZE );
-        OperationExecutionManagerFactory  executionManagerFactory = new OperationExecutionManagerFactory( txnManagerFactory );
-        
-        ( ( DefaultDirectoryService )directoryService ).setTxnManagerFactory( txnManagerFactory );
-        ( ( DefaultDirectoryService )directoryService ).setExecutionManagerFactory( executionManagerFactory );
-        
+        OperationExecutionManagerFactory executionManagerFactory = new OperationExecutionManagerFactory(
+            txnManagerFactory );
+
+        ( ( DefaultDirectoryService ) directoryService ).setTxnManagerFactory( txnManagerFactory );
+        ( ( DefaultDirectoryService ) directoryService ).setExecutionManagerFactory( executionManagerFactory );
+
         // Init the service now
         initSchema();
         initSystemPartition();
@@ -258,24 +262,23 @@ public class DefaultDirectoryServiceFact
     {
         return partitionFactory;
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public TxnManagerFactory getTxnManagerFactory()
     {
-        return ( ( DefaultDirectoryService )directoryService ).getTxnManagerFactory();
+        return ( ( DefaultDirectoryService ) directoryService ).getTxnManagerFactory();
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public OperationExecutionManagerFactory getOperationExecutionManagerFactory()
     {
-        return ( ( DefaultDirectoryService )directoryService ).getOperationExecutionManagerFactory();
+        return ( ( DefaultDirectoryService ) directoryService ).getOperationExecutionManagerFactory();
     }
-    
-    
+
 }

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java Sat Mar  3 00:20:10 2012
@@ -57,10 +57,10 @@ public interface DirectoryServiceFactory
      * @return the partition factory
      */
     PartitionFactory getPartitionFactory() throws Exception;
-    
-    
+
+
     TxnManagerFactory getTxnManagerFactory();
-    
-    
+
+
     OperationExecutionManagerFactory getOperationExecutionManagerFactory();
 }

Modified: directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-annotations/src/main/java/org/apache/directory/server/core/factory/PartitionFactory.java Sat Mar  3 00:20:10 2012
@@ -49,9 +49,10 @@ public interface PartitionFactory
      * @return the partition
      * @throws Exception the exception
      */
-    Partition createPartition( SchemaManager schemaManager, String id, String suffix, int cacheSize, File workingDirectory,
-            TxnManagerFactory txnManagerFactory,
-            OperationExecutionManagerFactory executionManagerFactory ) throws Exception;
+    Partition createPartition( SchemaManager schemaManager, String id, String suffix, int cacheSize,
+        File workingDirectory,
+        TxnManagerFactory txnManagerFactory,
+        OperationExecutionManagerFactory executionManagerFactory ) throws Exception;
 
 
     /**

Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Sat Mar  3 00:20:10 2012
@@ -58,37 +58,38 @@ public class PartitionConfigurationIT ex
 {
     public TxnManagerFactory getTxnManagerFactory()
     {
-        return ( ( DefaultDirectoryService )getService() ).getTxnManagerFactory();
+        return ( ( DefaultDirectoryService ) getService() ).getTxnManagerFactory();
     }
-    
-    
+
+
     public OperationExecutionManagerFactory getOperationExecutionManagerFactory()
     {
-        return ( ( DefaultDirectoryService )getService() ).getOperationExecutionManagerFactory();
+        return ( ( DefaultDirectoryService ) getService() ).getOperationExecutionManagerFactory();
     }
 
+
     @Test
     public void testAddAndRemove() throws Exception
     {
         DirectoryService service = getService();
         DirectoryServiceFactory dsFactory = DefaultDirectoryServiceFactory.class.newInstance();
         PartitionFactory partitionFactory = dsFactory.getPartitionFactory();
-        Partition partition = partitionFactory.createPartition( 
-            service.getSchemaManager(), 
-            "removable", 
-            "ou=removable", 
-            100, 
+        Partition partition = partitionFactory.createPartition(
+            service.getSchemaManager(),
+            "removable",
+            "ou=removable",
+            100,
             service.getInstanceLayout().getPartitionsDirectory(),
-            getTxnManagerFactory(), 
-            getOperationExecutionManagerFactory());
+            getTxnManagerFactory(),
+            getOperationExecutionManagerFactory() );
 
         // Test AddContextPartition
         service.addPartition( partition );
 
         Dn suffixDn = new Dn( service.getSchemaManager(), "ou=removable" );
 
-        Entry ctxEntry = new DefaultEntry( 
-            service.getSchemaManager(), 
+        Entry ctxEntry = new DefaultEntry(
+            service.getSchemaManager(),
             suffixDn.toString(),
             "objectClass: top",
             "objectClass: organizationalUnit",

Propchange: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -9,6 +9,6 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1180717-1209047,1209070-1214194
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1177663-1209047,1209070-1214194
 /directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sat Mar  3 00:20:10 2012
@@ -36,6 +36,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import javax.naming.NamingException;
+
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -108,7 +110,7 @@ public class SubschemaSubentryIT extends
     private String subschemaSubentryDn;
     private Entry subschemaSubentry;
 
-    
+
     @Before
     public void init() throws Exception
     {
@@ -120,7 +122,7 @@ public class SubschemaSubentryIT extends
         subschemaSubentryDn = subschemaSubentryAT.getString();
         updateSSSE();
     }
-    
+
 
     /**
      * Test for DIRSHARED-60.
@@ -157,7 +159,7 @@ public class SubschemaSubentryIT extends
      *
      * @throws NamingException on error
      */
-    @Test( expected = LdapException.class )
+    @Test(expected = LdapException.class)
     public void testSSSEDeleteRejection() throws Exception
     {
         connection.delete( subschemaSubentryDn );
@@ -170,7 +172,7 @@ public class SubschemaSubentryIT extends
      *
      * @throws NamingException on error
      */
-    @Test( expected = LdapException.class )
+    @Test(expected = LdapException.class)
     public void testSSSEAddRejection() throws Exception
     {
         connection.add( subschemaSubentry );
@@ -183,7 +185,7 @@ public class SubschemaSubentryIT extends
      *
      * @throws NamingException on error
      */
-    @Test( expected = LdapException.class )
+    @Test(expected = LdapException.class)
     public void testSSSERenameRejection() throws Exception
     {
         connection.rename( subschemaSubentryDn, "cn=schema,ou=system" );
@@ -579,7 +581,7 @@ public class SubschemaSubentryIT extends
         else
         {
             entry = connection.lookup( "m-oid=" + oid + ",ou=normalizers,cn=" + schemaName + ",ou=schema" );
-            
+
             assertNull( entry );
         }
 
@@ -688,7 +690,7 @@ public class SubschemaSubentryIT extends
         // -------------------------------------------------------------------
         // get the subschemaSubentry again
         updateSSSE();
-        
+
         Attribute attrTypes = subschemaSubentry.get( "ldapSyntaxes" );
         LdapSyntax ldapSyntax = null;
 
@@ -727,7 +729,7 @@ public class SubschemaSubentryIT extends
         else
         {
             entry = connection.lookup( "m-oid=" + oid + ",ou=syntaxes,cn=" + schemaName + ",ou=schema" );
-            
+
             assertNull( entry );
         }
 
@@ -889,7 +891,7 @@ public class SubschemaSubentryIT extends
         else
         {
             entry = connection.lookup( "m-oid=" + oid + ",ou=matchingRules,cn=" + schemaName + ",ou=schema" );
-            
+
             assertNull( entry );
         }
 
@@ -1052,7 +1054,7 @@ public class SubschemaSubentryIT extends
         // -------------------------------------------------------------------
         // get the subschemaSubentry again
         updateSSSE();
-        
+
         Attribute attrTypes = subschemaSubentry.get( "attributeTypes" );
         AttributeType attributeType = null;
 
@@ -1539,7 +1541,7 @@ public class SubschemaSubentryIT extends
         else
         {
             entry = connection.lookup( "m-oid=" + oid + ",ou=objectClasses,cn=" + schemaName + ",ou=schema" );
-            
+
             assertNull( entry );
         }
 
@@ -1820,7 +1822,7 @@ public class SubschemaSubentryIT extends
      * @throws NamingException on error
      */
     @Test
-    @Ignore( "The test is failing when run in conjonction with other tests" )
+    @Ignore("The test is failing when run in conjonction with other tests")
     // @TODO as we can't modify a schema element, the end of this test has been commented
     public void testTimestampAndModifierUpdates() throws Exception, InterruptedException
     {
@@ -1842,7 +1844,7 @@ public class SubschemaSubentryIT extends
 
         Calendar cal = Calendar.getInstance( tz );
         String modifyTimestampStr = modifyTimestampAttr.getString();
-        Date modifyTimestamp = DateUtils.getDate(modifyTimestampStr);
+        Date modifyTimestamp = DateUtils.getDate( modifyTimestampStr );
         Date currentTimestamp = cal.getTime();
 
         assertFalse( modifyTimestamp.after( currentTimestamp ) );
@@ -1887,7 +1889,7 @@ public class SubschemaSubentryIT extends
             "sn: bogus",
             "cn: bogus user",
             "userPassword: secret" );
-        
+
         connection.add( user );
 
         // now let's get a context for this user
@@ -1979,11 +1981,12 @@ public class SubschemaSubentryIT extends
 
         return new String( Base64.encode( out.toByteArray() ) );
     }
-    
-    
+
+
     private void updateSSSE() throws Exception
     {
-        subschemaSubentry = connection.lookup( subschemaSubentryDn, "*", "attributeTypes", "objectClasses", "ldapSyntaxes", "matchingRules",
+        subschemaSubentry = connection.lookup( subschemaSubentryDn, "*", "attributeTypes", "objectClasses",
+            "ldapSyntaxes", "matchingRules",
             "syntaxCheckers", "normalizers", "comparators" );
     }
 }

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sat Mar  3 00:20:10 2012
@@ -85,9 +85,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyResponseImpl;
+import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator;
@@ -155,8 +155,8 @@ public abstract class ServerContext impl
     private final Dn dn;
 
     /** The set of registered NamingListeners */
-    private final Map<NamingListener,DirectoryListener> listeners =
-        new HashMap<NamingListener,DirectoryListener>();
+    private final Map<NamingListener, DirectoryListener> listeners =
+        new HashMap<NamingListener, DirectoryListener>();
 
     /** The request controls to set on operations before performing them */
     protected Control[] requestControls = EMPTY_CONTROLS;
@@ -186,7 +186,7 @@ public abstract class ServerContext impl
         ADS_CONTROLS.put( SyncRequestValue.OID, ControlEnum.SYNC_REQUEST_VALUE_CONTROL );
         ADS_CONTROLS.put( SyncStateValue.OID, ControlEnum.SYNC_STATE_VALUE_CONTROL );
     }
-    
+
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -224,8 +224,8 @@ public abstract class ServerContext impl
         OperationManager operationManager = service.getOperationManager();
 
         HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
-        
-        if ( ! operationManager.hasEntry( hasEntryContext ) )
+
+        if ( !operationManager.hasEntry( hasEntryContext ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -259,8 +259,8 @@ public abstract class ServerContext impl
         OperationManager operationManager = service.getOperationManager();
 
         HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
-        
-        if ( ! operationManager.hasEntry( hasEntryContext ) )
+
+        if ( !operationManager.hasEntry( hasEntryContext ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -283,8 +283,8 @@ public abstract class ServerContext impl
         OperationManager operationManager = service.getOperationManager();
 
         HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
-        
-        if ( ! operationManager.hasEntry( hasEntryContext ) )
+
+        if ( !operationManager.hasEntry( hasEntryContext ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -302,11 +302,11 @@ public abstract class ServerContext impl
      */
     protected void injectReferralControl( OperationContext opCtx )
     {
-        if ( "ignore".equalsIgnoreCase( (String)env.get( Context.REFERRAL ) ) )
+        if ( "ignore".equalsIgnoreCase( ( String ) env.get( Context.REFERRAL ) ) )
         {
             opCtx.ignoreReferral();
         }
-        else if ( "throw".equalsIgnoreCase( (String)env.get( Context.REFERRAL ) ) )
+        else if ( "throw".equalsIgnoreCase( ( String ) env.get( Context.REFERRAL ) ) )
         {
             opCtx.throwReferral();
         }
@@ -316,6 +316,8 @@ public abstract class ServerContext impl
             opCtx.throwReferral();
         }
     }
+
+
     // ------------------------------------------------------------------------
     // Protected Methods for Operations
     // ------------------------------------------------------------------------
@@ -389,17 +391,17 @@ public abstract class ServerContext impl
         {
             case CASCADE_CONTROL:
                 control = new CascadeDecorator( getDirectoryService().getLdapCodecService(), new CascadeImpl() );
-                
+
                 break;
 
             case ENTRY_CHANGE_CONTROL:
                 control = new EntryChangeDecorator( getDirectoryService().getLdapCodecService() );
-                
+
                 break;
 
             case MANAGE_DSA_IT_CONTROL:
                 control = new ManageDsaITDecorator( getDirectoryService().getLdapCodecService(), new ManageDsaITImpl() );
-                
+
                 break;
 
             case PAGED_RESULTS_CONTROL:
@@ -428,12 +430,12 @@ public abstract class ServerContext impl
 
             case SUBENTRIES_CONTROL:
                 control = new SubentriesDecorator( getDirectoryService().getLdapCodecService() );
-                
+
                 break;
 
             case SYNC_DONE_VALUE_CONTROL:
                 control = new SyncDoneValueDecorator( getDirectoryService().getLdapCodecService() );
-                
+
                 break;
 
             case SYNC_INFO_VALUE_CONTROL:
@@ -454,9 +456,9 @@ public abstract class ServerContext impl
 
         control.setCritical( jndiControl.isCritical() );
         control.setValue( jndiControl.getEncodedValue() );
-        
+
         byte[] value = jndiControl.getEncodedValue();
-        
+
         if ( !Strings.isEmpty( value ) )
         {
             control.decode( value );
@@ -465,6 +467,7 @@ public abstract class ServerContext impl
         return control;
     }
 
+
     /**
      * Convert the JNDI controls to ADS controls
      * TODO convertControls.
@@ -510,7 +513,7 @@ public abstract class ServerContext impl
         Object typesOnlyObj = getEnvironment().get( "java.naming.ldap.typesOnly" );
         boolean typesOnly = false;
 
-        if( typesOnlyObj != null )
+        if ( typesOnlyObj != null )
         {
             typesOnly = Boolean.parseBoolean( typesOnlyObj.toString() );
         }
@@ -523,10 +526,11 @@ public abstract class ServerContext impl
         // should be asked to be returned.
         if ( ( searchControls.getSearchScope() == SearchControls.OBJECT_SCOPE )
             && ( ( searchControls.getReturningAttributes() != null )
-                && ( searchControls.getReturningAttributes().length == 0 ) )
+            && ( searchControls.getReturningAttributes().length == 0 ) )
             && ( filter instanceof EqualityNode ) )
         {
-            CompareOperationContext compareContext = new CompareOperationContext( session, dn, ((EqualityNode <?>)filter).getAttribute(), ((EqualityNode)filter).getValue() );
+            CompareOperationContext compareContext = new CompareOperationContext( session, dn,
+                ( ( EqualityNode<?> ) filter ).getAttribute(), ( ( EqualityNode ) filter ).getValue() );
 
             // Inject the referral handling into the operation context
             injectReferralControl( compareContext );
@@ -540,7 +544,7 @@ public abstract class ServerContext impl
             searchContext.setAliasDerefMode( aliasDerefMode );
             searchContext.addRequestControls( convertControls( true, requestControls ) );
 
-            searchContext.setTypesOnly(  typesOnly );
+            searchContext.setTypesOnly( typesOnly );
 
             if ( result )
             {
@@ -560,7 +564,7 @@ public abstract class ServerContext impl
             searchContext = new SearchOperationContext( session, dn, filter, searchControls );
             searchContext.setAliasDerefMode( aliasDerefMode );
             searchContext.addRequestControls( convertControls( true, requestControls ) );
-            searchContext.setTypesOnly(  typesOnly );
+            searchContext.setTypesOnly( typesOnly );
 
             // Inject the referral handling into the operation context
             injectReferralControl( searchContext );
@@ -604,11 +608,11 @@ public abstract class ServerContext impl
     {
         GetRootDseOperationContext getRootDseContext = new GetRootDseOperationContext( session, target );
         getRootDseContext.addRequestControls( convertControls( true, requestControls ) );
-        
+
         // do not reset request controls since this is not an external
         // operation and not do bother setting the response controls either
         OperationManager operationManager = service.getOperationManager();
-        
+
         return operationManager.getRootDse( getRootDseContext );
     }
 
@@ -654,7 +658,7 @@ public abstract class ServerContext impl
         // Now remove the ObjectClass attribute if it has not been requested
         if ( ( lookupContext.getAttrsId() != null ) && ( lookupContext.getAttrsId().size() != 0 ) &&
             ( ( serverEntry.get( SchemaConstants.OBJECT_CLASS_AT ) != null )
-                && ( serverEntry.get( SchemaConstants.OBJECT_CLASS_AT ).size() == 0 ) ) )
+            && ( serverEntry.get( SchemaConstants.OBJECT_CLASS_AT ).size() == 0 ) ) )
         {
             serverEntry.removeAttributes( SchemaConstants.OBJECT_CLASS_AT );
         }
@@ -697,8 +701,9 @@ public abstract class ServerContext impl
         throws Exception
     {
         // setup the op context and populate with request controls
-        MoveAndRenameOperationContext moveAndRenameContext = new MoveAndRenameOperationContext( session, oldDn, parent, new Rdn(
-            newRdn ), delOldDn );
+        MoveAndRenameOperationContext moveAndRenameContext = new MoveAndRenameOperationContext( session, oldDn, parent,
+            new Rdn(
+                newRdn ), delOldDn );
         moveAndRenameContext.addRequestControls( convertControls( true, requestControls ) );
 
         // Inject the referral handling into the operation context
@@ -824,7 +829,6 @@ public abstract class ServerContext impl
     // Protected Accessor Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * Gets the distinguished name of the entry associated with this Context.
      *
@@ -930,7 +934,7 @@ public abstract class ServerContext impl
         }
         catch ( LdapException le )
         {
-            throw new SchemaViolationException( I18n.err( I18n.ERR_491, name) );
+            throw new SchemaViolationException( I18n.err( I18n.ERR_491, name ) );
         }
 
         // Now add the CN attribute, which is mandatory
@@ -945,13 +949,13 @@ public abstract class ServerContext impl
             else
             {
                 // No CN in the rdn, this is an error
-                throw new SchemaViolationException( I18n.err( I18n.ERR_491, name) );
+                throw new SchemaViolationException( I18n.err( I18n.ERR_491, name ) );
             }
         }
         else
         {
             // No CN in the rdn, this is an error
-            throw new SchemaViolationException( I18n.err( I18n.ERR_491, name) );
+            throw new SchemaViolationException( I18n.err( I18n.ERR_491, name ) );
         }
 
         /*
@@ -1060,8 +1064,8 @@ public abstract class ServerContext impl
 
         try
         {
-            outServerEntry = ServerEntryUtils.toServerEntry( AttributeUtils.toCaseInsensitive(res
-                    .getAttributes()), target, service.getSchemaManager() );
+            outServerEntry = ServerEntryUtils.toServerEntry( AttributeUtils.toCaseInsensitive( res
+                .getAttributes() ), target, service.getSchemaManager() );
         }
         catch ( LdapInvalidAttributeTypeException liate )
         {
@@ -1232,7 +1236,6 @@ public abstract class ServerContext impl
 
         newParent = newParent.getParent();
 
-
         Rdn oldRdn = oldDn.getRdn();
         Rdn newRdn = newDn.getRdn();
         boolean delOldRdn = true;
@@ -1315,7 +1318,7 @@ public abstract class ServerContext impl
         try
         {
             HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, target );
-            
+
             if ( operationManager.hasEntry( hasEntryContext ) )
             {
                 doDeleteOperation( target );
@@ -1360,7 +1363,7 @@ public abstract class ServerContext impl
      */
     public Object lookup( String name ) throws NamingException
     {
-        if ( Strings.isEmpty(name) )
+        if ( Strings.isEmpty( name ) )
         {
             return lookup( new LdapName( "" ) );
         }
@@ -1530,7 +1533,7 @@ public abstract class ServerContext impl
     {
         try
         {
-            return new NamingEnumerationAdapter( doListOperation( buildTarget( JndiUtils.fromName(name) ) ) );
+            return new NamingEnumerationAdapter( doListOperation( buildTarget( JndiUtils.fromName( name ) ) ) );
         }
         catch ( Exception e )
         {
@@ -1614,7 +1617,7 @@ public abstract class ServerContext impl
 
         // 1). Find the Dn for name and walk it from the head to tail
         Dn fqn = buildTarget( JndiUtils.fromName( name ) );
-        
+
         try
         {
             return JndiUtils.toName( JndiUtils.fromName( prefix ).add( fqn ) );
@@ -1717,7 +1720,7 @@ public abstract class ServerContext impl
             target = target.add( relativeName );
             target.apply( schemaManager );
         }
-        catch (LdapInvalidDnException lide )
+        catch ( LdapInvalidDnException lide )
         {
             throw new InvalidNameException( lide.getMessage() );
         }

Modified: directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sat Mar  3 00:20:10 2012
@@ -120,7 +120,6 @@ public abstract class ServerDirContext e
     // DirContext Implementations
     // ------------------------------------------------------------------------
 
-
     public ServerDirContext( DirectoryService service, CoreSession session, Name bindDn ) throws Exception
     {
         super( service, session, bindDn );
@@ -175,7 +174,8 @@ public abstract class ServerDirContext e
         Attributes attrs = null;
         try
         {
-            attrs = ServerEntryUtils.toBasicAttributes( doLookupOperation( buildTarget( JndiUtils.fromName( name ) ), attrIds ) );
+            attrs = ServerEntryUtils.toBasicAttributes( doLookupOperation( buildTarget( JndiUtils.fromName( name ) ),
+                attrIds ) );
         }
         catch ( Exception e )
         {
@@ -192,7 +192,7 @@ public abstract class ServerDirContext e
      */
     public void modifyAttributes( String name, int modOp, Attributes attrs ) throws NamingException
     {
-        modifyAttributes( new LdapName( name ), modOp, AttributeUtils.toCaseInsensitive(attrs) );
+        modifyAttributes( new LdapName( name ), modOp, AttributeUtils.toCaseInsensitive( attrs ) );
     }
 
 
@@ -236,7 +236,7 @@ public abstract class ServerDirContext e
         {
             doModifyOperation( buildTarget( JndiUtils.fromName( name ) ), newMods );
         }
-        catch( Exception e )
+        catch ( Exception e )
         {
             JndiUtils.wrap( e );
         }
@@ -527,7 +527,7 @@ public abstract class ServerDirContext e
         try
         {
             HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( getSession(), target );
-            
+
             if ( getDirectoryService().getOperationManager().hasEntry( hasEntryContext ) )
             {
                 doDeleteOperation( target );
@@ -594,7 +594,6 @@ public abstract class ServerDirContext e
             JndiUtils.wrap( e );
         }
 
-
         return ctx;
     }
 
@@ -723,7 +722,8 @@ public abstract class ServerDirContext e
                 }
                 else
                 {
-                    node = new EqualityNode<String>( attributeType, new org.apache.directory.shared.ldap.model.entry.StringValue( ( String ) value ) );
+                    node = new EqualityNode<String>( attributeType,
+                        new org.apache.directory.shared.ldap.model.entry.StringValue( ( String ) value ) );
                 }
 
                 AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
@@ -735,7 +735,7 @@ public abstract class ServerDirContext e
                 }
                 catch ( Exception e )
                 {
-                    JndiUtils.wrap(e);
+                    JndiUtils.wrap( e );
                     return null; // shut compiler up
                 }
             }
@@ -777,7 +777,8 @@ public abstract class ServerDirContext e
                 // Add simpel Ava node if its value is a String
                 if ( val instanceof String )
                 {
-                    node = new EqualityNode<String>( attr.getID(), new org.apache.directory.shared.ldap.model.entry.StringValue( ( String ) val ) );
+                    node = new EqualityNode<String>( attr.getID(),
+                        new org.apache.directory.shared.ldap.model.entry.StringValue( ( String ) val ) );
                     filter.addNode( node );
                 }
             }
@@ -957,7 +958,6 @@ public abstract class ServerDirContext e
     // EventDirContext implementations
     // ------------------------------------------------------------------------
 
-
     public void addNamingListener( Name name, String filterStr, SearchControls searchControls,
         NamingListener namingListener ) throws NamingException
     {
@@ -965,7 +965,7 @@ public abstract class ServerDirContext e
 
         try
         {
-            filter = FilterParser.parse(schemaManager, filterStr);
+            filter = FilterParser.parse( schemaManager, filterStr );
         }
         catch ( Exception e )
         {

Propchange: directory/apacheds/branches/apacheds-txns/core-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/core-shared:965203-965686
 /directory/apacheds/branches/milestones/core-shared:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-shared:945827-946347
-/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1183559-1209047,1209070-1214194
+/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1177663-1183434,1183559-1209047,1209070-1214194
 /directory/studio/trunk/core-shared:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Mar  3 00:20:10 2012
@@ -2392,8 +2392,8 @@ public class DefaultDirectoryService imp
      */
     public boolean isPwdPolicyEnabled()
     {
-        AuthenticationInterceptor authenticationInterceptor = ( AuthenticationInterceptor ) getInterceptor( InterceptorEnum.AUTHENTICATION_INTERCEPTOR
-            .getName() );
+        AuthenticationInterceptor authenticationInterceptor =
+            ( AuthenticationInterceptor ) getInterceptor( InterceptorEnum.AUTHENTICATION_INTERCEPTOR.getName() );
 
         if ( authenticationInterceptor == null )
         {

Modified: directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Sat Mar  3 00:20:10 2012
@@ -405,7 +405,7 @@ public class DefaultOperationManager imp
 
             do
             {
-                if( curTxn == null )
+                if ( curTxn == null )
                 {
                     beginTransactionRW( txnManager );
                     startedTxn = true;
@@ -431,7 +431,7 @@ public class DefaultOperationManager imp
                 {
                     commitTransaction( txnManager );
                 }
-                
+
                 txnManager.applyPendingTxns();
             }
             while ( !done );
@@ -456,7 +456,7 @@ public class DefaultOperationManager imp
 
         boolean done = false;
         TxnManager txnManager = directoryService.getTxnManager();
-        
+
         do
         {
             beginTransactionRW( txnManager );
@@ -473,9 +473,8 @@ public class DefaultOperationManager imp
                  *  here. For now commit on every exception other than maybe
                  *  conflict exception.
                  */
-                
+
                 commitTransaction( txnManager );
-               
 
                 throw ( le );
             }

Propchange: directory/apacheds/branches/apacheds-txns/dependencies/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/dependencies:965203-965686
 /directory/apacheds/branches/milestones/dependencies:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/dependencies:945827-946347
-/directory/apacheds/trunk/dependencies:1066126-1067785,1068026-1072718,1072800-1075329,1185228-1201283,1209070-1214194
+/directory/apacheds/trunk/dependencies:1066126-1067785,1068026-1072718,1072800-1075329,1177663-1183434,1185228-1201283,1209070-1214194
 /directory/studio/trunk/dependencies:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control (original)
+++ directory/apacheds/branches/apacheds-txns/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control Sat Mar  3 00:20:10 2012
@@ -1,3 +1,25 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
 Package: apacheds
 Version: ${version.debian}
 Section: devel

Modified: directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-txns/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sat Mar  3 00:20:10 2012
@@ -74,6 +74,7 @@ public class KeyDerivationInterceptor ex
     /** The service name. */
     private static final String NAME = "keyDerivationService";
 
+
     /**
      * Creates an instance of a KeyDerivationInterceptor.
      */
@@ -81,8 +82,8 @@ public class KeyDerivationInterceptor ex
     {
         super( NAME );
     }
-    
-    
+
+
     /**
      * Intercept the addition of the 'userPassword' and 'krb5PrincipalName' attributes.  Use the 'userPassword'
      * and 'krb5PrincipalName' attributes to derive Kerberos keys for the principal.  If the 'userPassword' is
@@ -100,7 +101,7 @@ public class KeyDerivationInterceptor ex
         {
             log.debug( "Adding the entry '{}' for Dn '{}'.", entry, normName.getName() );
 
-            BinaryValue userPassword = (BinaryValue)entry.get( SchemaConstants.USER_PASSWORD_AT ).get();
+            BinaryValue userPassword = ( BinaryValue ) entry.get( SchemaConstants.USER_PASSWORD_AT ).get();
             String strUserPassword = userPassword.getString();
 
             if ( log.isDebugEnabled() )
@@ -172,14 +173,15 @@ public class KeyDerivationInterceptor ex
      * @param subContext
      * @throws LdapException
      */
-    void detectPasswordModification( ModifyOperationContext modContext, ModifySubContext subContext ) throws LdapException
+    void detectPasswordModification( ModifyOperationContext modContext, ModifySubContext subContext )
+        throws LdapException
     {
         List<Modification> mods = modContext.getModItems();
 
         String operation = null;
 
         // Loop over attributes being modified to pick out 'userPassword' and 'krb5PrincipalName'.
-        for ( Modification mod:mods )
+        for ( Modification mod : mods )
         {
             if ( log.isDebugEnabled() )
             {
@@ -208,18 +210,18 @@ public class KeyDerivationInterceptor ex
 
                 if ( firstValue instanceof StringValue )
                 {
-                    password = ((StringValue)firstValue).getString();
+                    password = ( ( StringValue ) firstValue ).getString();
                     log.debug( "{} Attribute id : 'userPassword',  Values : [ '{}' ]", operation, password );
                 }
                 else if ( firstValue instanceof BinaryValue )
                 {
-                    password = ((BinaryValue)firstValue).getString();
+                    password = ( ( BinaryValue ) firstValue ).getString();
 
                     if ( log.isDebugEnabled() )
                     {
                         StringBuffer sb = new StringBuffer();
                         sb.append( "'" + password + "' ( " );
-                        sb.append( Strings.dumpBytes(((BinaryValue) firstValue).getBytes()).trim() );
+                        sb.append( Strings.dumpBytes( ( ( BinaryValue ) firstValue ).getBytes() ).trim() );
                         sb.append( " )" );
                         log.debug( "{} Attribute id : 'userPassword',  Values : [ {} ]", operation, sb.toString() );
                     }
@@ -245,17 +247,18 @@ public class KeyDerivationInterceptor ex
      * @param subContext
      * @throws LdapException
      */
-    void lookupPrincipalAttributes( ModifyOperationContext modContext, ModifySubContext subContext ) throws LdapException
+    void lookupPrincipalAttributes( ModifyOperationContext modContext, ModifySubContext subContext )
+        throws LdapException
     {
         Dn principalDn = modContext.getDn();
 
         LookupOperationContext lookupContext = modContext.newLookupContext( principalDn );
         lookupContext.setAttrsId( new String[]
             {
-            SchemaConstants.OBJECT_CLASS_AT,
-            KerberosAttribute.KRB5_PRINCIPAL_NAME_AT,
-            KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT
-            } );
+                SchemaConstants.OBJECT_CLASS_AT,
+                KerberosAttribute.KRB5_PRINCIPAL_NAME_AT,
+                KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT
+        } );
 
         Entry userEntry = directoryService.getPartitionNexus().lookup( lookupContext );
 
@@ -264,7 +267,8 @@ public class KeyDerivationInterceptor ex
             throw new LdapAuthenticationException( I18n.err( I18n.ERR_512, principalDn ) );
         }
 
-        Attribute objectClass = ((ClonedServerEntry)userEntry).getOriginalEntry().get( SchemaConstants.OBJECT_CLASS_AT );
+        Attribute objectClass = ( ( ClonedServerEntry ) userEntry ).getOriginalEntry().get(
+            SchemaConstants.OBJECT_CLASS_AT );
 
         if ( !objectClass.contains( SchemaConstants.KRB5_PRINCIPAL_OC ) )
         {
@@ -278,13 +282,15 @@ public class KeyDerivationInterceptor ex
 
         if ( subContext.getPrincipalName() == null )
         {
-            Attribute principalAttribute = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
+            Attribute principalAttribute = ( ( ClonedServerEntry ) userEntry ).getOriginalEntry().get(
+                KerberosAttribute.KRB5_PRINCIPAL_NAME_AT );
             String principalName = principalAttribute.getString();
             subContext.setPrincipalName( principalName );
             log.debug( "Found principal '{}' from lookup.", principalName );
         }
 
-        Attribute keyVersionNumberAttr = ((ClonedServerEntry)userEntry).getOriginalEntry().get( KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT );
+        Attribute keyVersionNumberAttr = ( ( ClonedServerEntry ) userEntry ).getOriginalEntry().get(
+            KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT );
 
         if ( keyVersionNumberAttr == null )
         {
@@ -324,7 +330,7 @@ public class KeyDerivationInterceptor ex
         List<Modification> newModsList = new ArrayList<Modification>();
 
         // Make sure we preserve any other modification items.
-        for ( Modification mod:mods )
+        for ( Modification mod : mods )
         {
             newModsList.add( mod );
         }
@@ -356,7 +362,8 @@ public class KeyDerivationInterceptor ex
     }
 
 
-    private Attribute getKeyAttribute( SchemaManager schemaManager, Map<EncryptionType, EncryptionKey> keys ) throws LdapException
+    private Attribute getKeyAttribute( SchemaManager schemaManager, Map<EncryptionType, EncryptionKey> keys )
+        throws LdapException
     {
         Attribute keyAttribute =
             new DefaultAttribute( KerberosAttribute.KRB5_KEY_AT,
@@ -402,7 +409,6 @@ public class KeyDerivationInterceptor ex
         }
     }
 
-
     static class ModifySubContext
     {
         private boolean isPrincipal = false;

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors:1183435-1186978,1209070-1214194
+/directory/apacheds/trunk/interceptors:1177663-1186978,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/admin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/admin:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/admin:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/authn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/authn:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/authn:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/authz/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/authz:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/authz:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/changelog/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/changelog:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/changelog:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/collective/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/collective:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/collective:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/event:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/event:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/exception/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/exception:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/exception:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/hash/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/hash:1183435-1201301,1209070-1214194
+/directory/apacheds/trunk/interceptors/hash:1177663-1201301,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/journal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/journal:1183435-1209047,1209070-1214194
+/directory/apacheds/trunk/interceptors/journal:1177663-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/logger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/logger:1183435-1201301,1209070-1214194
+/directory/apacheds/trunk/interceptors/logger:1177663-1201301,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/normalization/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/normalization:1183435-1209046,1209070-1214194
+/directory/apacheds/trunk/interceptors/normalization:1177663-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/operational/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/operational:1183435-1209046,1209070-1214194
+/directory/apacheds/trunk/interceptors/operational:1177663-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/referral/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/referral:1183435-1209046,1209070-1214194
+/directory/apacheds/trunk/interceptors/referral:1177663-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/schema:1183435-1209046,1209070-1214194
+/directory/apacheds/trunk/interceptors/schema:1177663-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/subtree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/subtree:1183435-1209046,1209070-1214194
+/directory/apacheds/trunk/interceptors/subtree:1177663-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/trigger:1183435-1209046,1209070-1214194
+/directory/apacheds/trunk/interceptors/trigger:1177663-1209046,1209070-1214194

Modified: directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sat Mar  3 00:20:10 2012
@@ -102,14 +102,15 @@ public class JdbmStoreTest
 
     /** The SN AttributeType instance */
     private static AttributeType SN_AT;
-    
+
     /** Operation execution manager */
     private static OperationExecutionManager executionManager;
-    
+
     /** txn and operation execution manager factories */
     private static TxnManagerFactory txnManagerFactory;
     private static OperationExecutionManagerFactory executionManagerFactory;
 
+
     @BeforeClass
     public static void setup() throws Exception
     {
@@ -121,7 +122,7 @@ public class JdbmStoreTest
             int targetPos = path.indexOf( "target" );
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
-        
+
         File logDir = new File( workingDirectory + File.separatorChar + "txnlog" + File.separatorChar );
         logDir.mkdirs();
         txnManagerFactory = new TxnManagerFactory( logDir.getPath(), 1 << 13, 1 << 14 );
@@ -138,7 +139,7 @@ public class JdbmStoreTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         EXAMPLE_COM = new Dn( schemaManager, "dc=example,dc=com" );
@@ -168,7 +169,7 @@ public class JdbmStoreTest
         JdbmIndex ouIndex = new JdbmIndex( SchemaConstants.OU_AT_OID );
         ouIndex.setWkDirPath( wkdir.toURI() );
         store.addIndex( ouIndex );
-        
+
         JdbmIndex uidIndex = new JdbmIndex( SchemaConstants.UID_AT_OID );
         uidIndex.setWkDirPath( wkdir.toURI() );
         store.addIndex( uidIndex );
@@ -254,7 +255,7 @@ public class JdbmStoreTest
 
         assertNull( jdbmPartition.getAliasIndex() );
         Index<String> index = new JdbmIndex<String>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
-        ((Store)jdbmPartition).addIndex( index );
+        ( ( Store ) jdbmPartition ).addIndex( index );
         assertNotNull( jdbmPartition.getAliasIndex() );
 
         assertEquals( JdbmPartition.DEFAULT_CACHE_SIZE, jdbmPartition.getCacheSize() );
@@ -266,11 +267,11 @@ public class JdbmStoreTest
         assertNotNull( jdbmPartition.getPresenceIndex() );
 
         assertNull( jdbmPartition.getOneLevelIndex() );
-        ((Store)jdbmPartition).addIndex( new JdbmIndex<UUID>( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) );
+        ( ( Store ) jdbmPartition ).addIndex( new JdbmIndex<UUID>( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) );
         assertNotNull( jdbmPartition.getOneLevelIndex() );
 
         assertNull( jdbmPartition.getSubLevelIndex() );
-        ((Store)jdbmPartition).addIndex( new JdbmIndex<UUID>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
+        ( ( Store ) jdbmPartition ).addIndex( new JdbmIndex<UUID>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
         assertNotNull( jdbmPartition.getSubLevelIndex() );
 
         assertNull( jdbmPartition.getId() );
@@ -282,7 +283,7 @@ public class JdbmStoreTest
         assertNotNull( jdbmPartition.getRdnIndex() );
 
         assertNull( jdbmPartition.getOneAliasIndex() );
-        ((Store)jdbmPartition).addIndex( new JdbmIndex<UUID>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) );
+        ( ( Store ) jdbmPartition ).addIndex( new JdbmIndex<UUID>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) );
         assertNotNull( jdbmPartition.getOneAliasIndex() );
 
         assertNull( jdbmPartition.getSubAliasIndex() );
@@ -450,13 +451,13 @@ public class JdbmStoreTest
 
         Iterator<String> userIndices = store.getUserIndices();
         int count = 0;
-        
+
         while ( userIndices.hasNext() )
         {
             userIndices.next();
             count++;
         }
-        
+
         assertEquals( 2, count );
         assertFalse( store.hasUserIndexOn( DC_AT ) );
         assertTrue( store.hasUserIndexOn( OU_AT ) );
@@ -509,7 +510,8 @@ public class JdbmStoreTest
         assertEquals( Strings.getUUIDString( 1 ), executionManager.getEntryId( store, dn ) );
         assertEquals( 11, store.count() );
         assertEquals( "o=Good Times Co.", executionManager.buildEntryDn( store, Strings.getUUIDString( 1 ) ).getName() );
-        assertEquals( dn.getNormName(), executionManager.buildEntryDn( store, Strings.getUUIDString( 1 ) ).getNormName() );
+        assertEquals( dn.getNormName(), executionManager.buildEntryDn( store, Strings.getUUIDString( 1 ) )
+            .getNormName() );
         assertEquals( dn.getName(), executionManager.buildEntryDn( store, Strings.getUUIDString( 1 ) ).getName() );
 
         // note that the suffix entry returns 0 for it's parent which does not exist
@@ -517,7 +519,8 @@ public class JdbmStoreTest
         assertNull( executionManager.getParentId( store, Strings.getUUIDString( 0 ) ) );
 
         // should NOW be allowed
-        executionManager.delete( store,  executionManager.buildEntryDn( store, Strings.getUUIDString( 1 ) ), Strings.getUUIDString( 1 ) );
+        executionManager.delete( store, executionManager.buildEntryDn( store, Strings.getUUIDString( 1 ) ),
+            Strings.getUUIDString( 1 ) );
     }
 
 
@@ -534,7 +537,8 @@ public class JdbmStoreTest
         assertTrue( cursor.next() );
         assertEquals( 3, executionManager.getChildCount( store, Strings.getUUIDString( 1 ) ) );
 
-        executionManager.delete( store, executionManager.buildEntryDn( store, Strings.getUUIDString( 2 ) ), Strings.getUUIDString( 2 ) );
+        executionManager.delete( store, executionManager.buildEntryDn( store, Strings.getUUIDString( 2 ) ),
+            Strings.getUUIDString( 2 ) );
         assertEquals( 2, executionManager.getChildCount( store, Strings.getUUIDString( 1 ) ) );
         assertEquals( 10, store.count() );
 
@@ -547,11 +551,11 @@ public class JdbmStoreTest
         entry.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
-        
+
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
-        executionManager.delete( store,  dn, Strings.getUUIDString( 12 ) ); // drops the alias indices
+        executionManager.delete( store, dn, Strings.getUUIDString( 12 ) ); // drops the alias indices
 
     }
 
@@ -597,7 +601,7 @@ public class JdbmStoreTest
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) );
         cursor.afterLast();
@@ -622,7 +626,7 @@ public class JdbmStoreTest
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
         entry.add( "entryUUID", Strings.getUUIDString( 13 ).toString() );
         addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         // dn id 14
         Dn jimmyDn = new Dn( schemaManager, "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
@@ -633,7 +637,7 @@ public class JdbmStoreTest
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
         entry.add( "entryUUID", Strings.getUUIDString( 14 ).toString() );
         addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         newDn = newParentDn.add( marketingDn.getRdn() );
 
@@ -698,7 +702,7 @@ public class JdbmStoreTest
         entry.add( "cn", "Martin King" );
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
     }
 
 
@@ -711,7 +715,7 @@ public class JdbmStoreTest
         entry.add( "cn", "Martin King" );
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
     }
 
 
@@ -725,7 +729,7 @@ public class JdbmStoreTest
 
         Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
 
-        executionManager.modify( store,  dn, add );
+        executionManager.modify( store, dn, add );
     }
 
 
@@ -741,12 +745,12 @@ public class JdbmStoreTest
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         Rdn rdn = new Rdn( "sn=James" );
 
         executionManager.rename( store, dn, rdn, true, null, addContext.getModifiedEntry() );
-        
+
         dn = new Dn( schemaManager, "sn=James,ou=Engineering,o=Good Times Co." );
         Entry renamed = executionManager.lookup( store, new LookupOperationContext( null, dn ) );
         assertNotNull( renamed );
@@ -766,7 +770,7 @@ public class JdbmStoreTest
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         Rdn rdn = new Rdn( "sn=Ja\\+es" );
 
@@ -792,7 +796,7 @@ public class JdbmStoreTest
         childEntry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( schemaManager, childEntry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         Dn parentDn = new Dn( schemaManager, "ou=Sales,o=Good Times Co." );
 
@@ -831,7 +835,7 @@ public class JdbmStoreTest
 
         Entry lookedup = executionManager.lookup( store, executionManager.getEntryId( store, dn ) );
 
-        executionManager.modify( store,  dn, add );
+        executionManager.modify( store, dn, add );
         assertTrue( lookedup.get( "sn" ).contains( attribVal ) );
     }
 
@@ -852,13 +856,13 @@ public class JdbmStoreTest
 
         assertEquals( "WAlkeR", lookedup.get( "sn" ).get().getString() ); // before replacing
 
-        lookedup = executionManager.modify( store,  dn, add );
+        lookedup = executionManager.modify( store, dn, add );
         assertEquals( attribVal, lookedup.get( "sn" ).get().getString() );
 
         // testing the executionManager.modify( store,  dn, mod, entry ) API
         Modification replace = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SN_AT, "JWalker" );
 
-        lookedup = executionManager.modify( store,  dn, replace );
+        lookedup = executionManager.modify( store, dn, replace );
         assertEquals( "JWalker", lookedup.get( "sn" ).get().getString() );
         assertEquals( 1, lookedup.get( "sn" ).size() );
     }
@@ -877,16 +881,16 @@ public class JdbmStoreTest
 
         assertNotNull( lookedup.get( "sn" ).get() );
 
-        lookedup = executionManager.modify( store,  dn, add );
+        lookedup = executionManager.modify( store, dn, add );
         assertNull( lookedup.get( "sn" ) );
 
         // add an entry for the sake of testing the remove operation
         add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, SN_AT, "JWalker" );
-        lookedup = executionManager.modify( store,  dn, add );
+        lookedup = executionManager.modify( store, dn, add );
         assertNotNull( lookedup.get( "sn" ) );
 
         Modification remove = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, SN_AT );
-        lookedup = executionManager.modify( store,  dn, remove );
+        lookedup = executionManager.modify( store, dn, remove );
         assertNull( lookedup.get( "sn" ) );
     }
 
@@ -902,7 +906,7 @@ public class JdbmStoreTest
         entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( schemaManager, entry );
-        executionManager.add( store,  addContext );
+        executionManager.add( store, addContext );
 
         Attribute attrib = new DefaultAttribute( SchemaConstants.OU_AT, OU_AT );
 
@@ -915,7 +919,7 @@ public class JdbmStoreTest
 
         assertNull( lookedup.get( "ou" ) ); // before replacing
 
-        lookedup = executionManager.modify( store,  dn, add );
+        lookedup = executionManager.modify( store, dn, add );
         assertEquals( attribVal, lookedup.get( "ou" ).get().getString() );
     }
 

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 00:20:10 2012
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
 /directory/apacheds/trunk/interceptors/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1183435-1186974
 /directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1181278-1201298,1209070-1214194
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1177663-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java Sat Mar  3 00:20:10 2012
@@ -51,18 +51,18 @@ class MultiBaseSearch implements Princip
 {
     private final Catalog catalog;
     private final DirectoryService directoryService;
-    private TxnManager txnManager; 
+    private TxnManager txnManager;
 
 
     MultiBaseSearch( String catalogBaseDn, DirectoryService directoryService )
     {
         this.directoryService = directoryService;
         txnManager = directoryService.getTxnManager();
-        
+
         try
         {
             //txnManager.beginTransaction( true );
-            
+
             try
             {
                 catalog = new KerberosCatalog( ( Map<String, String> ) execute( directoryService.getSession(),
@@ -74,7 +74,7 @@ class MultiBaseSearch implements Princip
 
                 throw e;
             }
-            
+
             //txnManager.commitTransaction();
 
         }
@@ -89,11 +89,11 @@ class MultiBaseSearch implements Princip
     public PrincipalStoreEntry getPrincipal( KerberosPrincipal principal ) throws Exception
     {
         PrincipalStoreEntry entry = null;
-        
+
         try
         {
             //txnManager.beginTransaction( true );
-            
+
             try
             {
                 entry = ( PrincipalStoreEntry ) execute( directoryService.getSession(), new GetPrincipal( principal ) );
@@ -104,7 +104,7 @@ class MultiBaseSearch implements Princip
 
                 throw ne;
             }
-            
+
             //txnManager.commitTransaction();
 
         }
@@ -113,7 +113,7 @@ class MultiBaseSearch implements Princip
             String message = I18n.err( I18n.ERR_625, principal.getRealm() );
             throw new ServiceConfigurationException( message, e );
         }
-        
+
         return entry;
     }
 
@@ -122,26 +122,27 @@ class MultiBaseSearch implements Princip
     {
         String result = null;
         boolean done = false;
-        
+
         try
         {
             do
             {
                 //txnManager.beginTransaction( false );
-            
+
                 try
                 {
-                    result = ( String ) execute( directoryService.getSession(), new ChangePassword( principal, newPassword ) );
+                    result = ( String ) execute( directoryService.getSession(), new ChangePassword( principal,
+                        newPassword ) );
                 }
                 catch ( NamingException ne )
                 {
                     //txnManager.abortTransaction();
-    
+
                     throw ne;
                 }
-                
+
                 done = true;
-                
+
                 try
                 {
                     //txnManager.commitTransaction();
@@ -160,9 +161,9 @@ class MultiBaseSearch implements Princip
             String message = I18n.err( I18n.ERR_625, principal.getRealm() );
             throw new ServiceConfigurationException( message, e );
         }
-        
+
         return result;
-        
+
     }
 
 

Modified: directory/apacheds/branches/apacheds-txns/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1296527&r1=1296526&r2=1296527&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Sat Mar  3 00:20:10 2012
@@ -474,7 +474,7 @@ public class SimpleBindRequestTest exten
                     next( bindContext );
                 }
             };
-            
+
             getService().addFirst( interceptor );
 
             // Send another BindRequest



Mime
View raw message