directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376624 [1/2] - in /directory/sandbox/akarasulu/rc1/daemon: bootstrappers/src/main/java/org/apache/directory/daemon/ installers-plugin/src/main/java/org/apache/directory/daemon/installers/ installers-plugin/src/main/java/org/apache/director...
Date Fri, 10 Feb 2006 10:50:48 GMT
Author: akarasulu
Date: Fri Feb 10 02:50:45 2006
New Revision: 376624

URL: http://svn.apache.org/viewcvs?rev=376624&view=rev
Log:
formated sources according to direectory source format

Modified:
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java
    directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Application.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoTarget.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackTarget.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
    directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmTarget.java

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java Fri Feb 10 02:50:45 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.daemon;
 
+
 import java.io.IOException;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
@@ -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 */
                     }

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/Bootstrapper.java Fri Feb 10 02:50:45 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() )
         {

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/DaemonApplication.java Fri Feb 10 02:50:45 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.
      */

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java Fri Feb 10 02:50:45 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,7 +48,7 @@
             }
         };
     }
-    
+
     private final File baseDirectory;
     private transient File[] dirs;
     private transient File[] files;
@@ -56,269 +56,261 @@
     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;
     }
 }

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/JsvcBootstrapper.java Fri Feb 10 02:50:45 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[])." );

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/MainBootstrapper.java Fri Feb 10 02:50:45 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>" );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/bootstrappers/src/main/java/org/apache/directory/daemon/ProcrunBootstrapper.java Fri Feb 10 02:50:45 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:" );

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Application.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Application.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Application.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Application.java Fri Feb 10 02:50:45 2006
@@ -20,8 +20,8 @@
     private File icon;
     private File readme;
     private File license;
-    private String licenseType = "ASL 2.0" ;
-    
+    private String licenseType = "ASL 2.0";
+
 
     public Application()
     {
@@ -31,7 +31,7 @@
     }
 
 
-    public void setCopyrightYear(String copyrightYear)
+    public void setCopyrightYear( String copyrightYear )
     {
         this.copyrightYear = copyrightYear;
     }
@@ -43,7 +43,7 @@
     }
 
 
-    public void setLicense(File license)
+    public void setLicense( File license )
     {
         this.license = license;
     }
@@ -55,7 +55,7 @@
     }
 
 
-    public void setReadme(File readme)
+    public void setReadme( File readme )
     {
         this.readme = readme;
     }
@@ -67,7 +67,7 @@
     }
 
 
-    public void setIcon(File icon)
+    public void setIcon( File icon )
     {
         this.icon = icon;
     }
@@ -79,7 +79,7 @@
     }
 
 
-    public void setAuthors(List authors)
+    public void setAuthors( List authors )
     {
         this.authors = authors;
     }
@@ -91,7 +91,7 @@
     }
 
 
-    public void setMinimumJavaVersion(String minimumJavaVersion)
+    public void setMinimumJavaVersion( String minimumJavaVersion )
     {
         this.minimumJavaVersion = minimumJavaVersion;
     }
@@ -103,7 +103,7 @@
     }
 
 
-    public void setVersion(String version)
+    public void setVersion( String version )
     {
         this.version = version;
     }
@@ -115,7 +115,7 @@
     }
 
 
-    public void setUrl(String url)
+    public void setUrl( String url )
     {
         this.url = url;
     }
@@ -127,7 +127,7 @@
     }
 
 
-    public void setEmail(String email)
+    public void setEmail( String email )
     {
         this.email = email;
     }
@@ -139,7 +139,7 @@
     }
 
 
-    public void setCompany(String company)
+    public void setCompany( String company )
     {
         this.company = company;
     }
@@ -151,7 +151,7 @@
     }
 
 
-    public void setDescription(String description)
+    public void setDescription( String description )
     {
         this.description = description;
     }
@@ -163,7 +163,7 @@
     }
 
 
-    public void setName(String name)
+    public void setName( String name )
     {
         this.name = name;
     }

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Fri Feb 10 02:50:45 2006
@@ -43,8 +43,8 @@
     private final Target target;
     private InstallationLayout layout;
 
-    
-    public CreateImageCommand( ServiceInstallersMojo mojo, Target target )
+
+    public CreateImageCommand(ServiceInstallersMojo mojo, Target target)
     {
         this.mymojo = mojo;
         this.target = target;
@@ -52,25 +52,25 @@
     }
 
 
-    private void initializeFiltering() 
+    private void initializeFiltering()
     {
         filterProperties.putAll( mymojo.getProject().getProperties() );
-        filterProperties.put( "app" , target.getApplication().getName() );
-        filterProperties.put( "app.caps" , target.getApplication().getName().toUpperCase() );
+        filterProperties.put( "app", target.getApplication().getName() );
+        filterProperties.put( "app.caps", target.getApplication().getName().toUpperCase() );
         filterProperties.put( "app.server.class", mymojo.getApplicationClass() );
 
         if ( target.getApplication().getVersion() != null )
         {
             filterProperties.put( "app.version", target.getApplication().getVersion() );
         }
-        
+
         if ( target.getApplication().getDescription() != null )
         {
             filterProperties.put( "app.init.message", target.getApplication().getDescription() );
         }
     }
 
-    
+
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         // make the layout directories
@@ -79,7 +79,6 @@
         target.setLayout( layout );
         layout.mkdirs();
 
-
         // copy over the read me file if present otherwise use the bundled copy
         if ( target.getApplication().getReadme() != null && target.getApplication().getReadme().exists() )
         {
@@ -94,7 +93,7 @@
                     + " into position " + readmeTarget );
             }
         }
-        
+
         // copy over the license file if present otherwise use the bundled copy
         File licenseTarget = layout.getLicenseFile( target.getApplication().getLicense().getName() );
         if ( target.getApplication().getLicense().exists() )
@@ -113,17 +112,16 @@
         {
             try
             {
-                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties,
                     getClass().getResourceAsStream( "LICENSE.txt" ), licenseTarget, false );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to bundled ASL license file " 
-                    + getClass().getResource( "LICENSE.txt" )
-                    + " into position " + licenseTarget );
+                throw new MojoFailureException( "Failed to bundled ASL license file "
+                    + getClass().getResource( "LICENSE.txt" ) + " into position " + licenseTarget );
             }
         }
-        
+
         // copy over the icon if present otherwise use the bundled copy
         File iconTarget = layout.getLogoIconFile( target.getApplication().getIcon().getName() );
         if ( target.getApplication().getIcon().exists() )
@@ -150,7 +148,7 @@
                     + " into position " + iconTarget );
             }
         }
-        
+
         // copy over the REQUIRED apacheds-tools.jar file 
         /** HACK!
          * @todo clean me up
@@ -166,7 +164,7 @@
             throw new MojoFailureException( "Failed to copy apacheds-tools.jar " + mymojo.getTools().getFile()
                 + " into position " + tools );
         }
-        
+
         // copy over the REQUIRED bootstrapper.jar file 
         try
         {
@@ -177,7 +175,7 @@
             throw new MojoFailureException( "Failed to copy bootstrapper.jar " + mymojo.getBootstrapper().getFile()
                 + " into position " + layout.getBootstrapper() );
         }
-        
+
         // copy over the REQUIRED logger artifact
         try
         {
@@ -188,7 +186,7 @@
             throw new MojoFailureException( "Failed to copy logger.jar " + mymojo.getLogger().getFile()
                 + " into position " + layout.getLogger() );
         }
-        
+
         // copy over the REQUIRED daemon.jar file 
         try
         {
@@ -199,9 +197,9 @@
             throw new MojoFailureException( "Failed to copy daemon.jar " + mymojo.getDaemon().getFile()
                 + " into position " + layout.getDaemon() );
         }
-        
+
         // copy over the optional bootstrapper configuration file
-        if ( target.getBootstrapperConfiguraitonFile() == null || ! target.getBootstrapperConfiguraitonFile().exists() )
+        if ( target.getBootstrapperConfiguraitonFile() == null || !target.getBootstrapperConfiguraitonFile().exists() )
         {
             File dest = target.getBootstrapperConfiguraitonFile();
             try
@@ -214,159 +212,149 @@
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy project bootstrapper configuration file "  
-                    + target.getBootstrapperConfiguraitonFile() 
-                    + " into position " + layout.getBootstrapperConfigurationFile() );
+                throw new MojoFailureException( "Failed to copy project bootstrapper configuration file "
+                    + target.getBootstrapperConfiguraitonFile() + " into position "
+                    + layout.getBootstrapperConfigurationFile() );
             }
         }
         else
         {
             try
             {
-                FileUtils.copyFile( target.getBootstrapperConfiguraitonFile(), layout.getBootstrapperConfigurationFile() );
+                FileUtils.copyFile( target.getBootstrapperConfiguraitonFile(), layout
+                    .getBootstrapperConfigurationFile() );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy project bootstrapper configuration file "  
-                    + target.getBootstrapperConfiguraitonFile() 
-                    + " into position " + layout.getBootstrapperConfigurationFile() );
+                throw new MojoFailureException( "Failed to copy project bootstrapper configuration file "
+                    + target.getBootstrapperConfiguraitonFile() + " into position "
+                    + layout.getBootstrapperConfigurationFile() );
             }
         }
-        
+
         // copy over the optional logging configuration file
         if ( target.getLoggerConfigurationFile().exists() )
         {
             try
             {
-                FileUtils.copyFile( target.getLoggerConfigurationFile(), 
-                    layout.getLoggerConfigurationFile() );
+                FileUtils.copyFile( target.getLoggerConfigurationFile(), layout.getLoggerConfigurationFile() );
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to copy logger configuration file "  
-                    + target.getLoggerConfigurationFile() 
-                    + " into position " + layout.getLoggerConfigurationFile(), e );
+                mymojo.getLog().error(
+                    "Failed to copy logger configuration file " + target.getLoggerConfigurationFile()
+                        + " into position " + layout.getLoggerConfigurationFile(), e );
             }
         }
-        
+
         // copy over the optional server configuration file
         if ( target.getServerConfigurationFile().exists() )
         {
             try
             {
-                FileUtils.copyFile( target.getServerConfigurationFile(), 
-                    layout.getConfigurationFile() );
+                FileUtils.copyFile( target.getServerConfigurationFile(), layout.getConfigurationFile() );
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to copy server configuration file "  
-                    + target.getServerConfigurationFile()
-                    + " into position " + layout.getConfigurationFile(), e );
+                mymojo.getLog().error(
+                    "Failed to copy server configuration file " + target.getServerConfigurationFile()
+                        + " into position " + layout.getConfigurationFile(), e );
             }
         }
-        
+
         // -------------------------------------------------------------------
         // Copy OS Specific Files 
         // -------------------------------------------------------------------
-        
+
         // now copy over the jsvc executable renaming it to the applicationName 
-        if ( target.getOsName().equals( "linux" ) && 
-             target.getOsArch().equals( "i386" ) )
+        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "i386" ) )
         {
-            File executable = new File ( layout.getBinDirectory(), target.getApplication().getName() );
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName() );
             try
             {
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_linux_i386" ), executable );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "  
-                    + getClass().getResource( "jsvc_linux_i386" )
-                    + " into position " + executable.getAbsolutePath() );
+                throw new MojoFailureException( "Failed to copy jsvc executable file "
+                    + getClass().getResource( "jsvc_linux_i386" ) + " into position " + executable.getAbsolutePath() );
             }
         }
-        
+
         // now copy over the jsvc executable renaming it to the mymojo.getApplicationName() 
-        if ( target.getOsName().equals( "sunos" ) && 
-            target.getOsArch().equals( "sparc" ) )
-       {
-           File executable = new File ( layout.getBinDirectory(), target.getApplication().getName() );
-           try
-           {
-               MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc" ), executable );
-           }
-           catch ( IOException e )
-           {
-               throw new MojoFailureException( "Failed to copy jsvc executable file "  
-                   + getClass().getResource( "jsvc_solaris_sparc" )
-                   + " into position " + executable.getAbsolutePath() );
-           }
-       }
-       
-        if ( target.getOsName().equals( "sunos" ) && 
-            target.getOsArch().equals( "i386" ) )
-       {
-           File executable = new File ( layout.getBinDirectory(), target.getApplication().getName() );
-           try
-           {
-               MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_i386" ), executable );
-           }
-           catch ( IOException e )
-           {
-               throw new MojoFailureException( "Failed to copy jsvc executable file "  
-                   + getClass().getResource( "jsvc_solaris_i386" )
-                   + " into position " + executable.getAbsolutePath() );
-           }
-       }
-       
+        if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "sparc" ) )
+        {
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName() );
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc" ), executable );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy jsvc executable file "
+                    + getClass().getResource( "jsvc_solaris_sparc" ) + " into position " + executable.getAbsolutePath() );
+            }
+        }
+
+        if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "i386" ) )
+        {
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName() );
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_i386" ), executable );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy jsvc executable file "
+                    + getClass().getResource( "jsvc_solaris_i386" ) + " into position " + executable.getAbsolutePath() );
+            }
+        }
+
         // now copy over the jsvc executable renaming it to the mymojo.getApplicationName() 
         if ( target.getOsName().equals( "macosx" ) && target.getOsArch().equals( "ppc" ) )
         {
-            File executable = new File ( layout.getBinDirectory(), target.getApplication().getName() );
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName() );
             try
             {
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_macosx_ppc" ), executable );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "  
-                    + getClass().getResource( "jsvc_macosx_ppc" )
-                    + " into position " + executable.getAbsolutePath() );
+                throw new MojoFailureException( "Failed to copy jsvc executable file "
+                    + getClass().getResource( "jsvc_macosx_ppc" ) + " into position " + executable.getAbsolutePath() );
             }
         }
-        
+
         // now copy over the Prunsrv and Prunmgr executables renaming them to the mymojo.getApplicationName() + w for mgr
-        if ( target.getOsFamily().equals( "windows" ) &&  target.getOsArch().equals( "x86" ) )
+        if ( target.getOsFamily().equals( "windows" ) && target.getOsArch().equals( "x86" ) )
         {
-            File executable = new File ( layout.getBinDirectory(), target.getApplication().getName() + ".exe" );
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName() + ".exe" );
             try
             {
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "prunsrv.exe" ), executable );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy prunsrv executable file "  
-                    + getClass().getResource( "prunsrv.exe" )
-                    + " into position " + executable.getAbsolutePath() );
+                throw new MojoFailureException( "Failed to copy prunsrv executable file "
+                    + getClass().getResource( "prunsrv.exe" ) + " into position " + executable.getAbsolutePath() );
             }
 
-            executable = new File ( layout.getBinDirectory(), target.getApplication().getName() + "w.exe" );
+            executable = new File( layout.getBinDirectory(), target.getApplication().getName() + "w.exe" );
             try
             {
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "prunmgr.exe" ), executable );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy prunmgr executable file "  
-                    + getClass().getResource( "prunmgr.exe" )
-                    + " into position " + executable.getAbsolutePath() );
+                throw new MojoFailureException( "Failed to copy prunmgr executable file "
+                    + getClass().getResource( "prunmgr.exe" ) + " into position " + executable.getAbsolutePath() );
             }
         }
-        
+
         target.setLibArtifacts( MojoHelperUtils.copyDependencies( mymojo, layout ) );
-        
+
         // -- copy sources if set --
-        
+
         if ( target.getSourcesDirectory() != null )
         {
             File sourcesDirectory = new File( layout.getBaseDirectory(), target.getSourcesTargetPath() );
@@ -376,13 +364,13 @@
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy sources exported from " + target.getSourcesDirectory() 
+                throw new MojoFailureException( "Failed to copy sources exported from " + target.getSourcesDirectory()
                     + " to " + sourcesDirectory );
             }
         }
-        
+
         // -- copy doco if set --
-        
+
         if ( target.getDocsDirectory() != null )
         {
             File docsDirectory = new File( layout.getBaseDirectory(), target.getDocsTargetPath() );
@@ -392,15 +380,15 @@
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy generated docs from " + target.getDocsDirectory() 
+                throw new MojoFailureException( "Failed to copy generated docs from " + target.getDocsDirectory()
                     + " to " + docsDirectory );
             }
         }
-        
+
         // -- if present copy the NOTICE.txt file --
-        
-        File noticeFileTarget = new File ( layout.getBaseDirectory(), "NOTICE.txt" );
-        File noticeFile = new File ( "NOTICE.txt" );
+
+        File noticeFileTarget = new File( layout.getBaseDirectory(), "NOTICE.txt" );
+        File noticeFile = new File( "NOTICE.txt" );
         if ( noticeFile.exists() )
         {
             try
@@ -409,8 +397,9 @@
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to notice file "  + noticeFile.getAbsolutePath()
-                    + " into position " + noticeFileTarget.getAbsolutePath(), e );
+                mymojo.getLog().error(
+                    "Failed to notice file " + noticeFile.getAbsolutePath() + " into position "
+                        + noticeFileTarget.getAbsolutePath(), e );
             }
         }
     }

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java Fri Feb 10 02:50:45 2006
@@ -25,5 +25,5 @@
  */
 public class DebTarget extends Target
 {
-    
+
 }

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java Fri Feb 10 02:50:45 2006
@@ -53,7 +53,7 @@
     public static void copyBinaryFile( InputStream from, File to ) throws IOException
     {
         FileOutputStream out = null;
-        try 
+        try
         {
             out = new FileOutputStream( to );
             IOUtil.copy( from, out );
@@ -64,9 +64,9 @@
             IOUtil.close( out );
         }
     }
-    
-    
-    public static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties, InputStream from, 
+
+
+    public static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties, InputStream from,
         File to, boolean filtering ) throws IOException
     {
         // buffer so it isn't reading a byte at a time!
@@ -95,14 +95,14 @@
                 reader = new InterpolationFilterReader( reader, filterProperties, "${", "}" );
                 // support @token@
                 reader = new InterpolationFilterReader( reader, filterProperties, "@", "@" );
-    
+
                 boolean isPropertiesFile = false;
                 if ( to.isFile() && to.getName().endsWith( ".properties" ) )
                 {
                     isPropertiesFile = true;
                 }
-                reader = new InterpolationFilterReader( reader, 
-                    new ReflectionProperties( mymojo.getProject(), isPropertiesFile ), "${", "}" );
+                reader = new InterpolationFilterReader( reader, new ReflectionProperties( mymojo.getProject(),
+                    isPropertiesFile ), "${", "}" );
             }
             else
             {
@@ -118,28 +118,29 @@
     }
 
 
-    public static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties, File from, 
-        File to, boolean filtering ) throws IOException
+    public static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties, File from, File to,
+        boolean filtering ) throws IOException
     {
         copyAsciiFile( mymojo, filterProperties, new FileInputStream( from ), to, filtering );
     }
 
 
-    public static List copyDependencies( ServiceInstallersMojo mymojo, InstallationLayout layout ) throws MojoFailureException
+    public static List copyDependencies( ServiceInstallersMojo mymojo, InstallationLayout layout )
+        throws MojoFailureException
     {
         List libArtifacts = new ArrayList();
         Artifact artifact = null;
         List rejects = new ArrayList();
-        
-        mymojo.getLog().info( "");
-        mymojo.getLog().info( "    Including artifacts: ");
-        mymojo.getLog().info( "    -------------------");
+
+        mymojo.getLog().info( "" );
+        mymojo.getLog().info( "    Including artifacts: " );
+        mymojo.getLog().info( "    -------------------" );
         Iterator artifacts = mymojo.getProject().getRuntimeArtifacts().iterator();
         while ( artifacts.hasNext() )
         {
             artifact = ( Artifact ) artifacts.next();
             String key = artifact.getGroupId() + ":" + artifact.getArtifactId();
-            
+
             if ( artifact.equals( mymojo.getBootstrapper() ) )
             {
                 rejects.add( key );
@@ -159,7 +160,7 @@
                     rejects.add( key );
                     continue;
                 }
-                
+
                 try
                 {
                     FileUtils.copyFileToDirectory( artifact.getFile(), layout.getLibDirectory() );
@@ -168,17 +169,17 @@
                 }
                 catch ( IOException e )
                 {
-                    throw new MojoFailureException( "Failed to copy dependency artifact "  
-                        + artifact + " into position " + layout.getLibDirectory() );
+                    throw new MojoFailureException( "Failed to copy dependency artifact " + artifact
+                        + " into position " + layout.getLibDirectory() );
                 }
             }
         }
-        
-        if ( ! mymojo.getExcludes().isEmpty() )
+
+        if ( !mymojo.getExcludes().isEmpty() )
         {
             mymojo.getLog().info( "" );
-            mymojo.getLog().info( "    Excluded artifacts: ");
-            mymojo.getLog().info( "    ------------------");
+            mymojo.getLog().info( "    Excluded artifacts: " );
+            mymojo.getLog().info( "    ------------------" );
             for ( int ii = 0; ii < rejects.size(); ii++ )
             {
                 mymojo.getLog().info( "        o " + rejects.get( ii ) );
@@ -186,21 +187,21 @@
         }
         else
         {
-            mymojo.getLog().info( "No artifacts have been excluded.");
+            mymojo.getLog().info( "No artifacts have been excluded." );
         }
         mymojo.getLog().info( "" );
 
         return libArtifacts;
     }
-    
-    
+
+
     public static void exec( String[] cmd, File workDir, boolean doSudo ) throws MojoFailureException
     {
         Execute task = new Execute();
         task.setCommandline( cmd );
         task.setSpawn( true );
         task.setWorkingDirectory( workDir );
-        
+
         if ( doSudo )
         {
             String cmdString = " ";
@@ -215,28 +216,27 @@
             temp[1] = cmdString;
             cmd = temp;
         }
-        
+
         String cmdString = " ";
         for ( int ii = 0; ii < cmd.length; ii++ )
         {
             System.out.println( "cmd[" + ii + "] = " + cmd[ii] );
             cmdString += cmd[ii] + " ";
         }
-        
+
         try
         {
             task.execute();
         }
         catch ( IOException e )
         {
-            throw new MojoFailureException( "Failed while trying to execute '" + cmdString 
-                + "': " + e.getMessage() );
+            throw new MojoFailureException( "Failed while trying to execute '" + cmdString + "': " + e.getMessage() );
         }
-        
+
         if ( task.getExitValue() != 0 )
         {
-            throw new MojoFailureException( "Execution of '" + cmdString 
-                + "' resulted in a non-zero exit value: " + task.getExitValue() );
+            throw new MojoFailureException( "Execution of '" + cmdString + "' resulted in a non-zero exit value: "
+                + task.getExitValue() );
         }
     }
 }

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java Fri Feb 10 02:50:45 2006
@@ -25,5 +25,5 @@
  */
 public class PkgTarget extends Target
 {
-    
+
 }

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ReflectionProperties.java Fri Feb 10 02:50:45 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.daemon.installers;
 
+
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
  *
@@ -32,7 +33,6 @@
  * limitations under the License.
  */
 
-
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
@@ -54,36 +54,38 @@
     private MavenProject project;
     boolean escapedBackslashesInFilePath;
 
-    public ReflectionProperties( MavenProject aProject, boolean escapedBackslashesInFilePath ) 
+
+    public ReflectionProperties(MavenProject aProject, boolean escapedBackslashesInFilePath)
     {
-       super();
-       project = aProject;
-       this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
+        super();
+        project = aProject;
+        this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
     }
-    
+
+
     public Object get( Object key )
     {
         Object value = null;
-        try 
+        try
         {
-            value = ReflectionValueExtractor.evaluate( "" + key , project );
-            if ( escapedBackslashesInFilePath && value != null &&
-                "java.lang.String".equals( value.getClass().getName() ) )
+            value = ReflectionValueExtractor.evaluate( "" + key, project );
+            if ( escapedBackslashesInFilePath && value != null
+                && "java.lang.String".equals( value.getClass().getName() ) )
             {
-                String val = (String) value;
+                String val = ( String ) value;
 
                 // Check if it's a windows path
                 if ( val.indexOf( ":\\" ) == 1 )
                 {
-                    value = StringUtils.replace( (String)value, "\\", "\\\\" );
-                    value = StringUtils.replace( (String)value, ":", "\\:" );
+                    value = StringUtils.replace( ( String ) value, "\\", "\\\\" );
+                    value = StringUtils.replace( ( String ) value, ":", "\\:" );
                 }
             }
         }
-        catch ( Exception e ) 
+        catch ( Exception e )
         {
             //TODO: remove the try-catch block when ReflectionValueExtractor.evaluate() throws no more exceptions
-        } 
+        }
         return value;
     }
 }

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java Fri Feb 10 02:50:45 2006
@@ -57,14 +57,14 @@
 {
     static final String BOOTSTRAPPER_ARTIFACT_ID = "daemon-bootstrappers";
     static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
-    
+
     /** HACK!
      * @todo clean me up
      * @see http://issues.apache.org/jira/browse/DIREVE-333 
      */
     static final String TOOLS_ARTIFACT_ID = "apacheds-server-tools";
     static final String TOOLS_GROUP_ID = "org.apache.directory.server";
-    
+
     static final String LOGGER_ARTIFACT_ID = "nlog4j";
     static final String LOGGER_GROUP_ID = "org.slf4j";
     static final String DAEMON_ARTIFACT_ID = "commons-daemon";
@@ -121,7 +121,7 @@
      * @required
      */
     private Application application;
-    
+
     /**
      * @parameter 
      * @required
@@ -137,17 +137,17 @@
      * @parameter
      */
     private String svnBaseUrl;
-    
+
     /**
      * @parameter
      */
     private boolean packageSources = false;
-    
+
     /**
      * @parameter
      */
     private boolean packageDocs = false;
-    
+
     /**
      * @parameter expression="src"
      */
@@ -178,21 +178,21 @@
     private File exportedSources;
     private File docsBase;
     private List allTargets;
-    
-    
+
+
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         FileUtils.mkdir( outputDirectory.getAbsolutePath() );
-        
+
         // collect all targets 
         initializeAllTargets();
-        
+
         // setup exports and docs if specified for installers
         setupSourcesAndDocs();
-        
+
         // makes sure defaulted values are set to globals
         setDefaults();
-        
+
         // bail if there is nothing to do 
         if ( allTargets.isEmpty() )
         {
@@ -202,22 +202,22 @@
             getLog().info( "===================================================================" );
             return;
         }
-        
+
         // report what we have to build 
         reportSetup();
 
         // search for and find the bootstrapper artifact
         setBootstrapArtifacts();
-        
+
         // generate installers for all targets
         for ( int ii = 0; ii < allTargets.size(); ii++ )
         {
             Target target = ( Target ) allTargets.get( ii );
-            
+
             // create the installation image first
             CreateImageCommand imgCmd = new CreateImageCommand( this, target );
             imgCmd.execute();
-            
+
             // ---------------------------------------------------------------
             // Generate all installers
             // ---------------------------------------------------------------
@@ -244,8 +244,8 @@
             }
         }
     }
-    
-    
+
+
     private void initializeAllTargets()
     {
         allTargets = new ArrayList();
@@ -255,18 +255,19 @@
         addAll( allTargets, debTargets );
         addAll( allTargets, pkgTargets );
     }
-    
+
 
     private void addAll( List list, Object[] array )
     {
-        if ( array == null ) return;
+        if ( array == null )
+            return;
         for ( int ii = 0; ii < array.length; ii++ )
         {
             list.add( array[ii] );
         }
     }
-    
-    
+
+
     private void setDefaults() throws MojoFailureException
     {
         if ( allTargets == null )
@@ -278,7 +279,7 @@
         {
             throw new MojoFailureException( "Installed application name cannot be null." );
         }
-        
+
         if ( application.getCompany() == null )
         {
             if ( project.getOrganization() != null )
@@ -290,7 +291,7 @@
                 application.setCompany( "Apache Software Foundation" );
             }
         }
-        
+
         if ( application.getDescription() == null )
         {
             if ( project.getDescription() != null )
@@ -302,12 +303,12 @@
                 application.setDescription( "No description of this application is available." );
             }
         }
-        
+
         if ( project.getInceptionYear() != null )
         {
             application.setCopyrightYear( project.getInceptionYear() );
         }
-        
+
         if ( application.getUrl() == null )
         {
             if ( project.getUrl() != null )
@@ -323,17 +324,17 @@
                 application.setUrl( "http://www.apache.org" );
             }
         }
-        
+
         if ( application.getVersion() == null )
         {
             application.setVersion( project.getVersion() );
         }
-        
+
         if ( application.getMinimumJavaVersion() == null )
         {
             application.setMinimumJavaVersion( JavaEnvUtils.getJavaVersion() );
         }
-        
+
         if ( application.getAuthors() == null )
         {
             List authors = new ArrayList();
@@ -345,45 +346,45 @@
                 {
                     authors.add( developer.getEmail() );
                 }
-                else 
+                else
                 {
                     authors.add( developer.getName() );
                 }
             }
-            
+
             application.setAuthors( authors );
         }
-        
+
         if ( application.getEmail() == null )
         {
-            if ( ! project.getMailingLists().isEmpty() )
+            if ( !project.getMailingLists().isEmpty() )
             {
                 application.setEmail( ( ( MailingList ) project.getMailingLists().get( 0 ) ).getPost() );
             }
-            
+
             application.setEmail( "general@apache.org" );
         }
-        
+
         if ( application.getIcon() == null )
         {
             application.setIcon( new File( "src/main/installers/logo.ico" ) );
         }
-        
+
         if ( application.getReadme() == null )
         {
             application.setReadme( new File( "README.txt" ) );
         }
-        
+
         if ( application.getLicense() == null )
         {
             application.setLicense( new File( "LICENSE.txt" ) );
         }
-        
+
         for ( int ii = 0; ii < allTargets.size(); ii++ )
         {
             Target target = ( Target ) allTargets.get( ii );
-            
-            if ( target.getApplication() == null)
+
+            if ( target.getApplication() == null )
             {
                 target.setApplication( this.application );
             }
@@ -392,44 +393,44 @@
             {
                 target.setLoggerConfigurationFile( new File( sourceDirectory, "log4j.properties" ) );
             }
-            
+
             if ( target.getBootstrapperConfiguraitonFile() == null )
             {
                 target.setBootstrapperConfiguraitonFile( new File( sourceDirectory, "bootstrapper.properties" ) );
             }
-            
+
             if ( target.getServerConfigurationFile() == null )
             {
                 target.setServerConfigurationFile( new File( sourceDirectory, "server.xml" ) );
             }
-            
+
             if ( target.getOsVersion() == null )
             {
                 target.setOsVersion( "*" );
             }
-            
+
             if ( packageSources && exportedSources != null && target.getSourcesDirectory() == null )
             {
                 target.setSourcesDirectory( exportedSources );
             }
-            
+
             if ( packageDocs && docsBase != null && target.getDocsDirectory() == null )
             {
                 target.setDocsDirectory( docsBase );
             }
-            
+
             if ( target.getSourcesTargetPath() == null )
             {
-            	target.setSourcesTargetPath( sourcesTargetPath );
+                target.setSourcesTargetPath( sourcesTargetPath );
             }
-            
+
             if ( target.getDocsTargetPath() == null )
             {
-            	target.setDocsTargetPath( docsTargetPath );
+                target.setDocsTargetPath( docsTargetPath );
             }
         }
     }
-    
+
 
     private void setupSourcesAndDocs() throws MojoFailureException
     {
@@ -438,7 +439,7 @@
         {
             exportedSources = new File( outputDirectory, "src" );
             exportSvnSources( exportedSources );
-            
+
             if ( packageDocs )
             {
                 generatedDocs = new File( outputDirectory, "docs" );
@@ -449,7 +450,7 @@
         }
     }
 
-    
+
     private void setBootstrapArtifacts() throws MojoFailureException
     {
         Artifact artifact = null;
@@ -457,27 +458,31 @@
         while ( artifacts.hasNext() )
         {
             artifact = ( Artifact ) artifacts.next();
-            if ( artifact.getArtifactId().equals( BOOTSTRAPPER_ARTIFACT_ID ) && artifact.getGroupId().equals( BOOTSTRAPPER_GROUP_ID ) )
+            if ( artifact.getArtifactId().equals( BOOTSTRAPPER_ARTIFACT_ID )
+                && artifact.getGroupId().equals( BOOTSTRAPPER_GROUP_ID ) )
             {
                 getLog().info( "Found bootstrapper dependency with version: " + artifact.getVersion() );
                 bootstrapper = artifact;
             }
-            else if ( artifact.getArtifactId().equals( LOGGER_ARTIFACT_ID ) && artifact.getGroupId().equals( LOGGER_GROUP_ID ) )
+            else if ( artifact.getArtifactId().equals( LOGGER_ARTIFACT_ID )
+                && artifact.getGroupId().equals( LOGGER_GROUP_ID ) )
             {
                 getLog().info( "Found logger dependency with version: " + artifact.getVersion() );
                 logger = artifact;
             }
-            else if ( artifact.getArtifactId().equals( DAEMON_ARTIFACT_ID ) && artifact.getGroupId().equals( DAEMON_GROUP_ID ) )
+            else if ( artifact.getArtifactId().equals( DAEMON_ARTIFACT_ID )
+                && artifact.getGroupId().equals( DAEMON_GROUP_ID ) )
             {
                 getLog().info( "Found daemon dependency with version: " + artifact.getVersion() );
                 daemon = artifact;
             }
-            
+
             /** HACK!
              * @todo clean me up
              * @see http://issues.apache.org/jira/browse/DIREVE-333 
              */
-            else if ( artifact.getArtifactId().equals( TOOLS_ARTIFACT_ID ) && artifact.getGroupId().equals( TOOLS_GROUP_ID ) )
+            else if ( artifact.getArtifactId().equals( TOOLS_ARTIFACT_ID )
+                && artifact.getGroupId().equals( TOOLS_GROUP_ID ) )
             {
                 getLog().info( "Found tools dependency with version: " + artifact.getVersion() );
                 tools = artifact;
@@ -486,22 +491,22 @@
 
         if ( bootstrapper == null )
         {
-            throw new MojoFailureException( "Bootstrapper dependency artifact required: " 
-                + BOOTSTRAPPER_GROUP_ID + ":" + BOOTSTRAPPER_ARTIFACT_ID );
+            throw new MojoFailureException( "Bootstrapper dependency artifact required: " + BOOTSTRAPPER_GROUP_ID + ":"
+                + BOOTSTRAPPER_ARTIFACT_ID );
         }
         if ( logger == null )
         {
-            throw new MojoFailureException( "Logger dependency artifact required: " 
-                + LOGGER_GROUP_ID + ":" + LOGGER_ARTIFACT_ID );
+            throw new MojoFailureException( "Logger dependency artifact required: " + LOGGER_GROUP_ID + ":"
+                + LOGGER_ARTIFACT_ID );
         }
         if ( daemon == null )
         {
-            throw new MojoFailureException( "Daemon dependency artifact required: " 
-                + DAEMON_GROUP_ID + ":" + DAEMON_ARTIFACT_ID );
+            throw new MojoFailureException( "Daemon dependency artifact required: " + DAEMON_GROUP_ID + ":"
+                + DAEMON_ARTIFACT_ID );
         }
     }
-    
-    
+
+
     public void reportSetup()
     {
         getLog().info( "===================================================================" );
@@ -510,7 +515,7 @@
         getLog().info( "sourceDirectory = " + sourceDirectory );
         getLog().info( "outputDirectory = " + outputDirectory );
         getLog().info( "----------------------------- allTargets -----------------------------" );
-        
+
         if ( allTargets != null )
         {
             for ( int ii = 0; ii < allTargets.size(); ii++ )
@@ -520,31 +525,33 @@
                 getLog().info( "osArch: " + ( ( Target ) allTargets.get( ii ) ).getOsArch() );
                 getLog().info( "osVersion: " + ( ( Target ) allTargets.get( ii ) ).getOsVersion() );
                 getLog().info( "daemonFramework: " + ( ( Target ) allTargets.get( ii ) ).getDaemonFramework() );
-                getLog().info( "loggerConfigurationFile: " + 
-                    ( ( Target ) allTargets.get( ii ) ).getLoggerConfigurationFile() );
-                getLog().info( "bootstrapperConfiguraitonFiles: " + 
-                    ( ( Target ) allTargets.get( ii ) ).getBootstrapperConfiguraitonFile() );
-                getLog().info( "serverConfigurationFil: " + 
-                    ( ( Target ) allTargets.get( ii ) ).getServerConfigurationFile() );
-                
+                getLog().info(
+                    "loggerConfigurationFile: " + ( ( Target ) allTargets.get( ii ) ).getLoggerConfigurationFile() );
+                getLog().info(
+                    "bootstrapperConfiguraitonFiles: "
+                        + ( ( Target ) allTargets.get( ii ) ).getBootstrapperConfiguraitonFile() );
+                getLog().info(
+                    "serverConfigurationFil: " + ( ( Target ) allTargets.get( ii ) ).getServerConfigurationFile() );
+
                 if ( ii + 1 < allTargets.size() )
                 {
                     getLog().info( "" );
                 }
             }
         }
-        
+
         getLog().info( "===================================================================" );
     }
 
-    
+
     private void exportSvnSources( File exportTarget ) throws MojoFailureException
     {
-        String[] cmd = new String[] { "svn", "export", svnBaseUrl, exportTarget.getAbsolutePath() };
+        String[] cmd = new String[]
+            { "svn", "export", svnBaseUrl, exportTarget.getAbsolutePath() };
         MojoHelperUtils.exec( cmd, outputDirectory, false );
     }
-    
-    
+
+
     private void generateDocs( File exportTarget, File docsTarget ) throws MojoFailureException
     {
         try
@@ -553,23 +560,25 @@
         }
         catch ( IOException e )
         {
-            throw new MojoFailureException( "Failed to copy exported sources from svn here " 
+            throw new MojoFailureException( "Failed to copy exported sources from svn here "
                 + exportTarget.getAbsolutePath() + " to " + docsTarget.getAbsolutePath() );
         }
-        
+
         String[] cmd = null;
         if ( Os.isFamily( "windows" ) )
         {
-        	cmd = new String[] { "mvn.bat", "site", "--non-recursive" };
+            cmd = new String[]
+                { "mvn.bat", "site", "--non-recursive" };
         }
         else
         {
-        	cmd = new String[] { "mvn", "site", "--non-recursive" };
+            cmd = new String[]
+                { "mvn", "site", "--non-recursive" };
         }
         MojoHelperUtils.exec( cmd, docsTarget, false );
     }
-    
-    
+
+
     public File getOutputDirectory()
     {
         return outputDirectory;
@@ -593,10 +602,12 @@
         return logger;
     }
 
+
     public Artifact getTools()
     {
         return tools;
     }
+
 
     public String getEncoding()
     {

Modified: directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java?rev=376624&r1=376623&r2=376624&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java (original)
+++ directory/sandbox/akarasulu/rc1/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java Fri Feb 10 02:50:45 2006
@@ -47,11 +47,14 @@
      *      <li>os/400</li>
      *    </ul>
      */
-    public final static String[] OS_FAMILIES = new String[] { 
-        "dos", "mac", "netware", "os/2", "tandem", "unix", "windows", "win9x", "z/os", "os/400" };
-    public final static String[] OPERATING_SYSTEMS = new String[] { "Linux", "SunOS", "Windows", "Mac OS X" };
-    public final static String[] ARCHITECTURES = new String[] { "intel", "sparc", "ppc" };
-    public final static String[] DAEMON_FRAMEWORKS = new String[] { "jsvc", "procrun" };
+    public final static String[] OS_FAMILIES = new String[]
+        { "dos", "mac", "netware", "os/2", "tandem", "unix", "windows", "win9x", "z/os", "os/400" };
+    public final static String[] OPERATING_SYSTEMS = new String[]
+        { "Linux", "SunOS", "Windows", "Mac OS X" };
+    public final static String[] ARCHITECTURES = new String[]
+        { "intel", "sparc", "ppc" };
+    public final static String[] DAEMON_FRAMEWORKS = new String[]
+        { "jsvc", "procrun" };
 
     // required stuff
     private String id;
@@ -71,32 +74,30 @@
     private String sourcesTargetPath;
     private String docsTargetPath;
 
-    
     private InstallationLayout layout;
     private List libArtifacts;
-    
-    
+
     private Application application;
-    
-    
+
+
     public void setApplication( Application application )
     {
         this.application = application;
     }
-    
-    
+
+
     public Application getApplication()
     {
         return application;
     }
-    
-    
+
+
     public void setOsName( String osName )
     {
         this.osName = osName.toLowerCase( Locale.US );
     }
-    
-    
+
+
     public String getOsName()
     {
         return osName;
@@ -115,7 +116,7 @@
     }
 
 
-    public void setDaemonFramework(String daemonFramework)
+    public void setDaemonFramework( String daemonFramework )
     {
         this.daemonFramework = daemonFramework.toLowerCase( Locale.US );
     }
@@ -127,7 +128,7 @@
     }
 
 
-    public void setOsVersion(String osVersion)
+    public void setOsVersion( String osVersion )
     {
         this.osVersion = osVersion.toLowerCase( Locale.US );
     }
@@ -143,7 +144,7 @@
     }
 
 
-    public void setId(String id)
+    public void setId( String id )
     {
         this.id = id;
     }
@@ -155,7 +156,7 @@
     }
 
 
-    public void setLoggerConfigurationFile(File loggerConfigurationFile)
+    public void setLoggerConfigurationFile( File loggerConfigurationFile )
     {
         this.loggerConfigurationFile = loggerConfigurationFile;
     }
@@ -167,7 +168,7 @@
     }
 
 
-    public void setServerConfigurationFile(File serverConfigurationFile)
+    public void setServerConfigurationFile( File serverConfigurationFile )
     {
         this.serverConfigurationFile = serverConfigurationFile;
     }
@@ -179,7 +180,7 @@
     }
 
 
-    public void setBootstrapperConfiguraitonFile(File bootstrapperConfiguraitonFile)
+    public void setBootstrapperConfiguraitonFile( File bootstrapperConfiguraitonFile )
     {
         this.bootstrapperConfiguraitonFile = bootstrapperConfiguraitonFile;
     }
@@ -191,7 +192,7 @@
     }
 
 
-    public void setOsFamily(String osFamily)
+    public void setOsFamily( String osFamily )
     {
         this.osFamily = osFamily;
     }
@@ -202,8 +203,8 @@
         return osFamily;
     }
 
-    
-    public void setLayout(InstallationLayout layout)
+
+    public void setLayout( InstallationLayout layout )
     {
         this.layout = layout;
     }
@@ -215,7 +216,7 @@
     }
 
 
-    public void setLibArtifacts(List libArtifacts)
+    public void setLibArtifacts( List libArtifacts )
     {
         this.libArtifacts = libArtifacts;
     }
@@ -239,7 +240,7 @@
     }
 
 
-    public void setCompanyName(String innoCompanyName)
+    public void setCompanyName( String innoCompanyName )
     {
         this.companyName = innoCompanyName;
     }
@@ -251,7 +252,7 @@
     }
 
 
-    public void setCopyrightYear(String innoCopyrightYear)
+    public void setCopyrightYear( String innoCopyrightYear )
     {
         this.copyrightYear = innoCopyrightYear;
     }
@@ -287,26 +288,26 @@
     }
 
 
-	public void setSourcesTargetPath( String sourcesTargetDirectory ) 
-	{
-		this.sourcesTargetPath = sourcesTargetDirectory;
-	}
+    public void setSourcesTargetPath( String sourcesTargetDirectory )
+    {
+        this.sourcesTargetPath = sourcesTargetDirectory;
+    }
 
 
-	public String getSourcesTargetPath() 
-	{
-		return sourcesTargetPath;
-	}
+    public String getSourcesTargetPath()
+    {
+        return sourcesTargetPath;
+    }
 
 
-	public void setDocsTargetPath( String docsTargetDirectory ) 
-	{
-		this.docsTargetPath = docsTargetDirectory;
-	}
+    public void setDocsTargetPath( String docsTargetDirectory )
+    {
+        this.docsTargetPath = docsTargetDirectory;
+    }
 
 
-	public String getDocsTargetPath() 
-	{
-		return docsTargetPath;
-	}
+    public String getDocsTargetPath()
+    {
+        return docsTargetPath;
+    }
 }



Mime
View raw message