svn commit: r1003544 - in /directory/apacheds/trunk/installers-maven-plugin/src/main: java/org/apache/directory/server/installers/ resources/org/apache/directory/server/installers/bin/ resources/org/apache/directory/server/installers/rpm/

[pa...@apache.org]

Author: pamarcelot
Date: Fri Oct  1 14:16:38 2010
New Revision: 1003544

URL: http://svn.apache.org/viewvc?rev=1003544&view=rev
Log:
Integrated the use of the 'config.ldif' default config file in all installers.

Modified:
    directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/rpm/apacheds.spec

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java?rev=1003544&r1=1003543&r2=1003544&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java Fri Oct  1 14:16:38 2010
@@ -211,6 +211,11 @@ public abstract class AbstractMojoComman
         MojoHelperUtils.copyAsciiFile( mojo, filterProperties,
                 getClass().getResourceAsStream( "/org/apache/directory/server/installers/wrapper-instance.conf" ),
                 new File( instanceLayout.getConfDirectory(), "wrapper.conf" ), true );
+
+        // Copying ApacheDS LDIF configuration file
+        MojoHelperUtils.copyAsciiFile( mojo, filterProperties,
+                getClass().getResourceAsStream( "/org/apache/directory/server/installers/config.ldif" ),
+                new File( instanceLayout.getConfDirectory(), "config.ldif" ), false );
     }
 
 

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh?rev=1003544&r1=1003543&r2=1003544&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/bin/install.sh Fri Oct  1 14:16:38 2010
@@ -90,10 +90,12 @@ mv ../instance/wrapper.conf.tmp ../insta
 verifyExitCode
 
 # Copying the default instance files
-cp ../instance/wrapper.conf $DEFAULT_INSTANCE_HOME_DIRECTORY/conf/
+cp ../instance/config.ldif $DEFAULT_INSTANCE_HOME_DIRECTORY/conf/
 verifyExitCode
 cp ../instance/log4j.properties $DEFAULT_INSTANCE_HOME_DIRECTORY/conf/
 verifyExitCode
+cp ../instance/wrapper.conf $DEFAULT_INSTANCE_HOME_DIRECTORY/conf/
+verifyExitCode
 
 # Filtering and copying the init.d script
 sed -e "s;@installation.directory@;${APACHEDS_HOME_DIRECTORY};" ../instance/etc-initd-script > ../instance/etc-initd-script.tmp

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/rpm/apacheds.spec
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/rpm/apacheds.spec?rev=1003544&r1=1003543&r2=1003544&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/rpm/apacheds.spec (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/rpm/apacheds.spec Fri Oct  1 14:16:38 2010
@@ -58,8 +58,9 @@ install -m 644 ${build.dir}/%{name}-%{ve
 ${install.libs}
 
 # Instance files
-install -m 644 ${build.dir}/%{name}-%{version}/instances/default/conf/wrapper.conf $RPM_BUILD_ROOT%{adsdata}/default/conf/wrapper.conf
+install -m 644 ${build.dir}/%{name}-%{version}/instances/default/conf/config.ldif $RPM_BUILD_ROOT%{adsdata}/default/conf/config.ldif
 install -m 644 ${build.dir}/%{name}-%{version}/instances/default/conf/log4j.properties $RPM_BUILD_ROOT%{adsdata}/default/conf/log4j.properties
+install -m 644 ${build.dir}/%{name}-%{version}/instances/default/conf/wrapper.conf $RPM_BUILD_ROOT%{adsdata}/default/conf/wrapper.conf
 
 # Init script
 install -m 755 ${build.dir}/%{name}-%{version}/etc-initd-script $RPM_BUILD_ROOT/etc/init.d/apacheds-%{version}-default
@@ -93,5 +94,6 @@ ${files.libs}
 %{adsdata}/default/log
 %{adsdata}/default/partitions
 %{adsdata}/default/run
+%config %{adsdata}/default/conf/config.ldif
 %config %{adsdata}/default/conf/log4j.properties
 %config %{adsdata}/default/conf/wrapper.conf