From commits-return-27656-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Oct 01 14:17:05 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 75825 invoked from network); 1 Oct 2010 14:17:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Oct 2010 14:17:04 -0000 Received: (qmail 47453 invoked by uid 500); 1 Oct 2010 14:17:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 47397 invoked by uid 500); 1 Oct 2010 14:17:03 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 47390 invoked by uid 99); 1 Oct 2010 14:17:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Oct 2010 14:17:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Oct 2010 14:16:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E11323889DE; Fri, 1 Oct 2010 14:16:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Fri, 01 Oct 2010 14:16:38 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101001141638.8E11323889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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