Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 89857 invoked from network); 20 Apr 2007 00:44:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Apr 2007 00:44:56 -0000 Received: (qmail 93710 invoked by uid 500); 20 Apr 2007 00:45:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 93685 invoked by uid 500); 20 Apr 2007 00:45:02 -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 93674 invoked by uid 99); 20 Apr 2007 00:45:02 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2007 17:45:02 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2007 17:44:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A561D1A9838; Thu, 19 Apr 2007 17:44:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r530594 - in /directory/daemon/branches/1.0/plugin/src/main: java/org/apache/directory/daemon/installers/CreateImageCommand.java resources/org/apache/directory/daemon/installers/jsvc_linux_x86_64 Date: Fri, 20 Apr 2007 00:44:35 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070420004435.A561D1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Thu Apr 19 17:44:34 2007 New Revision: 530594 URL: http://svn.apache.org/viewvc?view=rev&rev=530594 Log: adding support to generate an installer with jsvc compiled for x86_64: fix for DIRSERVER-751 Added: directory/daemon/branches/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_x86_64 - copied unchanged from r530593, directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_x86_64 Modified: directory/daemon/branches/1.0/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Modified: directory/daemon/branches/1.0/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java URL: http://svn.apache.org/viewvc/directory/daemon/branches/1.0/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?view=diff&rev=530594&r1=530593&r2=530594 ============================================================================== --- directory/daemon/branches/1.0/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original) +++ directory/daemon/branches/1.0/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Thu Apr 19 17:44:34 2007 @@ -287,6 +287,21 @@ } } + // now copy over the jsvc executable renaming it to the applicationName + if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64" ) ) + { + File executable = new File( layout.getBinDirectory(), target.getApplication().getName() ); + try + { + MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_linux_x86_64" ), executable ); + } + catch ( IOException e ) + { + throw new MojoFailureException( "Failed to copy jsvc executable file " + + getClass().getResource( "jsvc_linux_x86_64" ) + " into position " + executable.getAbsolutePath() ); + } + } + // now copy over the jsvc executable renaming it to the mymojo.getApplicationName() if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "sparc" ) ) {