svn commit: r674770 - in /directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers: bin/BinInstallerCommand.java deb/DebInstallerCommand.java macosxpkg/MacOsXPkgInstallerCommand.java solarispkg/SolarisPkgInstallerCommand.java

[pa...@apache.org]

Author: pamarcelot
Date: Tue Jul  8 04:27:48 2008
New Revision: 674770

URL: http://svn.apache.org/viewvc?rev=674770&view=rev
Log:
o Fix for DIRSERVER-1112 (ApacheDS installer creates redundant server.xml file).
o Fixed a bug in the Windows Installer which caused the user to be asked if he wants to launch the default instance even if he has chosen to not install a default instance.

Modified:
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java?rev=674770&r1=674769&r2=674770&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java Tue Jul  8 04:27:48 2008
@@ -164,6 +164,9 @@
                 new File( binShDirectory, "install.sh" ), false );
             MojoHelperUtils.copyAsciiFile( mymojo, 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 )
         {

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java?rev=674770&r1=674769&r2=674770&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java Tue Jul  8 04:27:48 2008
@@ -158,6 +158,9 @@
             MojoHelperUtils
                 .copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream( "apacheds-init" ), new File(
                     debEtcInitdDirectory, "apacheds-" + target.getApplication().getVersion() + "-default" ), true );
+
+            // Removing the redundant server.xml file (see DIRSERVER-1112)
+            new File( debApacheDsHomeDirectory, "conf/server.xml" ).delete();
         }
         catch ( IOException e )
         {

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=674770&r1=674769&r2=674770&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java Tue Jul  8 04:27:48 2008
@@ -179,6 +179,8 @@
                 "org.apache.directory.server.plist" ), new File( pkgRootLibraryLaunchDaemons,
                 "org.apache.directory.server.plist" ), true );
 
+            // Removing the redundant server.xml file (see DIRSERVER-1112)
+            new File( pkgRootUsrLocalApachedsDirectory, "conf/server.xml" ).delete();
         }
         catch ( IOException e )
         {

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java?rev=674770&r1=674769&r2=674770&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java Tue Jul  8 04:27:48 2008
@@ -176,6 +176,9 @@
             // Copying the init script in /etc/init.d/
             MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, getClass().getResourceAsStream( "apacheds-init" ),
                 new File( etcInitdDirectory, "apacheds-" + target.getApplication().getVersion() + "-default" ), true );
+
+            // Removing the redundant server.xml file (see DIRSERVER-1112)
+            new File( apacheDsHomeDirectory, "conf/server.xml" ).delete();
         }
         catch ( IOException e )
         {