Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 5350 invoked from network); 4 Oct 2010 12:47:09 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Oct 2010 12:47:09 -0000 Received: (qmail 74791 invoked by uid 500); 4 Oct 2010 12:47:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 74738 invoked by uid 500); 4 Oct 2010 12:47:07 -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 74731 invoked by uid 99); 4 Oct 2010 12:47:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Oct 2010 12:47:07 +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; Mon, 04 Oct 2010 12:47:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 45E882388A38; Mon, 4 Oct 2010 12:46:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1004221 - in /directory/apacheds/trunk/installers-maven-plugin: ./ src/main/java/org/apache/directory/server/installers/bin/ src/main/java/org/apache/directory/server/installers/deb/ src/main/java/org/apache/directory/server/installers/rpm/ Date: Mon, 04 Oct 2010 12:46:43 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101004124643.45E882388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Oct 4 12:46:42 2010 New Revision: 1004221 URL: http://svn.apache.org/viewvc?rev=1004221&view=rev Log: o Fixed the tests on the running OS. o Added documentation in pom.xml Modified: directory/apacheds/trunk/installers-maven-plugin/pom.xml directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java Modified: directory/apacheds/trunk/installers-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/pom.xml?rev=1004221&r1=1004220&r2=1004221&view=diff ============================================================================== --- directory/apacheds/trunk/installers-maven-plugin/pom.xml (original) +++ directory/apacheds/trunk/installers-maven-plugin/pom.xml Mon Oct 4 12:46:42 2010 @@ -72,6 +72,7 @@ org.apache.maven.plugins maven-dependency-plugin + unpack-config-file generate-resources Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java?rev=1004221&r1=1004220&r2=1004221&view=diff ============================================================================== --- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java (original) +++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java Mon Oct 4 12:46:42 2010 @@ -170,8 +170,8 @@ public class BinInstallerCommand extends } // Verifying the currently used OS to build the installer is Linux or Mac OS X - if ( !Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) ) - || !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( "os.name" ) ) ) + if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) ) || Target.OS_NAME_MAC_OS_X + .equalsIgnoreCase( System.getProperty( "os.name" ) ) ) ) { log.warn( "Bin package installer can only be built on a machine running Linux or Mac OS X!" ); log.warn( "The build will continue, generation of this target is skipped." ); Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java?rev=1004221&r1=1004220&r2=1004221&view=diff ============================================================================== --- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java (original) +++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java Mon Oct 4 12:46:42 2010 @@ -175,8 +175,8 @@ public class DebInstallerCommand extends } // Verifying the currently used OS to build the installer is Linux or Mac OS X - if ( !Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) ) - || !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( "os.name" ) ) ) + if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) ) || Target.OS_NAME_MAC_OS_X + .equalsIgnoreCase( System.getProperty( "os.name" ) ) ) ) { log.warn( "Deb package installer can only be built on a machine running Linux or Mac OS X!" ); log.warn( "The build will continue, generation of this target is skipped." ); Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java?rev=1004221&r1=1004220&r2=1004221&view=diff ============================================================================== --- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java (original) +++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java Mon Oct 4 12:46:42 2010 @@ -180,8 +180,8 @@ public class RpmInstallerCommand extends } // Verifying the currently used OS to build the installer is Linux or Mac OS X - if ( !Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) ) - || !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( "os.name" ) ) ) + if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) ) || Target.OS_NAME_MAC_OS_X + .equalsIgnoreCase( System.getProperty( "os.name" ) ) ) ) { log.warn( "Rpm package installer can only be built on a machine running Linux or Mac OS X!" ); log.warn( "The build will continue, generation of this target is skipped." );