directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1000917 - in /directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main: java/org/apache/directory/daemon/installers/macosxpkg/ java/org/apache/directory/daemon/installers/nsis/ resources/org/apache/directory/daemon/inst...
Date Fri, 24 Sep 2010 15:39:26 GMT
Author: pamarcelot
Date: Fri Sep 24 15:39:26 2010
New Revision: 1000917

URL: http://svn.apache.org/viewvc?rev=1000917&view=rev
Log:
Fixed the installer on Mac OS X.
Added a new properties which allows to add the needed double quotes in configuration files
on Windows, leaving other OSes without them.

Modified:
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.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/wrapper-installation.conf
    directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-instance.conf

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=1000917&r1=1000916&r2=1000917&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
Fri Sep 24 15:39:26 2010
@@ -294,6 +294,7 @@ public class MacOsXPkgInstallerCommand e
             + mojo.getProject().getVersion() + "/instances" );
         filterProperties.put( "user", "root" );
         filterProperties.put( "wrapper.java.command", "# wrapper.java.command=<path-to-java-executable>"
);
+        filterProperties.put( "double.quote", "" );
     }
 
 

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=1000917&r1=1000916&r2=1000917&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 15:39:26 2010
@@ -179,8 +179,8 @@ public class NsisInstallerCommand extend
         filterProperties.put( "finalname", target.getFinalName() );
         filterProperties.put( "installationFiles", INSTALLATION_FILES );
         filterProperties.put( "instancesFiles", "instancesFiles" );
-
         filterProperties.put( "wrapper.java.command", "wrapper.java.command=@java.home@\\bin\\java.exe"
);
+        filterProperties.put( "double.quote", "\"" );
     }
 
 

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=1000917&r1=1000916&r2=1000917&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 15:39:26 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=${double.quote}file:///%INSTANCE_DIRECTORY%/conf/log4j.properties${double.quote}
+wrapper.java.additional.2=-Dapacheds.var.dir=${double.quote}%INSTANCE_DIRECTORY%${double.quote}
+wrapper.java.additional.3=-Dapacheds.log.dir=${double.quote}%INSTANCE_DIRECTORY%/log${double.quote}
+wrapper.java.additional.4=-Dapacheds.run.dir=${double.quote}%INSTANCE_DIRECTORY%/run${double.quote}
+wrapper.java.additional.5=-Dapacheds.instance=${double.quote}%INSTANCE%${double.quote}
 
 # 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=${double.quote}%INSTANCE_DIRECTORY%${double.quote}
 
 #********************************************************************
 # Wrapper Logging Properties

Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-instance.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-instance.conf?rev=1000917&r1=1000916&r2=1000917&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-instance.conf
(original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-instance.conf
Fri Sep 24 15:39:26 2010
@@ -27,17 +27,14 @@
 #
 # Common overrides shown commented below
 
-
 #include @installation.directory@/conf/wrapper.conf
 
 # Override the JRE used
-# wrapper.java.command=%JAVA_HOME%/bin/java
+# wrapper.java.command=<path-to-java-executable>
 
 # Override the JVM memory settings
 # Initial Java Heap Size (in MB)
 # wrapper.java.initmemory=384
 
 # Maximum Java Heap Size (in MB)
-# wrapper.java.maxmemory=384
-
-# apacheds.instance.start=auto
\ No newline at end of file
+# wrapper.java.maxmemory=384
\ No newline at end of file



Mime
View raw message