directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r917219 - in /directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory: DefaultDirectoryServiceFactory.java DirectoryServiceFactory.java
Date Sun, 28 Feb 2010 17:41:06 GMT
Author: seelmann
Date: Sun Feb 28 17:41:05 2010
New Revision: 917219

URL: http://svn.apache.org/viewvc?rev=917219&view=rev
Log:
formatting

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=917219&r1=917218&r2=917219&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
Sun Feb 28 17:41:05 2010
@@ -62,7 +62,8 @@
      */
     public static final DirectoryServiceFactory DEFAULT = new DefaultDirectoryServiceFactory();
 
-    /* default access */ DefaultDirectoryServiceFactory()
+
+    /* default access */DefaultDirectoryServiceFactory()
     {
         try
         {
@@ -71,13 +72,13 @@
             // before starting up the service
             directoryService = new DefaultDirectoryService();
         }
-        catch( Exception e )
+        catch ( Exception e )
         {
             throw new RuntimeException( e );
         }
     }
-    
-    
+
+
     public void init( String name ) throws Exception
     {
         if ( ( directoryService != null ) && ( directoryService.isStarted() ) )
@@ -87,8 +88,8 @@
 
         build( name );
     }
-    
-    
+
+
     /**
      * Build the working directory
      */
@@ -100,11 +101,11 @@
         {
             workingDirectory = System.getProperty( "java.io.tmpdir" ) + "/server-work-" +
name;
         }
-        
+
         directoryService.setWorkingDirectory( new File( workingDirectory ) );
     }
-    
-    
+
+
     private void initSchema() throws Exception
     {
         SchemaPartition schemaPartition = directoryService.getSchemaService().getSchemaPartition();
@@ -129,7 +130,7 @@
         // to initialize the Partitions, as we won't be able to parse 
         // and normalize their suffix DN
         schemaManager.loadAllEnabled();
-        
+
         schemaPartition.setSchemaManager( schemaManager );
 
         List<Throwable> errors = schemaManager.getErrors();
@@ -139,8 +140,8 @@
             throw new Exception( I18n.err( I18n.ERR_317, ExceptionUtils.printErrors( errors
) ) );
         }
     }
-    
-    
+
+
     private void initSystemPartition() throws Exception
     {
         // change the working directory to something that is unique
@@ -153,8 +154,8 @@
         ( ( JdbmPartition ) systemPartition ).setCacheSize( 500 );
         systemPartition.setSuffix( ServerDNConstants.SYSTEM_DN );
         systemPartition.setSchemaManager( directoryService.getSchemaManager() );
-        ( ( JdbmPartition ) systemPartition ).setPartitionDir( 
-            new File( directoryService.getWorkingDirectory(), "system" ) );
+        ( ( JdbmPartition ) systemPartition ).setPartitionDir( new File( directoryService.getWorkingDirectory(),
+            "system" ) );
 
         // Add objectClass attribute for the system partition
         Set<Index<?, ServerEntry>> indexedAttrs = new HashSet<Index<?,
ServerEntry>>();
@@ -164,38 +165,37 @@
         directoryService.setSystemPartition( systemPartition );
     }
 
-    
+
     public void initJdbmPartition( String name, String suffix ) throws Exception
     {
         Partition partition = new JdbmPartition();
         partition.setId( name );
         partition.setSuffix( suffix );
         partition.setSchemaManager( directoryService.getSchemaManager() );
-        ( ( JdbmPartition ) partition ).setPartitionDir( 
-            new File( directoryService.getWorkingDirectory(), name ) );
+        ( ( JdbmPartition ) partition ).setPartitionDir( new File( directoryService.getWorkingDirectory(),
name ) );
         directoryService.addPartition( partition );
     }
 
-    
+
     public void build( String name ) throws Exception
     {
         directoryService.setInstanceId( name );
         buildWorkingDirectory( name );
-        
+
         // Erase the working directory to be sure that we don't have some
         // remaining data from a previous run
         String workingDirectoryPath = directoryService.getWorkingDirectory().getPath();
         File workingDirectory = new File( workingDirectoryPath );
         FileUtils.deleteDirectory( workingDirectory );
-        
+
         // Init the service now
         initSchema();
         initSystemPartition();
-        
+
         directoryService.startup();
     }
 
-    
+
     public DirectoryService getDirectoryService() throws Exception
     {
         return directoryService;

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java?rev=917219&r1=917218&r2=917219&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DirectoryServiceFactory.java
Sun Feb 28 17:41:05 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.factory;
 
+
 import org.apache.directory.server.core.DirectoryService;
 
 



Mime
View raw message