directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1001746 - in /directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main: java/org/apache/directory/daemon/installers/archive/ resources/org/apache/directory/daemon/installers/archive/
Date Mon, 27 Sep 2010 13:58:32 GMT
Author: pamarcelot
Date: Mon Sep 27 13:58:32 2010
New Revision: 1001746

URL: http://svn.apache.org/viewvc?rev=1001746&view=rev
Log:
Fixed the archive installer for Windows machines.

Modified:
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.sh

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java?rev=1001746&r1=1001745&r2=1001746&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
Mon Sep 27 13:58:32 2010
@@ -21,14 +21,12 @@ package org.apache.directory.daemon.inst
 
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.directory.daemon.installers.AbstractMojoCommand;
 import org.apache.directory.daemon.installers.GenerateMojo;
 import org.apache.directory.daemon.installers.MojoHelperUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.BZip2;
 import org.apache.tools.ant.taskdefs.GZip;
@@ -189,47 +187,6 @@ public class ArchiveInstallerCommand ext
 
         log.info( "=> Archive Installer (" + archiveType + ") archive generated at "
             + finalFile );
-
-        // TODO FIXME
-        //        File baseDirectory = target.getLayout().getInstallationDirectory();
-        //        File imagesDirectory = baseDirectory.getParentFile();
-        //
-        //        log.info( "Creating Archive Installer..." );
-        //
-        //        // Creating the archive directory
-        //        File targetDirectory = new File( imagesDirectory, target.getId() );
-        //        File archiveDirectory = new File( targetDirectory, "apacheds" + "_"
-        //            + mojo.getProject().getVersion() );
-        //
-        //        log.info( "Copying Archive Installer files" );
-        //
-        //        // Copying the resources files
-        //        try
-        //        {
-        //            // Copying the apacheds.bat file
-        //            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
"apacheds.bat" ),
-        //                new File( targetDirectory, "apacheds.bat" ), false );
-        //
-        //            // Copying the cpappend.bat file
-        //            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
"cpappend.bat" ),
-        //                new File( targetDirectory, "cpappend.bat" ), false );
-        //
-        //            // Copying the apacheds.sh file
-        //            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
"apacheds.sh" ),
-        //                new File( targetDirectory, "apacheds.sh" ), false );
-        //
-        //            // Copying all the files in the final archive directory
-        //            MojoHelperUtils.copyFiles( targetDirectory, archiveDirectory );
-        //        }
-        //        catch ( IOException e )
-        //        {
-        //            log.error( e.getMessage() );
-        //            throw new MojoFailureException( "Failed to copy Archive Installer resources
files." );
-        //        }
-        //
-
-        //
-        //        log.info( "Archive Installer generated at " + new File( imagesDirectory,
target.getFinalName() ) );
     }
 
 

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat?rev=1001746&r1=1001745&r2=1001746&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat
Mon Sep 27 13:58:32 2010
@@ -16,11 +16,22 @@ REM  KIND, either express or implied.  S
 REM  specific language governing permissions and limitations
 REM  under the License.
 
-REM ---------------------------------
-REM dynamically build the classpath
-REM ---------------------------------
+
+REM Getting the instance name from the first argument
+set INSTANCE_NAME=%1
+
+
+REM If there is no first argument, setting the instance name to 'default'
+IF [%1]==[] set INSTANCE_NAME=default
+
+
+REM Printing instance information
+echo Starting ApacheDS instance '%INSTANCE_NAME%'...
+
+
+REM Dynamically build the classpath
 set ADS_CLASSPATH=
-for %%i in (.\lib\*.jar) do call cpappend.bat %%i
-for %%i in (.\lib\ext\*.jar) do call cpappend.bat %%i
+for %%i in (..\lib\*.jar) do call cpappend.bat %%i
 
-java -Dlog4j.configuration="file:conf/log4j.properties" -Dapacheds.log.dir=logs -cp %ADS_CLASSPATH%
org.apache.directory.server.UberjarMain example.com
+REM Launching ApacheDS
+java -Dlog4j.configuration="file:../instances/%INSTANCE_NAME%/conf/log4j.properties" -Dapacheds.log.dir=../instances/%INSTANCE_NAME%/log
-cp %ADS_CLASSPATH% org.apache.directory.server.UberjarMain ../instances/%INSTANCE_NAME%

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.sh?rev=1001746&r1=1001745&r2=1001746&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.sh
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.sh
Mon Sep 27 13:58:32 2010
@@ -34,7 +34,7 @@ else
     exit 1
 fi
 
-# Pring instance information
+# Printing instance information
 echo "Starting ApacheDS instance '$ADS_INSTANCE_NAME'..."
 
 # Getting the fully qualified path to the script



Mime
View raw message