You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/09/22 17:07:27 UTC
svn commit: r1000024 [1/3] - in
/directory/apacheds/branches/apacheds-apacheds-2.0: apacheds-installers/
apacheds-installers/src/main/installers/
installers-plugin/src/main/java/org/apache/directory/daemon/installers/
installers-plugin/src/main/java/or...
Author: pamarcelot
Date: Wed Sep 22 15:07:26 2010
New Revision: 1000024
URL: http://svn.apache.org/viewvc?rev=1000024&view=rev
Log:
Fixed the generation of the Mac OS X installer for Apache DS.
Added:
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/LICENSE
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/NOTICE
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/apacheds.init
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/log4j.properties
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-installation.conf
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper-instance.conf
Removed:
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/LICENSE.txt
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_i386
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_linux_x86_64
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_macosx_i386
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_macosx_ppc
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_i386
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/jsvc_solaris_sparc
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/logo.ico
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/prunmgr.exe
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/prunsrv.exe
Modified:
directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml
directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/src/main/installers/apacheds-server-win.nsi
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/GenerateMojo.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveTarget.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/macosxpkg/MacOsXPkgTarget.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisTarget.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/solarispkg/SolarisPkgInstallerCommand.java
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds-usr-bin.sh
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/org.apache.directory.server.plist
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/postflight
directory/apacheds/branches/apacheds-apacheds-2.0/service/src/main/java/org/apache/directory/server/ApacheDsService.java
directory/apacheds/branches/apacheds-apacheds-2.0/service/src/main/java/org/apache/directory/server/UberjarMain.java
directory/apacheds/branches/apacheds-apacheds-2.0/wrapper/src/main/java/org/apache/directory/server/ApacheDsTanukiWrapper.java
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml Wed Sep 22 15:07:26 2010
@@ -26,7 +26,7 @@
</parent>
<artifactId>apacheds-installers</artifactId>
<name>ApacheDS Installers</name>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<description>
Generates installers for ApacheDS
@@ -40,15 +40,10 @@
</dependency>
<dependency>
- <groupId>tanukisoft</groupId>
- <artifactId>wrapper</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-server-tools</artifactId>
+ <artifactId>apacheds-wrapper</artifactId>
</dependency>
+
</dependencies>
<profiles>
@@ -61,300 +56,16 @@
<groupId>${project.groupId}</groupId>
<artifactId>installers-plugin</artifactId>
<configuration>
- <excludes>
-
- <!-- apacheds-tools.jar does not get put in lib directory -->
- <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
-
- <exclude>ant:ant</exclude>
- <exclude>aopalliance:aopalliance</exclude>
- <exclude>xerces:xerces</exclude>
- <!--exclude>commons-pool:commons-pool</exclude-->
- <exclude>xml-apis:xml-apis</exclude>
- <exclude>aspectwerkz:aspectwerkz-core</exclude>
- <exclude>velocity:velocity</exclude>
- <exclude>qdox:qdox</exclude>
- <exclude>oro:oro</exclude>
- <exclude>commons-attributes:commons-attributes-compiler</exclude>
- <exclude>commons-attributes:commons-attributes-api</exclude>
- <exclude>cglib:cglib</exclude>
- <exclude>velocity:velocity-dep</exclude>
- <exclude>com.jamonapi:jamon</exclude>
- <exclude>asm:asm</exclude>
- <exclude>freemarker:freemarker</exclude>
- <exclude>asm:asm-util</exclude>
- <exclude>jasperreports:jasperreports</exclude>
- </excludes>
-
- <application>
- <name>apacheds</name>
- <icon>src/main/resources/feather.ico</icon>
- <version>${server.version}</version>
- <copyrightYear>2007</copyrightYear>
- <minimumJavaVersion>1.5</minimumJavaVersion>
- <url>http://directory.apache.org</url>
- <email>users@directory.apache.org</email>
- <description>Apache Directory Server</description>
- <license>target/classes/META-INF/LICENSE</license>
- <authors>
- <author>Apache Directory Team</author>
- <author>akarasulu@apache.org</author>
- <author>ckoppelt@apache.org</author>
- <author>elecharny@apache.org</author>
- <author>erodriguez@apache.org</author>
- <author>ersiner@apache.org</author>
- <author>oersoy@apache.org</author>
- <author>pamarcelot@apache.org</author>
- <author>szoerner@apache.org</author>
- <author>seelmann@apache.org</author>
- <author>trustin@apache.org</author>
- </authors>
- </application>
- <packagedFiles>
- <packagedFile>
- <source>org.apache.directory.server:apacheds-server-tools</source>
- <destinationPath>bin/apacheds-tools.jar</destinationPath>
- <dependency>true</dependency>
- <installationBundleId>Binaries</installationBundleId>
- </packagedFile>
- <packagedFile>
- <source>target/classes/META-INF/NOTICE</source>
- <destinationPath>NOTICE</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- </packagedFiles>
- <applicationClass>
- org.apache.ldap.server.Service
- </applicationClass>
-
- <!-- Targets for Linux .rpm installer package -->
- <rpmTargets>
- <rpmTarget>
- <packagedFiles>
- <packagedFile>
- <source>rpm-apacheds-tools.sh</source>
- <destinationPath>bin/apacheds-tools.sh</destinationPath>
- <installationBundleId>Binaries</installationBundleId>
- <executable>true</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-fhs.conf</source>
- <destinationPath>conf/apacheds.conf</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-sysconfig.conf</source>
- <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-default.conf</source>
- <destinationPath>conf/apacheds-default.conf</destinationPath>
- <executable>false</executable>
- <filtered>false</filtered>
- </packagedFile>
- <packagedFile>
- <source>../resources/adstree.ico</source>
- <destinationPath>logo.ico</destinationPath>
- <executable>false</executable>
- <filtered>false</filtered>
- </packagedFile>
- </packagedFiles>
- <id>apacheds-i386-rpm</id>
- <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
- <rpmTopDir>target/rpmbuild</rpmTopDir>
- <finalName>apacheds-${server.version}-i386.rpm</finalName>
- <osName>Linux</osName>
- <osFamily>unix</osFamily>
- <osArch>i386</osArch>
- <daemonFramework>tanuki</daemonFramework>
- <scriptFile>src/main/installers/apacheds-init</scriptFile>
- <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
- </rpmTarget>
- <rpmTarget>
- <packagedFiles>
- <packagedFile>
- <source>rpm-apacheds-tools.sh</source>
- <destinationPath>bin/apacheds-tools.sh</destinationPath>
- <installationBundleId>Binaries</installationBundleId>
- <executable>true</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-fhs.conf</source>
- <destinationPath>conf/apacheds.conf</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-sysconfig.conf</source>
- <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-default.conf</source>
- <destinationPath>conf/apacheds-default.conf</destinationPath>
- <executable>false</executable>
- <filtered>false</filtered>
- </packagedFile>
- <packagedFile>
- <source>../resources/adstree.ico</source>
- <destinationPath>logo.ico</destinationPath>
- <executable>false</executable>
- <filtered>false</filtered>
- </packagedFile>
- </packagedFiles>
- <id>apacheds-x86_64-rpm</id>
- <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
- <rpmTopDir>target/rpmbuild</rpmTopDir>
- <finalName>apacheds-${server.version}-x86_64.rpm</finalName>
- <osName>Linux</osName>
- <osFamily>unix</osFamily>
- <osArch>x86_64</osArch>
- <daemonFramework>tanuki</daemonFramework>
- <scriptFile>src/main/installers/apacheds-init</scriptFile>
- <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
- </rpmTarget>
- </rpmTargets>
-
- <!-- Targets for Windows .exe installer package -->
- <nsisTargets>
- <nsisTarget>
- <packagedFiles>
- <packagedFile>
- <source>apacheds.conf</source>
- <destinationPath>conf/apacheds.conf</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>apacheds-default.conf</source>
- <destinationPath>conf/apacheds-default.conf</destinationPath>
- <executable>false</executable>
- <filtered>true</filtered>
- </packagedFile>
- <packagedFile>
- <source>../resources/server-installer.ico</source>
- <destinationPath>server-installer.ico</destinationPath>
- <executable>false</executable>
- <filtered>false</filtered>
- </packagedFile>
- <packagedFile>
- <source>../resources/example.ldif</source>
- <destinationPath>conf/example.ldif</destinationPath>
- <executable>false</executable>
- <filtered>false</filtered>
- </packagedFile>
- </packagedFiles>
-
- <id>server-win32</id>
- <nsisCompiler>/usr/bin/makensis</nsisCompiler>
- <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
- <finalName>apacheds-${server.version}-setup</finalName>
- <osName>Windows XP</osName>
- <osFamily>windows</osFamily>
- <osVersion>5.1</osVersion>
- <osArch>x86</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </nsisTarget>
- </nsisTargets>
<!-- Targets for Mac OS X .pkg installer package -->
<macOsXPkgTargets>
<macOsXPkgTarget>
<id>apacheds-macosx</id>
- <finalName>apacheds-${server.version}.dmg</finalName>
+ <finalName>apacheds-${version}.dmg</finalName>
<osName>Mac OS X</osName>
- <osFamily>macosx</osFamily>
<osArch>x86</osArch>
- <daemonFramework>tanuki</daemonFramework>
</macOsXPkgTarget>
</macOsXPkgTargets>
-
- <!-- Targets for Solaris .pkg installer package -->
- <solarisPkgTargets>
- <solarisPkgTarget>
- <id>apacheds-solaris-x86</id>
- <finalName>apacheds-${server.version}-solaris-x86.pkg</finalName>
- <osName>solaris</osName>
- <osArch>x86</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </solarisPkgTarget>
- <solarisPkgTarget>
- <id>apacheds-solaris-sparc</id>
- <finalName>apacheds-${server.version}-solaris-sparc.pkg</finalName>
- <osName>solaris</osName>
- <osArch>sparc</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </solarisPkgTarget>
- </solarisPkgTargets>
-
- <!-- Targets for Debian .deb installer package -->
- <debTargets>
- <debTarget>
- <id>apacheds-debian-i386</id>
- <finalName>apacheds-${server.version}-i386.deb</finalName>
- <osName>linux</osName>
- <osFamily>linux</osFamily>
- <osArch>i386</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </debTarget>
- <debTarget>
- <id>apacheds-debian-amd64</id>
- <finalName>apacheds-${server.version}-amd64.deb</finalName>
- <osName>linux</osName>
- <osFamily>linux</osFamily>
- <osArch>amd64</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </debTarget>
- </debTargets>
-
- <!-- Targets for Linux Binary .bin installer -->
- <binTargets>
- <binTarget>
- <id>apacheds-bin-installer-i386</id>
- <finalName>apacheds-${server.version}-i386.bin</finalName>
- <osName>Linux</osName>
- <osFamily>linux</osFamily>
- <osArch>i386</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </binTarget>
- <binTarget>
- <id>apacheds-bin-installer-x86_64</id>
- <finalName>apacheds-${server.version}-x86_64.bin</finalName>
- <osName>Linux</osName>
- <osFamily>linux</osFamily>
- <osArch>x86_64</osArch>
- <daemonFramework>tanuki</daemonFramework>
- </binTarget>
- </binTargets>
-
- <!-- Targets for Archive installer -->
- <archiveTargets>
- <archiveTarget>
- <id>apacheds-archive-zip</id>
- <osName>any</osName>
- <osFamily>any</osFamily>
- <osArch>any</osArch>
- <daemonFramework>any</daemonFramework>
- <finalName>apacheds-${server.version}.zip</finalName>
- <archiveType>zip</archiveType>
- </archiveTarget>
- <archiveTarget>
- <id>apacheds-archive-tar.gz</id>
- <osName>any</osName>
- <osFamily>any</osFamily>
- <osArch>any</osArch>
- <daemonFramework>any</daemonFramework>
- <finalName>apacheds-${server.version}.tar.gz</finalName>
- <archiveType>tar.gz</archiveType>
- </archiveTarget>
- </archiveTargets>
</configuration>
<executions>
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/src/main/installers/apacheds-server-win.nsi?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/src/main/installers/apacheds-server-win.nsi (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/src/main/installers/apacheds-server-win.nsi Wed Sep 22 15:07:26 2010
@@ -73,7 +73,7 @@ XPStyle on
; License page
!insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE "server-win32\LICENSE"
+ ;!insertmacro MUI_PAGE_LICENSE "server-win32\LICENSE"
; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install JRE
; Otherwise you won't see it.
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java Wed Sep 22 15:07:26 2010
@@ -44,7 +44,7 @@ public abstract class AbstractMojoComman
{
protected GenerateMojo mojo;
protected T target;
-
+
protected Map<String, Artifact> dependencyMap;
protected Log log;
@@ -58,8 +58,8 @@ public abstract class AbstractMojoComman
public AbstractMojoCommand( GenerateMojo mojo, T target )
{
this.mojo = mojo;
- this.target= target;
-
+ this.target = target;
+
log = mojo.getLog();
dependencyMap = new HashMap<String, Artifact>();
@@ -141,77 +141,79 @@ public abstract class AbstractMojoComman
if ( packagedFiles[ii].isExpandable() )
{
- File dest = new File( target.getLayout().getInstallationDirectory(),
- packagedFiles[ii].getDestinationPath() );
- if ( !dest.exists() )
- {
- dest.mkdirs();
- }
-
- String fileExtension = source.getName().substring( source.getName().lastIndexOf( '.' ) );
- if ( fileExtension.equalsIgnoreCase( ".jar" ) || fileExtension.equalsIgnoreCase( ".zip" )
- || fileExtension.equalsIgnoreCase( ".war" ) || fileExtension.equalsIgnoreCase( ".sar" ) )
- {
- log.info( "\t\t\t ... expanding " + source + "\n\t\t\t => to " + dest );
- Expand expand = new Expand();
- expand.setSrc( source );
- expand.setOverwrite( true );
- expand.setDest( dest );
- try
- {
- expand.execute();
- continue;
- }
- catch ( Exception e )
- {
- throw new MojoFailureException( "Failed to expaned packagedFile " + source + ": "
- + e.getMessage() );
- }
- }
+ // TODO FIXME
+ // File dest = new File( target.getLayout().getInstallationDirectory(),
+ // packagedFiles[ii].getDestinationPath() );
+ // if ( !dest.exists() )
+ // {
+ // dest.mkdirs();
+ // }
+ //
+ // String fileExtension = source.getName().substring( source.getName().lastIndexOf( '.' ) );
+ // if ( fileExtension.equalsIgnoreCase( ".jar" ) || fileExtension.equalsIgnoreCase( ".zip" )
+ // || fileExtension.equalsIgnoreCase( ".war" ) || fileExtension.equalsIgnoreCase( ".sar" ) )
+ // {
+ // log.info( "\t\t\t ... expanding " + source + "\n\t\t\t => to " + dest );
+ // Expand expand = new Expand();
+ // expand.setSrc( source );
+ // expand.setOverwrite( true );
+ // expand.setDest( dest );
+ // try
+ // {
+ // expand.execute();
+ // continue;
+ // }
+ // catch ( Exception e )
+ // {
+ // throw new MojoFailureException( "Failed to expaned packagedFile " + source + ": "
+ // + e.getMessage() );
+ // }
+ // }
throw new MojoFailureException( "Failed to expand packagedFile: " + source
+ ". It does not have a jar, war or zip extension" );
}
- File dest = new File( target.getLayout().getInstallationDirectory(),
- packagedFiles[ii].getDestinationPath() );
-
- if ( packagedFiles[ii].isDirectory() )
- {
- try
- {
- FileUtils.copyDirectoryStructure( source, dest );
- }
- catch ( IOException e )
- {
- throw new MojoFailureException( "Failed to copy packagedFile [directory=true] from source "
- + source + " to destination " + dest );
- }
- continue;
- }
- else if ( packagedFiles[ii].isFiltered() )
- {
- try
- {
- MojoHelperUtils.copyAsciiFile( mojo, getFilterProperties(), source, dest, true );
- }
- catch ( IOException e )
- {
- throw new MojoFailureException( "Failed to copy packagedFile from source " + source +
- " to destination " + dest );
- }
- continue;
- }
-
- try
- {
- FileUtils.copyFile( source, dest );
- }
- catch ( IOException e )
- {
- throw new MojoFailureException( "Failed to copy packagedFile from source " + source +
- " to destination " + dest );
- }
+ // TODO FIXME
+ // File dest = new File( target.getLayout().getInstallationDirectory(),
+ // packagedFiles[ii].getDestinationPath() );
+ //
+ // if ( packagedFiles[ii].isDirectory() )
+ // {
+ // try
+ // {
+ // FileUtils.copyDirectoryStructure( source, dest );
+ // }
+ // catch ( IOException e )
+ // {
+ // throw new MojoFailureException( "Failed to copy packagedFile [directory=true] from source "
+ // + source + " to destination " + dest );
+ // }
+ // continue;
+ // }
+ // else if ( packagedFiles[ii].isFiltered() )
+ // {
+ // try
+ // {
+ // MojoHelperUtils.copyAsciiFile( mojo, getFilterProperties(), source, dest, true );
+ // }
+ // catch ( IOException e )
+ // {
+ // throw new MojoFailureException( "Failed to copy packagedFile from source " + source +
+ // " to destination " + dest );
+ // }
+ // continue;
+ // }
+ //
+ // try
+ // {
+ // FileUtils.copyFile( source, dest );
+ // }
+ // catch ( IOException e )
+ // {
+ // throw new MojoFailureException( "Failed to copy packagedFile from source " + source +
+ // " to destination " + dest );
+ // }
}
catch ( Exception e )
{
@@ -219,4 +221,16 @@ public abstract class AbstractMojoComman
}
}
}
+
+
+ /**
+ * Gets the directory associated with the target.
+ *
+ * @return
+ * the directory associated with the target
+ */
+ protected File getTargetDirectory()
+ {
+ return new File( mojo.getOutputDirectory(), target.getId() );
+ }
}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Wed Sep 22 15:07:26 2010
@@ -67,7 +67,6 @@ public class CreateImageCommand extends
log.info( "Creating image ... " );
File dir = new File( mojo.getOutputDirectory(), target.getId() );
layout = new InstallationLayout( dir );
- target.setLayout( layout );
layout.mkdirs();
// TODO FIXME
@@ -225,8 +224,7 @@ public class CreateImageCommand extends
// -------------------------------------------------------------------
// LINUX I386
- if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "i386" )
- && target.getDaemonFramework().equals( "tanuki" ) )
+ if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "i386" ) )
{
try
{
@@ -243,8 +241,7 @@ public class CreateImageCommand extends
// LINUX X86_64 (AMD64)
if ( target.getOsName().equals( "linux" )
- && ( target.getOsArch().equals( "x86_64" ) || target.getOsArch().equals( "amd64" ) )
- && target.getDaemonFramework().equals( "tanuki" ) )
+ && ( target.getOsArch().equals( "x86_64" ) || target.getOsArch().equals( "amd64" ) ) )
{
try
{
@@ -260,7 +257,7 @@ public class CreateImageCommand extends
}
// MAC OS X
- if ( target.getOsName().equalsIgnoreCase( "mac os x" ) && target.getDaemonFramework().equals( "tanuki" ) )
+ if ( target.getOsName().equalsIgnoreCase( "Mac OS X" ) )
{
try
{
@@ -277,8 +274,7 @@ public class CreateImageCommand extends
}
// SOLARIS X86
- if ( target.getOsName().equalsIgnoreCase( "solaris" ) && target.getOsArch().equals( "x86" )
- && target.getDaemonFramework().equals( "tanuki" ) )
+ if ( target.getOsName().equalsIgnoreCase( "solaris" ) && target.getOsArch().equals( "x86" ) )
{
try
{
@@ -295,8 +291,7 @@ public class CreateImageCommand extends
}
// SOLARIS SPARC
- if ( target.getOsName().equalsIgnoreCase( "solaris" ) && target.getOsArch().equals( "sparc" )
- && target.getDaemonFramework().equals( "tanuki" ) )
+ if ( target.getOsName().equalsIgnoreCase( "solaris" ) && target.getOsArch().equals( "sparc" ) )
{
try
{
@@ -312,51 +307,7 @@ public class CreateImageCommand extends
}
}
- // now copy over the jsvc executable renaming it to the mojo.getApplicationName()
- if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "sparc" ) )
- {
- File executable = new File( layout.getBinDirectory(), "wrapper" );
- try
- {
- MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc" ), executable );
- }
- catch ( IOException e )
- {
- throw new MojoFailureException( "Failed to copy jsvc executable file "
- + getClass().getResource( "jsvc_solaris_sparc" ) + " into position " + executable.getAbsolutePath() );
- }
- }
-
- if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "i386" ) )
- {
- File executable = new File( layout.getBinDirectory(), "wrapper" );
- try
- {
- MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_i386" ), executable );
- }
- catch ( IOException e )
- {
- throw new MojoFailureException( "Failed to copy jsvc executable file "
- + getClass().getResource( "jsvc_solaris_i386" ) + " into position " + executable.getAbsolutePath() );
- }
- }
-
- // now copy over the jsvc executable renaming it to the mojo.getApplicationName()
- // if ( target.getOsName().equals( "macosx" ) && target.getOsArch().equals( "ppc" ) )
- // {
- // File executable = new File( layout.getBinDirectory(), target.getApplication().getName() );
- // try
- // {
- // MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_macosx_ppc" ), executable );
- // }
- // catch ( IOException e )
- // {
- // throw new MojoFailureException( "Failed to copy jsvc executable file "
- // + getClass().getResource( "jsvc_macosx_ppc" ) + " into position " + executable.getAbsolutePath() );
- // }
- // }
-
- target.setLibArtifacts( MojoHelperUtils.copyDependencies( mojo, layout ) );
+ // target.setLibArtifacts( MojoHelperUtils.copyDependencies( mojo, layout ) );
// -- if present copy the NOTICE.txt file --
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/GenerateMojo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/GenerateMojo.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/GenerateMojo.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/GenerateMojo.java Wed Sep 22 15:07:26 2010
@@ -41,6 +41,12 @@ import org.apache.directory.daemon.insta
import org.apache.directory.daemon.installers.solarispkg.SolarisPkgInstallerCommand;
import org.apache.directory.daemon.installers.solarispkg.SolarisPkgTarget;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.factory.DefaultArtifactFactory;
+import org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -185,9 +191,11 @@ public class GenerateMojo extends Abstra
// generate installers for all targets
for ( Target target : allTargets )
{
+ getLog().info( "Executing target '" + target.getId() + '"' );
+
// create the installation image first
- CreateImageCommand imgCmd = new CreateImageCommand( this, target );
- imgCmd.execute();
+// CreateImageCommand imgCmd = new CreateImageCommand( this, target );
+// imgCmd.execute();
// ---------------------------------------------------------------
// Generate all installers
@@ -401,26 +409,26 @@ public class GenerateMojo extends Abstra
// {
// target.setApplication( this.application );
// }
-
- if ( target.getLoggerConfigurationFile() == null )
- {
- target.setLoggerConfigurationFile( new File( sourceDirectory, "log4j.properties" ) );
- }
-
- if ( target.getBootstrapperConfigurationFile() == null )
- {
- target.setBootstrapperConfigurationFile( new File( sourceDirectory, "bootstrapper.properties" ) );
- }
-
- if ( target.getServerConfigurationFile() == null )
- {
- target.setServerConfigurationFile( new File( sourceDirectory, "server.xml" ) );
- }
-
- if ( target.getOsVersion() == null )
- {
- target.setOsVersion( "*" );
- }
+ //
+ // if ( target.getLoggerConfigurationFile() == null )
+ // {
+ // target.setLoggerConfigurationFile( new File( sourceDirectory, "log4j.properties" ) );
+ // }
+ //
+ // if ( target.getBootstrapperConfigurationFile() == null )
+ // {
+ // target.setBootstrapperConfigurationFile( new File( sourceDirectory, "bootstrapper.properties" ) );
+ // }
+ //
+ // if ( target.getServerConfigurationFile() == null )
+ // {
+ // target.setServerConfigurationFile( new File( sourceDirectory, "server.xml" ) );
+ // }
+ //
+ // if ( target.getOsVersion() == null )
+ // {
+ // target.setOsVersion( "*" );
+ // }
}
}
@@ -496,11 +504,6 @@ public class GenerateMojo extends Abstra
getLog().info( "id: " + target.getId() );
getLog().info( "osName: " + target.getOsName() );
getLog().info( "osArch: " + target.getOsArch() );
- getLog().info( "osVersion: " + target.getOsVersion() );
- getLog().info( "daemonFramework: " + target.getDaemonFramework() );
- getLog().info( "loggerConfigurationFile: " + target.getLoggerConfigurationFile() );
- getLog().info( "bootstrapperConfigurationFiles: " + target.getBootstrapperConfigurationFile() );
- getLog().info( "serverConfigurationFile: " + target.getServerConfigurationFile() );
}
}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java Wed Sep 22 15:07:26 2010
@@ -134,6 +134,8 @@ public class MojoHelperUtils
artifact = ( Artifact ) artifacts.next();
String key = artifact.getGroupId() + ":" + artifact.getArtifactId();
+ mymojo.getLog().info( "artifact=> " + key );
+
if ( artifact.equals( mymojo.getBootstrapper() ) )
{
rejects.add( key );
@@ -144,7 +146,7 @@ public class MojoHelperUtils
}
else
{
- if ( mymojo.getExcludes().contains( key ) )
+ if ( ( mymojo.getExcludes() != null ) && ( mymojo.getExcludes().contains( key ) ) )
{
rejects.add( key );
continue;
@@ -164,7 +166,7 @@ public class MojoHelperUtils
}
}
- if ( !mymojo.getExcludes().isEmpty() )
+ if ( ( mymojo.getExcludes() != null ) && ( !mymojo.getExcludes().isEmpty() ) )
{
mymojo.getLog().info( "" );
mymojo.getLog().info( " Excluded artifacts: " );
@@ -196,7 +198,7 @@ public class MojoHelperUtils
String cmdString = " ";
for ( int ii = 0; ii < cmd.length; ii++ )
{
- System.out.println( "cmd[" + ii + "] = " + cmd[ii] );
+ // System.out.println( "cmd[" + ii + "] = " + cmd[ii] ); // TODO
cmdString += cmd[ii] + " ";
}
@@ -209,7 +211,7 @@ public class MojoHelperUtils
String cmdString = " ";
for ( int ii = 0; ii < cmd.length; ii++ )
{
- System.out.println( "cmd[" + ii + "] = " + cmd[ii] );
+ // System.out.println( "cmd[" + ii + "] = " + cmd[ii] ); // TODO
cmdString += cmd[ii] + " ";
}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java Wed Sep 22 15:07:26 2010
@@ -20,13 +20,6 @@
package org.apache.directory.daemon.installers;
-import java.io.File;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.directory.server.InstallationLayout;
-
-
/**
* The superclass for all installer targets.
*
@@ -34,66 +27,48 @@ import org.apache.directory.server.Insta
*/
public class Target
{
- /**
- * Possible values:<br />
- * <ul>
- * <li>dos</li>
- * <li>mac</li>
- * <li>netware</li>
- * <li>os/2</li>
- * <li>tandem</li>
- * <li>unix</li>
- * <li>windows</li>
- * <li>win9x</li>
- * <li>z/os</li>
- * <li>os/400</li>
- * </ul>
- */
- public final static String[] OS_FAMILIES = new String[]
- { "dos", "mac", "netware", "os/2", "tandem", "unix", "windows", "win9x", "z/os", "os/400" };
- public final static String[] OPERATING_SYSTEMS = new String[]
- { "Linux", "SunOS", "Windows", "Mac OS X" };
- public final static String[] ARCHITECTURES = new String[]
- { "intel", "sparc", "ppc" };
- public final static String[] DAEMON_FRAMEWORKS = new String[]
- { "jsvc", "procrun", "tanuki" };
+ /** The OS name for 'Linux' */
+ public static final String OS_NAME_LINUX = "Linux";
+ /** The OS name for 'Mac OS X' */
+ public static final String OS_NAME_MAC_OS_X = "Mac OS X";
+ /** The OS name for 'Solaris' */
+ public static final String OS_NAME_SOLARIS = "Solaris";
+ /** The OS name for 'Windows' */
+ public static final String OS_NAME_WINDOWS = "Windows";
+
+ /** The OS architecture for 'amd64' */
+ public static final String OS_ARCH_AMD64 = "amd64";
+ /** The OS architecture for 'i386' */
+ public static final String OS_ARCH_I386 = "i386";
+ /** The OS architecture for 'sparc' */
+ public static final String OS_ARCH_SPARC = "sparc";
+ /** The OS architecture for 'x86' */
+ public static final String OS_ARCH_X86 = "x86";
+ /** The OS architecture for 'x86_64' */
+ public static final String OS_ARCH_X86_64 = "x86_64";
- // required stuff
+ /** The id */
private String id;
- private String osName;
- private String osArch;
- private String osFamily;
- private String osVersion;
- private String daemonFramework;
- private String finalName;
- private String companyName = "Apache Software Foundation";
- private String copyrightYear = "2006";
- private File loggerConfigurationFile;
- private File serverConfigurationFile;
- private File bootstrapperConfigurationFile;
- private File scriptFile;
-
- private InstallationLayout layout;
- private List libArtifacts;
- protected PackagedFile[] packagedFiles;
+ /** The name of the operating system */
+ private String osName;
+ /** The architecture of the operating system */
+ private String osArch;
- public void setOsName( String osName )
- {
- this.osName = osName.toLowerCase( Locale.US );
- }
+ /** The final name of the installer file */
+ private String finalName;
- public String getOsName()
+ public String getFinalName()
{
- return osName;
+ return finalName;
}
- public void setOsArch( String osArch )
+ public String getId()
{
- this.osArch = osArch.toLowerCase( Locale.US );
+ return id;
}
@@ -103,31 +78,15 @@ public class Target
}
- public void setDaemonFramework( String daemonFramework )
- {
- this.daemonFramework = daemonFramework.toLowerCase( Locale.US );
- }
-
-
- public String getDaemonFramework()
- {
- return daemonFramework;
- }
-
-
- public void setOsVersion( String osVersion )
+ public String getOsName()
{
- this.osVersion = osVersion.toLowerCase( Locale.US );
+ return osName;
}
- public String getOsVersion()
+ public void setFinalName( String finalName )
{
- if ( osVersion == null )
- {
- return null;
- }
- return osVersion.toLowerCase( Locale.US );
+ this.finalName = finalName;
}
@@ -137,140 +96,95 @@ public class Target
}
- public String getId()
- {
- return id;
- }
-
-
- public void setLoggerConfigurationFile( File loggerConfigurationFile )
- {
- this.loggerConfigurationFile = loggerConfigurationFile;
- }
-
-
- public File getLoggerConfigurationFile()
- {
- return loggerConfigurationFile;
- }
-
-
- public void setServerConfigurationFile( File serverConfigurationFile )
- {
- this.serverConfigurationFile = serverConfigurationFile;
- }
-
-
- public File getServerConfigurationFile()
- {
- return serverConfigurationFile;
- }
-
-
- public void setBootstrapperConfigurationFile( File bootstrapperConfigurationFile )
- {
- this.bootstrapperConfigurationFile = bootstrapperConfigurationFile;
- }
-
-
- public File getBootstrapperConfigurationFile()
- {
- return bootstrapperConfigurationFile;
- }
-
-
- public void setOsFamily( String osFamily )
- {
- this.osFamily = osFamily;
- }
-
-
- public String getOsFamily()
- {
- return osFamily;
- }
-
-
- public void setLayout( InstallationLayout layout )
- {
- this.layout = layout;
- }
-
-
- public InstallationLayout getLayout()
- {
- return layout;
- }
-
-
- public void setLibArtifacts( List libArtifacts )
- {
- this.libArtifacts = libArtifacts;
- }
-
-
- public List getLibArtifacts()
+ public void setOsArch( String osArch )
{
- return libArtifacts;
+ this.osArch = osArch;
}
- public void setFinalName( String finalName )
+ public void setOsName( String osName )
{
- this.finalName = finalName;
+ this.osName = osName;
}
- public String getFinalName()
+ /**
+ * Indicates if the OS name is 'Linux'.
+ */
+ public boolean isOsNameLinux()
{
- return finalName;
+ return Target.OS_NAME_LINUX.equalsIgnoreCase( osName );
}
- public void setCompanyName( String innoCompanyName )
+ /**
+ * Indicates if the OS name is 'Mac OS X'.
+ */
+ public boolean isOsNameMacOSX()
{
- this.companyName = innoCompanyName;
+ return Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( osName );
}
- public String getCompanyName()
+ /**
+ * Indicates if the OS name is 'Solaris'.
+ */
+ public boolean isOsNameSolaris()
{
- return companyName;
+ return Target.OS_NAME_SOLARIS.equalsIgnoreCase( osName );
}
- public void setCopyrightYear( String innoCopyrightYear )
+ /**
+ * Indicates if the OS name is 'Windows'.
+ */
+ public boolean isOsNameWindows()
{
- this.copyrightYear = innoCopyrightYear;
+ return Target.OS_NAME_WINDOWS.equalsIgnoreCase( osName );
}
- public String getCopyrightYear()
+ /**
+ * Indicates if the OS architecture is 'amd64'.
+ */
+ public boolean isOsArchAmd64()
{
- return copyrightYear;
+ return Target.OS_ARCH_AMD64.equalsIgnoreCase( osArch );
}
- public void setPackagedFiles( PackagedFile[] packagedFiles )
+ /**
+ * Indicates if the OS architecture is 'i386'.
+ */
+ public boolean isOsArchI386()
{
- this.packagedFiles = packagedFiles;
+ return Target.OS_ARCH_I386.equalsIgnoreCase( osArch );
}
- public PackagedFile[] getPackagedFiles()
+ /**
+ * Indicates if the OS architecture is 'Sparc'.
+ */
+ public boolean isOsArchSparc()
{
- return packagedFiles;
+ return Target.OS_ARCH_SPARC.equalsIgnoreCase( osArch );
}
- public void setScriptFile( File scriptFile )
+ /**
+ * Indicates if the OS architecture is 'x86'.
+ */
+ public boolean isOsArchx86()
{
- this.scriptFile = scriptFile;
+ return Target.OS_ARCH_X86.equalsIgnoreCase( osArch );
}
- public File getScriptFile()
+ /**
+ * Indicates if the OS architecture is 'x86_64'.
+ */
+ public boolean isOsArchX86_64()
{
- return scriptFile;
+ return Target.OS_ARCH_X86_64.equalsIgnoreCase( osArch );
}
}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveInstallerCommand.java Wed Sep 22 15:07:26 2010
@@ -93,110 +93,111 @@ public class ArchiveInstallerCommand ext
return;
}
- File baseDirectory = target.getLayout().getInstallationDirectory();
- File imagesDirectory = baseDirectory.getParentFile();
-
- log.info( "Creating Archive Installer..." );
-
- // Creating the archive directory
- File targetDirectory = new File( imagesDirectory, target.getId() );
- File archiveDirectory = new File( targetDirectory, "apacheds" + "_"
- + mojo.getProject().getVersion() );
-
- log.info( "Copying Archive Installer files" );
-
- // Copying the resources files
- try
- {
- // Copying the apacheds.bat file
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.bat" ),
- new File( targetDirectory, "apacheds.bat" ), false );
-
- // Copying the cpappend.bat file
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "cpappend.bat" ),
- new File( targetDirectory, "cpappend.bat" ), false );
-
- // Copying the apacheds.sh file
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.sh" ),
- new File( targetDirectory, "apacheds.sh" ), false );
-
- // Copying all the files in the final archive directory
- MojoHelperUtils.copyFiles( targetDirectory, archiveDirectory );
- }
- catch ( IOException e )
- {
- log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy Archive Installer resources files." );
- }
-
- // Generating the Bin
- log.info( "Generating Archive Installer" );
-
- Project project = new Project();
- project.setBaseDir( targetDirectory );
-
- // ZIP Archive
- if ( archiveType.equalsIgnoreCase( "zip" ) )
- {
- Zip zipTask = new Zip();
- zipTask.setProject( project );
- zipTask.setDestFile( new File( imagesDirectory, target.getFinalName() ) );
- zipTask.setBasedir( targetDirectory );
- zipTask.setIncludes( archiveDirectory.getName() + "/**" );
- zipTask.execute();
- }
- // TAR Archive
- else if ( archiveType.equalsIgnoreCase( "tar" ) )
- {
- Tar tarTask = new Tar();
- tarTask.setProject( project );
- tarTask.setDestFile( new File( imagesDirectory, target.getFinalName() ) );
- tarTask.setBasedir( targetDirectory );
- tarTask.setIncludes( archiveDirectory.getName() + "/**" );
- tarTask.execute();
- }
- // TAR.GZ Archive
- else if ( archiveType.equalsIgnoreCase( "tar.gz" ) )
- {
- File tarFile = new File( imagesDirectory, target.getId() + ".tar" );
-
- Tar tarTask = new Tar();
- tarTask.setProject( project );
- tarTask.setDestFile( tarFile );
- tarTask.setBasedir( targetDirectory );
- tarTask.setIncludes( archiveDirectory.getName() + "/**" );
- tarTask.execute();
-
- GZip gzipTask = new GZip();
- gzipTask.setProject( project );
- gzipTask.setDestfile( new File( imagesDirectory, target.getFinalName() ) );
- gzipTask.setSrc( tarFile );
- gzipTask.execute();
-
- tarFile.delete();
- }
- // TAR.BZ2 Archive
- else if ( archiveType.equalsIgnoreCase( "tar.bz2" ) )
- {
- File tarFile = new File( imagesDirectory, target.getId() + ".tar" );
-
- Tar tarTask = new Tar();
- tarTask.setProject( project );
- tarTask.setDestFile( tarFile );
- tarTask.setBasedir( targetDirectory );
- tarTask.setIncludes( archiveDirectory.getName() + "/**" );
- tarTask.execute();
-
- BZip2 bzip2Task = new BZip2();
- bzip2Task.setProject( project );
- bzip2Task.setDestfile( new File( imagesDirectory, target.getFinalName() ) );
- bzip2Task.setSrc( tarFile );
- bzip2Task.execute();
-
- tarFile.delete();
- }
-
- log.info( "Archive Installer generated at " + new File( imagesDirectory, target.getFinalName() ) );
+ // TODO FIXME
+ // File baseDirectory = target.getLayout().getInstallationDirectory();
+ // File imagesDirectory = baseDirectory.getParentFile();
+ //
+ // log.info( "Creating Archive Installer..." );
+ //
+ // // Creating the archive directory
+ // File targetDirectory = new File( imagesDirectory, target.getId() );
+ // File archiveDirectory = new File( targetDirectory, "apacheds" + "_"
+ // + mojo.getProject().getVersion() );
+ //
+ // log.info( "Copying Archive Installer files" );
+ //
+ // // Copying the resources files
+ // try
+ // {
+ // // Copying the apacheds.bat file
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.bat" ),
+ // new File( targetDirectory, "apacheds.bat" ), false );
+ //
+ // // Copying the cpappend.bat file
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "cpappend.bat" ),
+ // new File( targetDirectory, "cpappend.bat" ), false );
+ //
+ // // Copying the apacheds.sh file
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.sh" ),
+ // new File( targetDirectory, "apacheds.sh" ), false );
+ //
+ // // Copying all the files in the final archive directory
+ // MojoHelperUtils.copyFiles( targetDirectory, archiveDirectory );
+ // }
+ // catch ( IOException e )
+ // {
+ // log.error( e.getMessage() );
+ // throw new MojoFailureException( "Failed to copy Archive Installer resources files." );
+ // }
+ //
+ // // Generating the Bin
+ // log.info( "Generating Archive Installer" );
+ //
+ // Project project = new Project();
+ // project.setBaseDir( targetDirectory );
+ //
+ // // ZIP Archive
+ // if ( archiveType.equalsIgnoreCase( "zip" ) )
+ // {
+ // Zip zipTask = new Zip();
+ // zipTask.setProject( project );
+ // zipTask.setDestFile( new File( imagesDirectory, target.getFinalName() ) );
+ // zipTask.setBasedir( targetDirectory );
+ // zipTask.setIncludes( archiveDirectory.getName() + "/**" );
+ // zipTask.execute();
+ // }
+ // // TAR Archive
+ // else if ( archiveType.equalsIgnoreCase( "tar" ) )
+ // {
+ // Tar tarTask = new Tar();
+ // tarTask.setProject( project );
+ // tarTask.setDestFile( new File( imagesDirectory, target.getFinalName() ) );
+ // tarTask.setBasedir( targetDirectory );
+ // tarTask.setIncludes( archiveDirectory.getName() + "/**" );
+ // tarTask.execute();
+ // }
+ // // TAR.GZ Archive
+ // else if ( archiveType.equalsIgnoreCase( "tar.gz" ) )
+ // {
+ // File tarFile = new File( imagesDirectory, target.getId() + ".tar" );
+ //
+ // Tar tarTask = new Tar();
+ // tarTask.setProject( project );
+ // tarTask.setDestFile( tarFile );
+ // tarTask.setBasedir( targetDirectory );
+ // tarTask.setIncludes( archiveDirectory.getName() + "/**" );
+ // tarTask.execute();
+ //
+ // GZip gzipTask = new GZip();
+ // gzipTask.setProject( project );
+ // gzipTask.setDestfile( new File( imagesDirectory, target.getFinalName() ) );
+ // gzipTask.setSrc( tarFile );
+ // gzipTask.execute();
+ //
+ // tarFile.delete();
+ // }
+ // // TAR.BZ2 Archive
+ // else if ( archiveType.equalsIgnoreCase( "tar.bz2" ) )
+ // {
+ // File tarFile = new File( imagesDirectory, target.getId() + ".tar" );
+ //
+ // Tar tarTask = new Tar();
+ // tarTask.setProject( project );
+ // tarTask.setDestFile( tarFile );
+ // tarTask.setBasedir( targetDirectory );
+ // tarTask.setIncludes( archiveDirectory.getName() + "/**" );
+ // tarTask.execute();
+ //
+ // BZip2 bzip2Task = new BZip2();
+ // bzip2Task.setProject( project );
+ // bzip2Task.setDestfile( new File( imagesDirectory, target.getFinalName() ) );
+ // bzip2Task.setSrc( tarFile );
+ // bzip2Task.execute();
+ //
+ // tarFile.delete();
+ // }
+ //
+ // log.info( "Archive Installer generated at " + new File( imagesDirectory, target.getFinalName() ) );
}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveTarget.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveTarget.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveTarget.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/archive/ArchiveTarget.java Wed Sep 22 15:07:26 2010
@@ -30,7 +30,6 @@ import org.apache.directory.daemon.insta
*/
public class ArchiveTarget extends Target
{
- /** The archive type */
/**
* The archive type.
* <p>
@@ -66,4 +65,4 @@ public class ArchiveTarget extends Targe
{
this.archiveType = archiveType;
}
-}
\ No newline at end of file
+}
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java?rev=1000024&r1=1000023&r2=1000024&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java Wed Sep 22 15:07:26 2010
@@ -72,119 +72,120 @@ public class BinInstallerCommand extends
*/
public void execute() throws MojoExecutionException, MojoFailureException
{
- // Verifying the target is macosx
- if ( !target.getOsFamily().equals( "linux" ) )
- {
- log.warn( "Bin installer can only be targeted for linux platforms!" );
- log.warn( "The build will continue, but please check the the platform of this installer " );
- log.warn( "target" );
- return;
- }
-
- // Verifying the hdiutil utility exists
- if ( !shUtility.exists() )
- {
- log.warn( "Cannot find sh utility at this location: " + shUtility );
- log.warn( "The build will continue, but please check the location of your sh " );
- log.warn( "utility." );
- return;
- }
-
- File baseDirectory = target.getLayout().getInstallationDirectory();
- File imagesDirectory = baseDirectory.getParentFile();
-
- log.info( "Creating Bin Installer..." );
-
- // Creating the package directory
- File binDirectory = new File( imagesDirectory, target.getId() + "-bin" );
- binDirectory.mkdirs();
-
- log.info( "Copying Bin installer files" );
-
- // Copying the apacheds files in the rootFolder directory
- File binRootFolderDirectory = new File( binDirectory, "rootFolder" );
- binRootFolderDirectory.mkdirs();
- File binRootFolderServerDirectory = new File( binRootFolderDirectory, "server" );
- try
- {
- copyFiles( baseDirectory, binRootFolderServerDirectory );
- }
- catch ( IOException e )
- {
- log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallationDirectory()
- + ") to the Bin directory (" + binRootFolderDirectory + ")" );
- }
-
- // Create instance and sh directory
- File binRootFolderInstanceDirectory = new File( binRootFolderDirectory, "instance" );
- binRootFolderInstanceDirectory.mkdirs();
- File binShDirectory = new File( binDirectory, "sh" );
- binShDirectory.mkdirs();
-
- // Copying the resources files
- try
- {
- // Copying the apacheds.conf file to the server installation layout
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.conf" ),
- new File( binRootFolderServerDirectory, "conf/apacheds.conf" ), false );
-
- // Copying the default instance apacheds.conf file
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
- "apacheds-default.conf" ), new File( binRootFolderInstanceDirectory, "apacheds.conf" ), false );
-
- // Copying the log4j.properties file for the default instance
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, new File( binRootFolderServerDirectory,
- "conf/log4j.properties" ), new File( binRootFolderInstanceDirectory, "log4j.properties" ), false );
-
- // Copying the server.xml file for the default instance
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, new File( binRootFolderServerDirectory,
- "conf/server.xml" ), new File( binRootFolderInstanceDirectory, "server.xml" ), false );
-
- // Copying the apacheds-init script file for the default instance
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds-init" ),
- new File( binRootFolderInstanceDirectory, "apacheds-init" ), true );
-
- // Copying shell script utilities for the installer
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "bootstrap.sh" ),
- new File( binDirectory, "bootstrap.sh" ), true );
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
- "createInstaller.sh" ), new File( binDirectory, "createInstaller.sh" ), true );
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "functions.sh" ),
- new File( binShDirectory, "functions.sh" ), false );
- MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "install.sh" ),
- new File( binShDirectory, "install.sh" ), false );
- MojoHelperUtils.copyAsciiFile( mojo, 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 )
- {
- log.error( e.getMessage() );
- throw new MojoFailureException( "Failed to copy Bin resources files." );
- }
-
- // Generating the Bin
- log.info( "Generating Bin Installer" );
- Execute createBinTask = new Execute();
- String[] cmd = new String[]
- { shUtility.getAbsolutePath(), "createInstaller.sh" };
- createBinTask.setCommandline( cmd );
- createBinTask.setSpawn( true );
- createBinTask.setWorkingDirectory( binDirectory );
- try
- {
- createBinTask.execute();
- }
- catch ( IOException e )
- {
- log.error( e.getMessage() );
- throw new MojoFailureException( "Failed while trying to generate the Bin: " + e.getMessage() );
- }
-
- log.info( "Bin Installer generated at " + new File( imagesDirectory, finalName ) );
+ // TODO FIXME
+ // // Verifying the target is macosx
+ // if ( !target.getOsFamily().equals( "linux" ) )
+ // {
+ // log.warn( "Bin installer can only be targeted for linux platforms!" );
+ // log.warn( "The build will continue, but please check the the platform of this installer " );
+ // log.warn( "target" );
+ // return;
+ // }
+ //
+ // // Verifying the hdiutil utility exists
+ // if ( !shUtility.exists() )
+ // {
+ // log.warn( "Cannot find sh utility at this location: " + shUtility );
+ // log.warn( "The build will continue, but please check the location of your sh " );
+ // log.warn( "utility." );
+ // return;
+ // }
+ //
+ // File baseDirectory = target.getLayout().getInstallationDirectory();
+ // File imagesDirectory = baseDirectory.getParentFile();
+ //
+ // log.info( "Creating Bin Installer..." );
+ //
+ // // Creating the package directory
+ // File binDirectory = new File( imagesDirectory, target.getId() + "-bin" );
+ // binDirectory.mkdirs();
+ //
+ // log.info( "Copying Bin installer files" );
+ //
+ // // Copying the apacheds files in the rootFolder directory
+ // File binRootFolderDirectory = new File( binDirectory, "rootFolder" );
+ // binRootFolderDirectory.mkdirs();
+ // File binRootFolderServerDirectory = new File( binRootFolderDirectory, "server" );
+ // try
+ // {
+ // copyFiles( baseDirectory, binRootFolderServerDirectory );
+ // }
+ // catch ( IOException e )
+ // {
+ // log.error( e.getMessage() );
+ // throw new MojoFailureException( "Failed to copy image (" + target.getLayout().getInstallationDirectory()
+ // + ") to the Bin directory (" + binRootFolderDirectory + ")" );
+ // }
+ //
+ // // Create instance and sh directory
+ // File binRootFolderInstanceDirectory = new File( binRootFolderDirectory, "instance" );
+ // binRootFolderInstanceDirectory.mkdirs();
+ // File binShDirectory = new File( binDirectory, "sh" );
+ // binShDirectory.mkdirs();
+ //
+ // // Copying the resources files
+ // try
+ // {
+ // // Copying the apacheds.conf file to the server installation layout
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds.conf" ),
+ // new File( binRootFolderServerDirectory, "conf/apacheds.conf" ), false );
+ //
+ // // Copying the default instance apacheds.conf file
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
+ // "apacheds-default.conf" ), new File( binRootFolderInstanceDirectory, "apacheds.conf" ), false );
+ //
+ // // Copying the log4j.properties file for the default instance
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, new File( binRootFolderServerDirectory,
+ // "conf/log4j.properties" ), new File( binRootFolderInstanceDirectory, "log4j.properties" ), false );
+ //
+ // // Copying the server.xml file for the default instance
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, new File( binRootFolderServerDirectory,
+ // "conf/server.xml" ), new File( binRootFolderInstanceDirectory, "server.xml" ), false );
+ //
+ // // Copying the apacheds-init script file for the default instance
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "apacheds-init" ),
+ // new File( binRootFolderInstanceDirectory, "apacheds-init" ), true );
+ //
+ // // Copying shell script utilities for the installer
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "bootstrap.sh" ),
+ // new File( binDirectory, "bootstrap.sh" ), true );
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream(
+ // "createInstaller.sh" ), new File( binDirectory, "createInstaller.sh" ), true );
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "functions.sh" ),
+ // new File( binShDirectory, "functions.sh" ), false );
+ // MojoHelperUtils.copyAsciiFile( mojo, filterProperties, getClass().getResourceAsStream( "install.sh" ),
+ // new File( binShDirectory, "install.sh" ), false );
+ // MojoHelperUtils.copyAsciiFile( mojo, 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 )
+ // {
+ // log.error( e.getMessage() );
+ // throw new MojoFailureException( "Failed to copy Bin resources files." );
+ // }
+ //
+ // // Generating the Bin
+ // log.info( "Generating Bin Installer" );
+ // Execute createBinTask = new Execute();
+ // String[] cmd = new String[]
+ // { shUtility.getAbsolutePath(), "createInstaller.sh" };
+ // createBinTask.setCommandline( cmd );
+ // createBinTask.setSpawn( true );
+ // createBinTask.setWorkingDirectory( binDirectory );
+ // try
+ // {
+ // createBinTask.execute();
+ // }
+ // catch ( IOException e )
+ // {
+ // log.error( e.getMessage() );
+ // throw new MojoFailureException( "Failed while trying to generate the Bin: " + e.getMessage() );
+ // }
+ //
+ // log.info( "Bin Installer generated at " + new File( imagesDirectory, finalName ) );
}