directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r371224 - in /directory/trunks/apacheds/standalone: daemon/src/main/java/org/apache/directory/server/standalone/daemon/ simple/main/ simple/main/src/main/java/org/apache/ldap/server/
Date Sun, 22 Jan 2006 07:18:24 GMT
Author: akarasulu
Date: Sat Jan 21 23:18:18 2006
New Revision: 371224

URL: http://svn.apache.org/viewcvs?rev=371224&view=rev
Log:
changes ...

 o added stop() and start() empty methods for now so reflected calls just work
 o made daemon module in assembly for bootstrapper provided code since it 
   is already included on the system class path by including the  
   bootstrapper.jar
 o added sleep to ServerMain infinite loop
 o using a ${home}/conf directory to hold the server.xml, log4j.properties and
   the bootstrapper.properties file


Modified:
    directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
    directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
    directory/trunks/apacheds/standalone/simple/main/pom.xml
    directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/DirectoryServer.java
    directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/ServerMain.java

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java?rev=371224&r1=371223&r2=371224&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
Sat Jan 21 23:18:18 2006
@@ -266,7 +266,7 @@
     public void stop() throws Exception
     {
         log.debug( "stop() called" );
-//        callStop( bootstrapProperties.getProperty( BOOTSTRAP_STOP_CLASS_PROP, null )  );
+        callStop( bootstrapProperties.getProperty( BOOTSTRAP_STOP_CLASS_PROP, null )  );
     }
 
 
@@ -280,7 +280,7 @@
     {
         log.debug( "start() called" );
         Thread.currentThread().setContextClassLoader( parentLoader );
-//        callStart();
+        callStart();
     }
 
 

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java?rev=371224&r1=371223&r2=371224&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
Sat Jan 21 23:18:18 2006
@@ -129,15 +129,27 @@
     }
     
     
+    public File getConfigurationDirectory()
+    {
+        return new File( baseDirectory, "conf" );
+    }
+
+    
     public File getConfigurationFile()
     {
-        return new File( baseDirectory, "server.xml" );
+        return new File( getConfigurationDirectory(), "server.xml" );
+    }
+
+    
+    public File getLog4jConfigurationFile()
+    {
+        return new File( getConfigurationDirectory(), "log4j.properties" );
     }
 
     
     public File getBootstrapperConfigurationFile()
     {
-        return new File( getBinDirectory(), "bootstrapper.properties" );
+        return new File( getConfigurationDirectory(), "bootstrapper.properties" );
     }
 
     
@@ -150,6 +162,7 @@
                 this.getBinDirectory(),
                 this.getLibDirectory(),
                 this.getExtensionsDirectory(),
+                this.getConfigurationDirectory(),
                 this.getVarDirectory(),
                 this.getLogDirectory(),
                 this.getPartitionsDirectory(),
@@ -159,7 +172,7 @@
         
         if ( files == null )
         {
-            // pid file 
+            // only these files are requred to be present
             files = new File[] {
                 this.getBootstrapper(),
                 this.getBootstrapperConfigurationFile()

Modified: directory/trunks/apacheds/standalone/simple/main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/simple/main/pom.xml?rev=371224&r1=371223&r2=371224&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/simple/main/pom.xml (original)
+++ directory/trunks/apacheds/standalone/simple/main/pom.xml Sat Jan 21 23:18:18 2006
@@ -19,6 +19,7 @@
       <groupId>org.apache.directory.server.standalone.daemon</groupId>
       <artifactId>org.apache.directory.server.standalone.daemon</artifactId>
       <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>  
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/DirectoryServer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/DirectoryServer.java?rev=371224&r1=371223&r2=371224&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/DirectoryServer.java
(original)
+++ directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/DirectoryServer.java
Sat Jan 21 23:18:18 2006
@@ -84,4 +84,14 @@
         env.putAll( new SyncConfiguration().toJndiEnvironment() );
         new InitialDirContext( env );
     }
+    
+
+    public void stop() throws Exception
+    {
+    }
+    
+
+    public void start() throws Exception
+    {
+    }
 }

Modified: directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/ServerMain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/ServerMain.java?rev=371224&r1=371223&r2=371224&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/ServerMain.java
(original)
+++ directory/trunks/apacheds/standalone/simple/main/src/main/java/org/apache/ldap/server/ServerMain.java
Sat Jan 21 23:18:18 2006
@@ -50,6 +50,7 @@
 
         while ( true )
         {
+            Thread.sleep( 20000 );
             server.synch();
         }
     }



Mime
View raw message