directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379007 - in /directory/trunks/daemon: ./ bootstrappers/ bootstrappers/src/main/java/org/apache/directory/daemon/ installers-plugin/ plugin/ plugin/reference/ plugin/src/ plugin/src/main/ plugin/src/main/java/ plugin/src/main/java/org/ plug...
Date Mon, 20 Feb 2006 03:24:04 GMT
Author: akarasulu
Date: Sun Feb 19 19:23:57 2006
New Revision: 379007

URL: http://svn.apache.org/viewcvs?rev=379007&view=rev
Log:
merging changes from rc1 branch for daemon

Added:
    directory/trunks/daemon/plugin/   (props changed)
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/
    directory/trunks/daemon/plugin/pom.xml   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/pom.xml
    directory/trunks/daemon/plugin/reference/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/reference/
    directory/trunks/daemon/plugin/reference/linux.properties   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/reference/linux.properties
    directory/trunks/daemon/plugin/reference/mac.properties   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/reference/mac.properties
    directory/trunks/daemon/plugin/reference/sunos.properties   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/reference/sunos.properties
    directory/trunks/daemon/plugin/reference/windows.properties   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/reference/windows.properties
    directory/trunks/daemon/plugin/src/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/
    directory/trunks/daemon/plugin/src/main/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/
    directory/trunks/daemon/plugin/src/main/java/   (props changed)
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/
    directory/trunks/daemon/plugin/src/main/java/org/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/
    directory/trunks/daemon/plugin/src/main/java/org/apache/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Application.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Application.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PackagedFile.java
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PackagedFile.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoTarget.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoTarget.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackTarget.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackTarget.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
    directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmTarget.java   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmTarget.java
    directory/trunks/daemon/plugin/src/main/resources/   (props changed)
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/
    directory/trunks/daemon/plugin/src/main/resources/org/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/LICENSE.txt
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/LICENSE.txt
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/inno/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/inno/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/ShellLink.dll   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/ShellLink.dll
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_windows.xml   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_windows.xml
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/unix_shortcuts.xml   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/unix_shortcuts.xml
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/user_input.xml   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/user_input.xml
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/windows_shortcuts.xml
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/windows_shortcuts.xml
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_i386   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_i386
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_macosx_ppc   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_macosx_ppc
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_i386   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_i386
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_sparc   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_sparc
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/logo.ico   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/logo.ico
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunmgr.exe   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunmgr.exe
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunsrv.exe   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunsrv.exe
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template
    directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/template.init   (props changed)
      - copied unchanged from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
    directory/trunks/daemon/plugin/src/test/
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/test/
    directory/trunks/daemon/plugin/src/test/java/   (props changed)
      - copied from r379006, directory/sandbox/akarasulu/rc1/daemon/plugin/src/test/java/
Removed:
    directory/trunks/daemon/installers-plugin/
Modified:
    directory/trunks/daemon/bootstrappers/pom.xml
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java   (contents, props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java   (contents, props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java   (contents, props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ExitCodes.java   (props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java   (contents, props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java   (contents, props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java   (contents, props changed)
    directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java   (contents, props changed)
    directory/trunks/daemon/pom.xml

Modified: directory/trunks/daemon/bootstrappers/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/pom.xml?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/pom.xml (original)
+++ directory/trunks/daemon/bootstrappers/pom.xml Sun Feb 19 19:23:57 2006
@@ -4,14 +4,17 @@
   <parent>
     <groupId>org.apache.directory.daemon</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
-  <version>0.9.4-SNAPSHOT</version>
+  <version>1.0-RC1</version>
   <artifactId>daemon-bootstrappers</artifactId>
   <groupId>org.apache.directory.daemon</groupId>
   <name>Apache Directory Daemon Bootstrappers</name>
   <packaging>jar</packaging>
-  <description></description>
+  <description>
+    Daemon bootstrappers which initialize a classloader with jars laid out in an installation
+    footprint.
+  </description>
   <distributionManagement>
     <site>
       <id>apache.websites</id>

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java Sun Feb 19 19:23:57 2006
@@ -1,5 +1,5 @@
 /*
- *   @(#) $Id: AvailablePortFinder.java 329145 2005-10-28 07:24:00Z trustin $
+ *   @(#) $Id$
  * 
  *   Copyright 2004 The Apache Software Foundation
  *
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.daemon;
 
+
 import java.io.IOException;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
@@ -30,7 +31,7 @@
  * Finds currently available server ports.
  *
  * @author The Apache Directory Project
- * @version $Rev: 329145 $
+ * @version $Rev$
  * @see <a href="http://www.iana.org/assignments/port-numbers">IANA.org</a>
  */
 public class AvailablePortFinder
@@ -45,6 +46,7 @@
      */
     public static final int MAX_PORT_NUMBER = 49151;
 
+
     /**
      * Creates a new instance.
      */
@@ -52,6 +54,7 @@
     {
     }
 
+
     /**
      * Returns the {@link Set} of currently available port numbers
      * ({@link Integer}).  This method is identical to
@@ -61,9 +64,10 @@
      */
     public static Set getAvailablePorts()
     {
-        return getAvailablePorts(MIN_PORT_NUMBER, MAX_PORT_NUMBER);
+        return getAvailablePorts( MIN_PORT_NUMBER, MAX_PORT_NUMBER );
     }
 
+
     /**
      * Gets the next available port starting at the lowest port number.
      *
@@ -71,35 +75,35 @@
      */
     public static int getNextAvailable()
     {
-        return getNextAvailable(MIN_PORT_NUMBER);
+        return getNextAvailable( MIN_PORT_NUMBER );
     }
 
+
     /**
      * Gets the next available port starting at a port.
      *
      * @param fromPort the port to scan for availability
      * @throws NoSuchElementException if there are no ports available
      */
-    public static int getNextAvailable(int fromPort)
+    public static int getNextAvailable( int fromPort )
     {
-        if ((fromPort < MIN_PORT_NUMBER) || (fromPort > MAX_PORT_NUMBER))
+        if ( ( fromPort < MIN_PORT_NUMBER ) || ( fromPort > MAX_PORT_NUMBER ) )
         {
-            throw new IllegalArgumentException("Invalid start port: "
-                                               + fromPort);
+            throw new IllegalArgumentException( "Invalid start port: " + fromPort );
         }
 
-        for (int i = fromPort; i <= MAX_PORT_NUMBER; i++)
+        for ( int i = fromPort; i <= MAX_PORT_NUMBER; i++ )
         {
-            if( available( i ) )
+            if ( available( i ) )
             {
                 return i;
             }
         }
 
-        throw new NoSuchElementException("Could not find an available port "
-                                         + "above " + fromPort);
+        throw new NoSuchElementException( "Could not find an available port " + "above " + fromPort );
     }
 
+
     /**
      * Checks to see if a specific port is available.
      *
@@ -107,7 +111,7 @@
      */
     public static boolean available( int port )
     {
-        if ( ( port < MIN_PORT_NUMBER) || ( port > MAX_PORT_NUMBER ) )
+        if ( ( port < MIN_PORT_NUMBER ) || ( port > MAX_PORT_NUMBER ) )
         {
             throw new IllegalArgumentException( "Invalid start port: " + port );
         }
@@ -122,32 +126,33 @@
             ds.setReuseAddress( true );
             return true;
         }
-        catch (IOException e)
+        catch ( IOException e )
         {
         }
         finally
         {
-            if (ds != null)
+            if ( ds != null )
             {
                 ds.close();
             }
 
-            if (ss != null)
+            if ( ss != null )
             {
                 try
                 {
                     ss.close();
                 }
-                catch (IOException e)
+                catch ( IOException e )
                 {
                     /* should not be thrown */
                 }
             }
         }
-        
+
         return false;
     }
 
+
     /**
      * Returns the {@link Set} of currently avaliable port numbers ({@link Integer})
      * between the specified port range.
@@ -156,39 +161,36 @@
      * {@link #MIN_PORT_NUMBER} and {@link #MAX_PORT_NUMBER} or
      * <code>fromPort</code> if greater than <code>toPort</code>.
      */
-    public static Set getAvailablePorts(int fromPort, int toPort)
+    public static Set getAvailablePorts( int fromPort, int toPort )
     {
-        if (
-            (fromPort < MIN_PORT_NUMBER) || (toPort > MAX_PORT_NUMBER)
-                || (fromPort > toPort))
+        if ( ( fromPort < MIN_PORT_NUMBER ) || ( toPort > MAX_PORT_NUMBER ) || ( fromPort > toPort ) )
         {
-            throw new IllegalArgumentException("Invalid port range: "
-                                               + fromPort + " ~ " + toPort);
+            throw new IllegalArgumentException( "Invalid port range: " + fromPort + " ~ " + toPort );
         }
 
         Set result = new TreeSet();
 
-        for (int i = fromPort; i <= toPort; i++)
+        for ( int i = fromPort; i <= toPort; i++ )
         {
             ServerSocket s = null;
 
             try
             {
-                s = new ServerSocket(i);
-                result.add(new Integer(i));
+                s = new ServerSocket( i );
+                result.add( new Integer( i ) );
             }
-            catch (IOException e)
+            catch ( IOException e )
             {
             }
             finally
             {
-                if (s != null)
+                if ( s != null )
                 {
                     try
                     {
                         s.close();
                     }
-                    catch (IOException e)
+                    catch ( IOException e )
                     {
                         /* should not be thrown */
                     }

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java Sun Feb 19 19:23:57 2006
@@ -50,7 +50,7 @@
     static final String[] EMPTY_STRARRAY = new String[0];
     public static final String START_CLASS_PROP = "bootstrap.start.class";
     public static final String STOP_CLASS_PROP = "bootstrap.stop.class";
-    
+
     private static final Logger log = LoggerFactory.getLogger( Bootstrapper.class );
 
     /** Shutdown command to use for await() */
@@ -61,8 +61,7 @@
     private int shutdownPort = -1;
     /** Random number generator */
     private Random random;
-    
-    
+
     private InstallationLayout layout;
     private ClassLoader application;
     private ClassLoader parent;
@@ -72,21 +71,21 @@
     private DaemonApplication start;
     private DaemonApplication stop;
 
-    
+
     public void setInstallationLayout( String installationBase )
     {
         log.debug( "Setting layout in Bootstrapper using base: " + installationBase );
         layout = new InstallationLayout( installationBase );
-        
+
         try
         {
             layout.verifyInstallation();
         }
-        catch( Throwable t )
+        catch ( Throwable t )
         {
             log.error( "Installation verification failure!", t );
         }
-        
+
         try
         {
             Properties props = new Properties();
@@ -100,14 +99,14 @@
             System.exit( ExitCodes.PROPLOAD );
         }
     }
-    
-    
+
+
     public void setParentLoader( ClassLoader parentLoader )
     {
         this.parent = parentLoader;
         URL[] jars = layout.getAllJars();
         this.application = new URLClassLoader( jars, parentLoader );
-        
+
         if ( log.isDebugEnabled() )
         {
             StringBuffer buf = new StringBuffer();
@@ -133,7 +132,7 @@
             log.error( "Could not find " + startClassName, e );
             System.exit( ExitCodes.CLASS_LOOKUP );
         }
-        
+
         try
         {
             start = ( DaemonApplication ) startClass.newInstance();
@@ -143,7 +142,7 @@
             log.error( "Could not instantiate " + startClassName, e );
             System.exit( ExitCodes.INSTANTIATION );
         }
-        
+
         try
         {
             start.init( this.layout, args );
@@ -156,7 +155,7 @@
         Thread.currentThread().setContextClassLoader( parent );
     }
 
-    
+
     public void callStart()
     {
         Thread.currentThread().setContextClassLoader( application );
@@ -171,13 +170,13 @@
         }
         Thread.currentThread().setContextClassLoader( parent );
     }
-    
+
 
     public void callStop( String[] args )
     {
         Thread.currentThread().setContextClassLoader( application );
         Class clazz = null;
-        
+
         if ( startClassName.equals( stopClassName ) && start != null )
         {
             clazz = startClass;
@@ -194,7 +193,7 @@
                 log.error( "Could not find " + stopClassName, e );
                 System.exit( ExitCodes.CLASS_LOOKUP );
             }
-            
+
             try
             {
                 stop = ( DaemonApplication ) clazz.newInstance();
@@ -205,7 +204,7 @@
                 System.exit( ExitCodes.INSTANTIATION );
             }
         }
-        
+
         try
         {
             stop.stop( args );
@@ -218,7 +217,7 @@
         Thread.currentThread().setContextClassLoader( parent );
     }
 
-    
+
     public void callDestroy()
     {
         Thread.currentThread().setContextClassLoader( application );
@@ -233,26 +232,26 @@
         }
         Thread.currentThread().setContextClassLoader( parent );
     }
-    
-    
-    public static String[] shift( String[]args, int amount )
+
+
+    public static String[] shift( String[] args, int amount )
     {
         if ( args.length > amount )
         {
-            String[] shifted = new String[args.length-1];
+            String[] shifted = new String[args.length - 1];
             System.arraycopy( args, 1, shifted, 0, shifted.length );
             return shifted;
         }
-        
+
         return EMPTY_STRARRAY;
     }
 
-    
+
     public void sendShutdownCommand() throws IOException
     {
         Socket socket = null;
         OutputStream stream = null;
-        
+
         if ( shutdownPort == -1 )
         {
             File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
@@ -270,26 +269,29 @@
                 throw new IllegalStateException( msg );
             }
         }
-        
+
         // this stops the main thread listening for shutdown requests
-        try {
+        try
+        {
             socket = new Socket( "127.0.0.1", shutdownPort );
             stream = socket.getOutputStream();
 
-            for (int i = 0; i < SHUTDOWN.length(); i++ )
+            for ( int i = 0; i < SHUTDOWN.length(); i++ )
             {
-                stream.write( SHUTDOWN.charAt(i) );
+                stream.write( SHUTDOWN.charAt( i ) );
             }
 
             stream.flush();
         }
         finally
         {
-            if ( stream != null ) stream.close();
-            if ( socket != null ) socket.close();
+            if ( stream != null )
+                stream.close();
+            if ( socket != null )
+                socket.close();
         }
     }
-    
+
 
     /**
      * Wait until a proper shutdown command is received, then return.
@@ -314,7 +316,8 @@
 
             // register shutdown hook in case we get shutdown abruptly without 
             // cleaning up the shutdown file containing the shutdown port
-            Runtime.getRuntime().addShutdownHook( new Thread( "Bootstrapper cleanup" ) {
+            Runtime.getRuntime().addShutdownHook( new Thread( "Bootstrapper cleanup" )
+            {
                 public void run()
                 {
                     File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
@@ -355,7 +358,7 @@
             try
             {
                 socket = serverSocket.accept();
-                socket.setSoTimeout(10 * 1000);  // Ten seconds
+                socket.setSoTimeout( 10 * 1000 ); // Ten seconds
                 stream = socket.getInputStream();
             }
             catch ( AccessControlException ace )
@@ -377,7 +380,7 @@
             {
                 if ( random == null )
                 {
-                    random = new Random(System.currentTimeMillis());
+                    random = new Random( System.currentTimeMillis() );
                 }
                 expected += ( random.nextInt() % 1024 );
             }
@@ -394,7 +397,7 @@
                     ch = -1;
                 }
 
-                if ( ch < 32 )  // Control character or EOF terminates loop
+                if ( ch < 32 ) // Control character or EOF terminates loop
                 {
                     break;
                 }
@@ -434,7 +437,7 @@
         {
             log.debug( "Failed on socket close", e );
         }
-        
+
         File shutdownPortFile = new File( layout.getRunDirectory(), SHUTDOWN_FILE );
         if ( shutdownPortFile.exists() )
         {

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java Sun Feb 19 19:23:57 2006
@@ -33,12 +33,14 @@
      * the command arguments are removed
      */
     void init( InstallationLayout layout, String[] args ) throws Exception;
-    
+
+
     /**
      * Start threads and bind sockets here.
      */
     void start();
-    
+
+
     /**
      * Stop threads and close sockets opened in start() here.
      * 
@@ -46,7 +48,8 @@
      * @throws Exception 
      */
     void stop( String[] args ) throws Exception;
-    
+
+
     /**
      * The application should destroy resources created in init() here.
      */

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ExitCodes.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ExitCodes.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java Sun Feb 19 19:23:57 2006
@@ -37,10 +37,10 @@
 {
     private final static Logger log = LoggerFactory.getLogger( InstallationLayout.class );
     private final static FileFilter JAR_FILTER;
-    
-    static 
+
+    static
     {
-        JAR_FILTER = new FileFilter() 
+        JAR_FILTER = new FileFilter()
         {
             public boolean accept( File pathname )
             {
@@ -48,277 +48,269 @@
             }
         };
     }
-    
-    private final File baseDirectory;
+
+    protected final File baseDirectory;
     private transient File[] dirs;
     private transient File[] files;
     private transient URL[] allJars = null;
     private transient URL[] dependentJars = null;
     private transient URL[] extensionJars = null;
 
-    
-    public InstallationLayout( File baseDirectory )
+
+    public InstallationLayout(File baseDirectory)
     {
         this.baseDirectory = baseDirectory;
     }
-    
-    
-    public InstallationLayout( String baseDirectoryPath )
+
+
+    public InstallationLayout(String baseDirectoryPath)
     {
         this.baseDirectory = new File( baseDirectoryPath );
     }
-    
-    
+
+
     public File getBaseDirectory()
     {
         return baseDirectory;
     }
-    
-    
+
+
     public File getBinDirectory()
     {
         return new File( baseDirectory, "bin" );
     }
-    
-    
+
+
     public File getLibDirectory()
     {
         return new File( baseDirectory, "lib" );
     }
-    
-    
+
+
     public File getVarDirectory()
     {
         return new File( baseDirectory, "var" );
     }
-    
-    
+
+
     public File getLogDirectory()
     {
         return new File( getVarDirectory(), "log" );
     }
-    
-    
+
+
     public File getRunDirectory()
     {
         return new File( getVarDirectory(), "run" );
     }
-    
-    
+
+
     public File getPidFile()
     {
         return new File( getRunDirectory(), "server.pid" );
     }
-    
-    
+
+
     public File getBootstrapper()
     {
         return new File( getBinDirectory(), "bootstrapper.jar" );
     }
-    
-    
+
+
     public File getLogger()
     {
         return new File( getBinDirectory(), "logger.jar" );
     }
-    
-    
+
+
     public File getDaemon()
     {
         return new File( getBinDirectory(), "daemon.jar" );
     }
-    
-    
+
+
     public File getInitScript()
     {
         return getInitScript( "server.init" );
     }
-    
-    
+
+
     public File getInitScript( String name )
     {
         return new File( getBinDirectory(), name );
     }
-    
-    
+
+
     public File getExtensionsDirectory()
     {
         return new File( getLibDirectory(), "ext" );
     }
-    
-    
+
+
     public File getPartitionsDirectory()
     {
         return new File( getVarDirectory(), "partitions" );
     }
-    
-    
+
+
     public File getConfigurationDirectory()
     {
         return new File( baseDirectory, "conf" );
     }
 
-    
+
     public File getConfigurationFile()
     {
         return getConfigurationFile( "server.xml" );
     }
 
-    
+
     public File getConfigurationFile( String name )
     {
         return new File( getConfigurationDirectory(), name );
     }
 
-    
+
     public File getLoggerConfigurationFile()
     {
         return getLoggerConfigurationFile( "log4j.properties" );
     }
 
-    
+
     public File getLoggerConfigurationFile( String name )
     {
         return new File( getConfigurationDirectory(), name );
     }
 
-    
+
     public File getLogoIconFile()
     {
         return getLogoIconFile( "logo.ico" );
     }
 
-    
+
     public File getLogoIconFile( String name )
     {
         return new File( getBaseDirectory(), name );
     }
 
-    
+
     public File getLicenseFile()
     {
         return getLicenseFile( "LICENSE.txt" );
     }
 
-    
+
     public File getLicenseFile( String name )
     {
         return new File( getBaseDirectory(), name );
     }
 
-    
+
     public File getReadmeFile()
     {
         return getReadmeFile( "README.txt" );
     }
 
-    
+
     public File getReadmeFile( String name )
     {
         return new File( getBaseDirectory(), name );
     }
 
-    
+
     public File getBootstrapperConfigurationFile()
     {
         return new File( getConfigurationDirectory(), "bootstrapper.properties" );
     }
 
-    
+
     public void init()
     {
         if ( dirs == null )
         {
-            dirs = new File[] {
-                this.getBaseDirectory(),
-                this.getBinDirectory(),
-                this.getLibDirectory(),
-                this.getExtensionsDirectory(),
-                this.getConfigurationDirectory(),
-                this.getVarDirectory(),
-                this.getLogDirectory(),
-                this.getPartitionsDirectory(),
-                this.getRunDirectory()
-            };
+            dirs = new File[]
+                { this.getBaseDirectory(), this.getBinDirectory(), this.getLibDirectory(),
+                    this.getExtensionsDirectory(), this.getConfigurationDirectory(), this.getVarDirectory(),
+                    this.getLogDirectory(), this.getPartitionsDirectory(), this.getRunDirectory() };
         }
-        
+
         if ( files == null )
         {
             // only these files are requred to be present
-            files = new File[] {
-                this.getBootstrapper(),
-                this.getBootstrapperConfigurationFile()
-            };
+            files = new File[]
+                { this.getBootstrapper(), this.getBootstrapperConfigurationFile() };
         }
     }
-    
-    
+
+
     public void verifyInstallation()
     {
         init();
-        
+
         for ( int ii = 0; ii < dirs.length; ii++ )
         {
-            if ( ! dirs[ii].exists() )
+            if ( !dirs[ii].exists() )
             {
                 throw new IllegalStateException( dirs[ii] + " does not exist!" );
             }
-            
+
             if ( dirs[ii].isFile() )
             {
                 throw new IllegalStateException( dirs[ii] + " is a file when it should be a directory." );
             }
-            
-            if ( ! dirs[ii].canWrite() )
+
+            if ( !dirs[ii].canWrite() )
             {
-                throw new IllegalStateException( dirs[ii] + " is write protected from the current user: " 
+                throw new IllegalStateException( dirs[ii] + " is write protected from the current user: "
                     + System.getProperty( "user.name" ) );
             }
         }
-        
+
         for ( int ii = 0; ii < files.length; ii++ )
         {
-            if ( ! files[ii].exists() )
+            if ( !files[ii].exists() )
             {
                 throw new IllegalStateException( files[ii] + " does not exist!" );
             }
-            
+
             if ( files[ii].isDirectory() )
             {
                 throw new IllegalStateException( files[ii] + " is a directory when it should be a file." );
             }
-            
-            if ( ! dirs[ii].canRead() )
+
+            if ( !dirs[ii].canRead() )
             {
-                throw new IllegalStateException( files[ii] + " is not readable by the current user: " 
+                throw new IllegalStateException( files[ii] + " is not readable by the current user: "
                     + System.getProperty( "user.name" ) );
             }
         }
     }
-    
-    
+
+
     public void mkdirs()
     {
         init();
-        
+
         for ( int ii = 0; ii < dirs.length; ii++ )
         {
             dirs[ii].mkdirs();
         }
     }
-    
-    
+
+
     public URL[] getDependentJars()
     {
         if ( dependentJars == null )
         {
-            File[] deps = getLibDirectory().listFiles( new FileFilter() {
+            File[] deps = getLibDirectory().listFiles( new FileFilter()
+            {
                 public boolean accept( File pathname )
                 {
                     return pathname.isFile() && pathname.getName().endsWith( ".jar" );
                 }
-            });
-            
+            } );
+
             dependentJars = new URL[deps.length];
             for ( int ii = 0; ii < deps.length; ii++ )
             {
@@ -328,12 +320,12 @@
                 }
                 catch ( MalformedURLException e )
                 {
-                    log.error( "Failed to generate a URL for " + deps[ii] + 
-                    ".  It will not be added to the dependencies." );
+                    log.error( "Failed to generate a URL for " + deps[ii]
+                        + ".  It will not be added to the dependencies." );
                 }
             }
         }
-        
+
         return dependentJars;
     }
 
@@ -343,7 +335,7 @@
         if ( extensionJars == null )
         {
             File[] extensions = getExtensionsDirectory().listFiles( JAR_FILTER );
-            
+
             extensionJars = new URL[extensions.length];
             for ( int ii = 0; ii < extensions.length; ii++ )
             {
@@ -353,12 +345,12 @@
                 }
                 catch ( MalformedURLException e )
                 {
-                    log.error( "Failed to generate a URL for " + extensions[ii] + 
-                        ".  It will not be added to the extensions." );
+                    log.error( "Failed to generate a URL for " + extensions[ii]
+                        + ".  It will not be added to the extensions." );
                 }
             }
         }
-        
+
         return extensionJars;
     }
 
@@ -369,8 +361,8 @@
         {
             int dependentLength = getDependentJars().length;
             int extensionLength = getExtensionJars().length;
-            allJars = new URL[ dependentLength + extensionLength ];
-            
+            allJars = new URL[dependentLength + extensionLength];
+
             for ( int ii = 0; ii < allJars.length; ii++ )
             {
                 if ( ii < dependentLength )
@@ -383,7 +375,7 @@
                 }
             }
         }
-        
+
         return allJars;
     }
 }

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java Sun Feb 19 19:23:57 2006
@@ -34,7 +34,7 @@
     private boolean isDaemonShuttingDown = false;
     private Thread thread;
 
-    
+
     public void init( String[] args )
     {
         if ( log.isDebugEnabled() )
@@ -53,8 +53,8 @@
         callInit( shift( args, 1 ) );
         thread = new Thread( new ShutdownListener(), "ShutdownListenerThread" );
     }
-    
-    
+
+
     public void start()
     {
         log.debug( "start() called" );
@@ -66,7 +66,7 @@
     public void stop() throws Exception
     {
         log.debug( "stop() called using regular shutdown with signals" );
-        
+
         // Bad construct here since there is no synchronization but there is
         // no really good way to do this with the way threads are setup.  So
         // both the listener thread and the daemon thread may try to shutdown
@@ -75,8 +75,8 @@
         // very small.  For all practical purposes this will work just fine.
         // And so what if they try to shutdown at the same time.  One thread
         // will just get an exception due to a DeadContext.
-        
-        if ( ! isListenerShuttingDown )
+
+        if ( !isListenerShuttingDown )
         {
             isDaemonShuttingDown = true;
             callStop( EMPTY_STRARRAY );
@@ -89,15 +89,14 @@
         log.debug( "destroy() called" );
         callDestroy();
     }
-    
-    
+
     class ShutdownListener implements Runnable
     {
         public void run()
         {
             waitForShutdown();
             log.debug( "ShutdownListener came out of waitForShutdown" );
-            if ( ! isDaemonShuttingDown )
+            if ( !isDaemonShuttingDown )
             {
                 isListenerShuttingDown = true;
                 log.debug( "ShutdownListener will invoke callStop(String[])." );

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java Sun Feb 19 19:23:57 2006
@@ -37,11 +37,10 @@
     // Java application main() entry point
     // ------------------------------------------------------------------------
 
-    
     public static void main( String[] args )
     {
         log.debug( "main(String[]) called" );
-        
+
         if ( log.isDebugEnabled() )
         {
             log.debug( "main() recieved args:" );
@@ -79,7 +78,7 @@
                 instance.callStart();
 
                 instance.waitForShutdown();
-                
+
                 log.debug( "calling callStop() from main(String[])" );
                 instance.callStop( shift( args, 2 ) );
                 log.debug( "calling callDestroy() from main(String[])" );
@@ -107,6 +106,6 @@
 
     private static void printHelp()
     {
-        System.err.println("java -jar bootstrap.jar <app.home> <command.name>");
+        System.err.println( "java -jar bootstrap.jar <app.home> <command.name>" );
     }
 }

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java (original)
+++ directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java Sun Feb 19 19:23:57 2006
@@ -32,17 +32,16 @@
 public class ProcrunBootstrapper extends Bootstrapper
 {
     private final static Logger log = LoggerFactory.getLogger( ProcrunBootstrapper.class );
-    
-    
+
+
     // -----------------------------------------------------------------------
     // Procrun Entry Points
     // -----------------------------------------------------------------------
-    
-    
+
     public static void prunsrvStart( String[] args )
     {
         log.debug( "prunsrvStart(String[]) called" );
-        
+
         if ( log.isDebugEnabled() )
         {
             log.debug( "prunsrvStart(String[]) recieved args:" );

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 19 19:23:57 2006
@@ -0,0 +1,11 @@
+.settings
+.cdtproject
+.project
+.classpath
+.deployables
+.wtpmodules
+*.iml
+target
+*.iws
+*.ipr
+*.log

Propchange: directory/trunks/daemon/plugin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/reference/linux.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/reference/mac.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/reference/sunos.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/reference/windows.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 19 19:23:57 2006
@@ -0,0 +1 @@
+META-INF

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Application.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Application.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoCommand.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoTarget.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackTarget.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmTarget.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:23:57 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/trunks/daemon/plugin/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 19 19:23:57 2006
@@ -0,0 +1 @@
+META-INF

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/ShellLink.dll
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_windows.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/unix_shortcuts.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/user_input.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_i386
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_i386
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_macosx_ppc
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_macosx_ppc
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_i386
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_i386
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_sparc
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_sparc
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/logo.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunmgr.exe
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunmgr.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunsrv.exe
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/prunsrv.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/daemon/plugin/src/test/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 19 19:23:57 2006
@@ -0,0 +1 @@
+META-INF

Modified: directory/trunks/daemon/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/pom.xml?rev=379007&r1=379006&r2=379007&view=diff
==============================================================================
--- directory/trunks/daemon/pom.xml (original)
+++ directory/trunks/daemon/pom.xml Sun Feb 19 19:23:57 2006
@@ -10,7 +10,7 @@
   <artifactId>build</artifactId>
   <name>Apache Directory Daemon</name>
   <packaging>pom</packaging>  
-  <version>0.9.4-SNAPSHOT</version>
+  <version>1.0-RC1</version>
   <description>
     Reusable framework for daemon applications based on Commons Daemon
     Jsvc and Procrun. A small installation layout pattern combined with
@@ -20,7 +20,7 @@
   </description>
   <modules>
     <module>bootstrappers</module>
-    <module>installers-plugin</module>
+    <module>plugin</module>
   </modules>
   <dependencies>
     <dependency>



Mime
View raw message