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/24 10:11:55 UTC
svn commit: r1000754 - in
/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main:
java/org/apache/directory/daemon/installers/
java/org/apache/directory/daemon/installers/nsis/
resources/org/apache/directory/daemon/installers/ re...
Author: pamarcelot
Date: Fri Sep 24 08:11:54 2010
New Revision: 1000754
URL: http://svn.apache.org/viewvc?rev=1000754&view=rev
Log:
Fixed the launch of the server using the windows installer (but the service still fails to be unregistered when uninstalling).
Modified:
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-installation.conf
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java?rev=1000754&r1=1000753&r2=1000754&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java Fri Sep 24 08:11:54 2010
@@ -309,7 +309,7 @@ public abstract class AbstractMojoComman
MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
"/org/apache/directory/daemon/installers/wrapper/lib/wrapper-windows-x86-32.dll" ), new File(
installationLayout.getLibDirectory(),
- "libwrapper.dll" ) );
+ "wrapper.dll" ) );
}
catch ( IOException e )
{
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java?rev=1000754&r1=1000753&r2=1000754&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java Fri Sep 24 08:11:54 2010
@@ -40,7 +40,6 @@ import org.apache.tools.ant.taskdefs.Exe
public class NsisInstallerCommand extends AbstractMojoCommand<NsisTarget>
{
private static final String INSTALLATION_FILES = "installationFiles";
- private static final String INSTANCES_FILES = "instancesFiles/default";
/**
@@ -167,7 +166,7 @@ public class NsisInstallerCommand extend
}
filterProperties.put( "finalname", target.getFinalName() );
filterProperties.put( "installationFiles", INSTALLATION_FILES );
- filterProperties.put( "instancesFiles", INSTANCES_FILES );
+ filterProperties.put( "instancesFiles", "instancesFiles" );
filterProperties.put( "wrapper.java.command", "wrapper.java.command=@java.home@\\bin\\java.exe" );
}
@@ -187,6 +186,6 @@ public class NsisInstallerCommand extend
*/
public File getInstanceDirectory()
{
- return new File( getTargetDirectory(), INSTANCES_FILES );
+ return new File( getTargetDirectory(), "instancesFiles/default" );
}
}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi?rev=1000754&r1=1000753&r2=1000754&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/nsis/installer.nsi Fri Sep 24 08:11:54 2010
@@ -209,12 +209,13 @@
# Replacing installation directory in config file
GetFunctionAddress $R0 ReplaceInstallationDirectory # handle to callback fn
Push $R0
- Push "$INSTANCES_HOME_DIR\conf\wrapper.conf" # file to replace in
+ Push "$INSTANCES_HOME_DIR\default\conf\wrapper.conf" # file to replace in
Call ReplaceInFile
-
- # Push "default"
- # Push "$INSTANCES_HOME_DIR"
- # Call RegisterInstance
+
+ # Registering the server instance
+ Push "default"
+ Push "$INSTANCES_HOME_DIR\default"
+ Call RegisterInstance
SectionEnd
# Uninstaller section
@@ -277,7 +278,7 @@
Function RegisterInstance
Pop $0
Pop $1
- nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\wrapper" -i "$SERVER_HOME_DIR\conf\wrapper.conf" set.INSTANCE_HOME="$0" "set.INSTANCE=$1" set.APACHEDS_HOME="$SERVER_HOME_DIR" '
+ nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\wrapper" -i "$0\conf\wrapper.conf" set.INSTANCE_DIRECTORY="$0" "set.INSTANCE=$1"'
Pop $1
Pop $0
FunctionEnd
@@ -292,7 +293,7 @@
Function un.RegisterInstance
Pop $0
- nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\wrapper" -r "$SERVER_HOME_DIR\conf\wrapper.conf" "set.INSTANCE=$0"'
+ nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\wrapper" -r "$INSTANCES_HOME_DIR\default\conf\wrapper.conf" "set.INSTANCE=$0"'
Pop $0
FunctionEnd
@@ -308,7 +309,7 @@
# Start the server
MessageBox MB_YESNO|MB_ICONQUESTION "Do you want to start the default server instance?" IDYES startService IDNO End
startService:
- nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\wrapper" --start "$SERVER_HOME_DIR\conf\wrapper.conf" "set.INSTANCE_HOME=$INSTANCES_HOME_DIR" "set.INSTANCE=default" "set.APACHEDS_HOME=$SERVER_HOME_DIR"'
+ nsExec::ExecToLog '"$SERVER_HOME_DIR\bin\wrapper" -t "$INSTANCES_HOME_DIR\default\conf\wrapper.conf" "set.INSTANCE_DIRECTORY=$INSTANCES_HOME_DIR\default" "set.INSTANCE=default"'
End:
FunctionEnd
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-installation.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-installation.conf?rev=1000754&r1=1000753&r2=1000754&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-installation.conf (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-installation.conf Fri Sep 24 08:11:54 2010
@@ -30,11 +30,11 @@ wrapper.java.classpath.1=../lib/*.jar
wrapper.java.library.path.1=../lib
# Java Additional Parameters
-wrapper.java.additional.1=-Dlog4j.configuration=file:///%INSTANCE_DIRECTORY%/conf/log4j.properties
-wrapper.java.additional.2=-Dapacheds.var.dir=%INSTANCE_DIRECTORY%
-wrapper.java.additional.3=-Dapacheds.log.dir=%INSTANCE_DIRECTORY%/log
-wrapper.java.additional.4=-Dapacheds.run.dir=%INSTANCE_DIRECTORY%/run
-wrapper.java.additional.5=-Dapacheds.instance=%INSTANCE%
+wrapper.java.additional.1=-Dlog4j.configuration="file:///%INSTANCE_DIRECTORY%/conf/log4j.properties"
+wrapper.java.additional.2=-Dapacheds.var.dir="%INSTANCE_DIRECTORY%"
+wrapper.java.additional.3=-Dapacheds.log.dir="%INSTANCE_DIRECTORY%/log"
+wrapper.java.additional.4=-Dapacheds.run.dir="%INSTANCE_DIRECTORY%/run"
+wrapper.java.additional.5=-Dapacheds.instance="%INSTANCE%"
# Initial Java Heap Size (in MB)
#wrapper.java.initmemory=384
@@ -43,7 +43,7 @@ wrapper.java.additional.5=-Dapacheds.ins
#wrapper.java.maxmemory=384
# Application parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=%INSTANCE_DIRECTORY%
+wrapper.app.parameter.1="%INSTANCE_DIRECTORY%"
#********************************************************************
# Wrapper Logging Properties
@@ -77,4 +77,33 @@ wrapper.logfile.maxfiles=5
wrapper.syslog.loglevel=NONE
# Increasing the ping time out in order to let the server start
-wrapper.ping.timeout=240
\ No newline at end of file
+wrapper.ping.timeout=240
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+# using this configuration file has been installed as a service.
+# Please uninstall the service before modifying this section. The
+# service can then be reinstalled.
+
+# Title to use when running as a console
+wrapper.console.title=apacheds-%INSTANCE%
+
+# Name of the service
+wrapper.ntservice.name=apacheds-%INSTANCE%
+
+# Display name of the service
+wrapper.ntservice.displayname=ApacheDS - %INSTANCE%
+
+# Description of the service
+wrapper.ntservice.description=ApacheDS %INSTANCE% server instance
+
+# Service dependencies. Add dependencies as needed starting from 1
+#wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed. AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
\ No newline at end of file