You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/09/28 14:16:12 UTC
svn commit: r1002139 -
/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
Author: pamarcelot
Date: Tue Sep 28 12:16:12 2010
New Revision: 1002139
URL: http://svn.apache.org/viewvc?rev=1002139&view=rev
Log:
Cleaning.
Modified:
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java?rev=1002139&r1=1002138&r2=1002139&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java Tue Sep 28 12:16:12 2010
@@ -145,103 +145,6 @@ public class BinInstallerCommand extends
throw new MojoFailureException( "Failed while trying to generate the Bin: " + e.getMessage() );
}
- //
- // File baseDirectory = target.getLayout().getInstallationDirectory();
- // File imagesDirectory = baseDirectory.getParentFile();
- //
- // log.info( "Creating Bin Installer..." );
- //
- // // Creating the package directory
- // File binDirectory = new File( imagesDirectory, target.getId() + "-bin" );
- // binDirectory.mkdirs();
- //
- // log.info( "Copying Bin installer files" );
- //
- // // Copying the apacheds files in the rootFolder directory
- // File binRootFolderDirectory = new File( binDirectory, "rootFolder" );
- // binRootFolderDirectory.mkdirs();
- // File binRootFolderServerDirectory = new File( binRootFolderDirectory, "server" );
- // try
- // {
- // copyFiles( baseDirectory, binRootFolderServerDirectory );
- //
- // }
- // catch ( IOException e )
- // {
- // log.error( e.getMessage() );
- // throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallationDirectory()
- // + ") to the Bin directory (" + binRootFolderDirectory + ")" );
- // }
- //
- // // Create instance and sh directory
- // File binRootFolderInstanceDirectory = new File( binRootFolderDirectory, "instance" );
- // binRootFolderInstanceDirectory.mkdirs();
- // File binShDirectory = new File( binDirectory, "sh" );
- // binShDirectory.mkdirs();
- //
- // // Copying the resources files
- // try
- // {
- // // Copying the apacheds.conf file to the server installation layout
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.conf" ),
- // new File( binRootFolderServerDirectory, "conf/apacheds.conf" ), false );
- //
- // // Copying the default instance apacheds.conf file
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
- // "apacheds-default.conf" ), new File( binRootFolderInstanceDirectory, "apacheds.conf" ), false );
- //
- // // Copying the log4j.properties file for the default instance
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, new File( binRootFolderServerDirectory,
- // "conf/log4j.properties" ), new File( binRootFolderInstanceDirectory, "log4j.properties" ),
- // false );
- //
- // // Copying the server.xml file for the default instance
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, new File( binRootFolderServerDirectory,
- // "conf/server.xml" ), new File( binRootFolderInstanceDirectory, "server.xml" ), false );
- //
- // // Copying the apacheds-init script file for the default instance
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds-init" ),
- // new File( binRootFolderInstanceDirectory, "apacheds-init" ), true );
- //
- // // Copying shell script utilities for the installer
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "bootstrap.sh" ),
- // new File( binDirectory, "bootstrap.sh" ), true );
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
- // "createInstaller.sh" ), new File( binDirectory, "createInstaller.sh" ), true );
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "functions.sh" ),
- // new File( binShDirectory, "functions.sh" ), false );
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "install.sh" ),
- // new File( binShDirectory, "install.sh" ), false );
- // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "variables.sh" ),
- // new File( binShDirectory, "variables.sh" ), false );
- //
- // // Removing the redundant server.xml file (see DIRSERVER-1112)
- // new File( binRootFolderServerDirectory, "conf/server.xml" ).delete();
- // }
- // catch ( IOException e )
- // {
- // log.error( e.getMessage() );
- // throw new MojoFailureException( "Failed to copy Bin resources files." );
- // }
- //
- // // Generating the Bin
- // log.info( "Generating Bin Installer" );
- // Execute createBinTask = new Execute();
- // String[] cmd = new String[]
- // { shUtility.getAbsolutePath(), "createInstaller.sh" };
- // createBinTask.setCommandline( cmd );
- // createBinTask.setSpawn( true );
- // createBinTask.setWorkingDirectory( binDirectory );
- // try
- // {
- // createBinTask.execute();
- // }
- // catch ( IOException e )
- // {
- // log.error( e.getMessage() );
- // throw new MojoFailureException( "Failed while trying to generate the Bin: " + e.getMessage() );
- // }
-
log.info( "Bin Installer generated at " + new File( getTargetDirectory(), finalName ) );
}