You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/06/15 12:30:01 UTC

svn commit: r1748572 [10/23] - in /directory/apacheds/branches/apacheds-value: ./ benchmarks/installers-maven-plugin/ benchmarks/installers-maven-plugin/.settings/ benchmarks/installers-maven-plugin/target/ benchmarks/installers-maven-plugin/target/cla...

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java Wed Jun 15 12:29:57 2016
@@ -1,636 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.server.installers.macosxpkg;
-
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.directory.server.core.api.InstanceLayout;
-import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.installers.AbstractMojoCommand;
-import org.apache.directory.server.installers.GenerateMojo;
-import org.apache.directory.server.installers.MojoHelperUtils;
-import org.apache.directory.server.installers.Target;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.tools.ant.taskdefs.Execute;
-
-
-/**
- * PKG Installer command for creating Mac OS X packages. It creates the following directory :
- * 
- * <pre>
- * apacheds-macosx-[32/64]bit/
- *  |
- *  +-- scripts/
- *  |    |
- *  |    +-- preflight*
- *  |    |
- *  |    +-- postflight*
- *  |
- *  +-- root/
- *  |    |
- *  |    +-- usr/
- *  |    |    |
- *  |    |    +-- bin/
- *  |    |    |    |
- *  |    |    |    +-- apacheds*
- *  |    |    |
- *  |    |    +-- local/
- *  |    |         |
- *  |    |         +-- apacheds-&lt;version&gt;/
- *  |    |              |
- *  |    |              +-- lib/
- *  |    |              |    |
- *  |    |              |    +-- wrapper-3.2.3.jar
- *  |    |              |    |
- *  |    |              |    +-- libwrapper.jnilib
- *  |    |              |    |
- *  |    |              |    +-- apacheds-wrapper-2.0.0-M20-SNAPSHOT.jar
- *  |    |              |    |
- *  |    |              |    +-- apacheds-service-2.0.0-M20-SNAPSHOT.jar
- *  |    |              |
- *  |    |              +-- instances/
- *  |    |              |    |
- *  |    |              |    +-- default/
- *  |    |              |         |
- *  |    |              |         +-- run
- *  |    |              |         |
- *  |    |              |         +-- partitions
- *  |    |              |         |
- *  |    |              |         +-- log
- *  |    |              |         |
- *  |    |              |         +-- conf
- *  |    |              |         |    |
- *  |    |              |         |    +-- wrapper-instance.conf
- *  |    |              |         |    |
- *  |    |              |         |    +-- log4j.properties
- *  |    |              |         |    |
- *  |    |              |         |    +-- config.ldif
- *  |    |              |         |    
- *  |    |              |         +-- cache
- *  |    |              |
- *  |    |              +-- conf/
- *  |    |              |    |
- *  |    |              |    +-- wrapper.conf
- *  |    |              |
- *  |    |              +-- bin/
- *  |    |              |    |
- *  |    |              |    +-- wrapper*
- *  |    |              |    |
- *  |    |              |    +-- apacheds*
- *  |    |              |
- *  |    |              +-- NOTICE
- *  |    |              |
- *  |    |              +-- LICENSE
- *  |    +-- Library
- *  |         |
- *  |         +-- LaunchDaemons/
- *  |              |
- *  |              +-- org.apache.directory.server.plist
- *  |
- *  +-- Resources/
- *  |    |
- *  |    +-- en.lproj/
- *  |         |
- *  |         +-- background.tiff
- *  |         |
- *  |         +-- License.rtf
- *  |
- *  +-- Info.plist
- * </pre>
- *  
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarget>
-{
-    /** The place the binary will be installed */
-    private static final String USR_BIN = "usr/bin";
-
-    /** The disk image tool */
-    private static final String USR_BIN_HDIUTIL = "/" + USR_BIN + "/hdiutil";
-
-    /** The ApacheDS prefix */
-    private static final String USR_LOCAL_APACHEDS = "usr/local" + "/" + APACHEDS_DASH;
-
-    /** The root */
-    private static final String ROOT = "root";
-
-    /** Instances is where we will store all the instances */
-    private static final String INSTANCES = "instances";
-
-    /** The wrapper used to launch ApacheDS */
-    private static final String WRAPPER = "wrapper";
-
-    /** The launcher daemon */
-    private static final String LAUNCH_DAEMONS = "Library/LaunchDaemons";
-
-    /** The name of the ApacheDS plist */
-    private static final String ORG_APACHE_DIRECTORY_SERVER_PLIST = "org.apache.directory.server.plist";
-
-    /** The name of the shell script that launch ApacheDS */
-    private static final String APACHEDS_USR_BIN_SH = "apacheds-usr-bin.sh";
-
-    /** The english resources */
-    private static final String RESOURCES_EN_LPROJ = "Resources/en.lproj";
-
-    /** The dmg directory */
-    private static final String DMG_DIR = "dmg/";
-
-    /** The dmg background */
-    private static final String DMG_DOT_BACKGROUND = DMG_DIR + ".background";
-
-    /** The package extension */
-    private static final String DASH_DMG = "-dmg";
-
-    /** files used to build the package */
-    private static final String SCRIPTS = "scripts";
-    private static final String PKG_BACKGROUND_TIFF = "pkg-background.tiff";
-    private static final String BACKGROUND_TIFF = "background.tiff";
-    private static final String LICENSE_RTF = "License.rtf";
-    private static final String INFO_PLIST = "Info.plist";
-    private static final String PREFLIGHT = "preflight";
-    private static final String POSTFLIGHT = "postflight";
-
-    /** The hdiutil utility executable */
-    private File hdiutilUtility = new File( USR_BIN_HDIUTIL );
-
-
-    /**
-     * Creates a new instance of MacOsXPkgInstallerCommand.
-     *
-     * @param mojo the Server Installers Mojo
-     * @param target the PKG target
-     */
-    public MacOsXPkgInstallerCommand( GenerateMojo mojo, MacOsXPkgTarget target )
-    {
-        super( mojo, target );
-        initializeFilterProperties();
-    }
-
-
-    /**
-     * Performs the following:
-     * <ol>
-     *   <li>Bail if target is not for macosx or the PackageMaker or hdiutil utilities can't be found.</li>
-     *   <li>Creates the Mac OS X PKG Installer for ApacheDS</li>
-     *   <li>Package it in a Mac OS X DMG (Disk iMaGe)</li>
-     * </ol>
-     */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        // Verifying the target
-        if ( !verifyTarget() )
-        {
-            return;
-        }
-
-        log.info( "  Creating Mac OS X PKG installer..." );
-
-        // Creating the target directory
-        File targetDirectory = getTargetDirectory();
-
-        if ( !targetDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, targetDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        log.info( "    Copying PKG installer files" );
-
-        // Creating the root directories hierarchy
-        File pkgRootDirectory = new File( targetDirectory, ROOT );
-
-        if ( !pkgRootDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootUsrBinDirectory = new File( pkgRootDirectory, USR_BIN );
-
-        if ( !pkgRootUsrBinDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootUsrBinDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootUsrLocalApachedsDirectory = new File( pkgRootDirectory, USR_LOCAL_APACHEDS
-            + mojo.getProject().getVersion() );
-
-        if ( !pkgRootUsrLocalApachedsDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootUsrLocalApachedsDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootInstancesDirectory = new File( pkgRootUsrLocalApachedsDirectory, INSTANCES );
-
-        if ( !pkgRootInstancesDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgRootInstancesDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootInstancesDefaultDirectory = new File( pkgRootInstancesDirectory, DEFAULT );
-
-        if ( !pkgRootInstancesDefaultDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootInstancesDefaultDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootInstancesDefaultConfDirectory = new File( pkgRootInstancesDefaultDirectory,
-            InstanceLayout.CONF_NAME );
-
-        if ( !pkgRootInstancesDefaultConfDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootInstancesDefaultConfDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootInstancesDefaultDirectoryLog = new File( pkgRootInstancesDefaultDirectory, InstanceLayout.LOG_NAME );
-
-        if ( !pkgRootInstancesDefaultDirectoryLog.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootInstancesDefaultDirectoryLog ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootInstancesDefaultDirectoryPartitions = new File( pkgRootInstancesDefaultDirectory,
-            InstanceLayout.PARTITIONS_NAME );
-
-        if ( !pkgRootInstancesDefaultDirectoryPartitions.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootInstancesDefaultDirectoryPartitions ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootInstancesDefaultDirectoryRun = new File( pkgRootInstancesDefaultDirectory, InstanceLayout.RUN_NAME );
-
-        if ( !pkgRootInstancesDefaultDirectoryRun.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootInstancesDefaultDirectoryRun ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        File pkgRootLibraryLaunchDaemons = new File( pkgRootDirectory, LAUNCH_DAEMONS );
-
-        if ( !pkgRootLibraryLaunchDaemons.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                pkgRootLibraryLaunchDaemons ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        // Copying the apacheds files in the root directory
-        try
-        {
-            // Creating the installation and instance layouts
-            createLayouts();
-
-            // Copying the apacheds command to /usr/bin
-            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, APACHEDS_USR_BIN_SH,
-                getClass().getResourceAsStream( APACHEDS_USR_BIN_SH ),
-                new File( pkgRootUsrBinDirectory, APACHEDS ), true );
-
-            // Copying the org.apache.directory.server.plist file to /Library/LaunchDaemons/
-            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, ORG_APACHE_DIRECTORY_SERVER_PLIST,
-                getClass().getResourceAsStream( ORG_APACHE_DIRECTORY_SERVER_PLIST ),
-                new File( pkgRootLibraryLaunchDaemons, ORG_APACHE_DIRECTORY_SERVER_PLIST ), true );
-
-            // Create Resources folder and sub-folder
-            // Copying the resources files and Info.plist file needed for the 
-            // generation of the PKG
-            File pkgResourcesEnglishDirectory = new File( targetDirectory, RESOURCES_EN_LPROJ );
-
-            if ( !pkgResourcesEnglishDirectory.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
-                    pkgResourcesEnglishDirectory ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            File pkgScriptsDirectory = new File( targetDirectory, SCRIPTS );
-
-            if ( !pkgScriptsDirectory.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, pkgScriptsDirectory ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            MojoHelperUtils.copyBinaryFile( mojo, PKG_BACKGROUND_TIFF,
-                getClass().getResourceAsStream( PKG_BACKGROUND_TIFF ),
-                new File( pkgResourcesEnglishDirectory, BACKGROUND_TIFF ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, LICENSE_RTF,
-                getClass().getResourceAsStream( LICENSE_RTF ),
-                new File( pkgResourcesEnglishDirectory, LICENSE_RTF ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, INFO_PLIST,
-                getClass().getResourceAsStream( INFO_PLIST ), new File( targetDirectory, INFO_PLIST ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, PREFLIGHT,
-                getClass().getResourceAsStream( PREFLIGHT ), new File( pkgScriptsDirectory, PREFLIGHT ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, POSTFLIGHT,
-                getClass().getResourceAsStream( POSTFLIGHT ), new File( pkgScriptsDirectory, POSTFLIGHT ) );
-        }
-        catch ( Exception e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed to copy PKG resources files." );
-        }
-
-        // Generating the PKG
-        log.info( "    Generating Mac OS X PKG Installer" );
-        Execute createPkgTask = new Execute();
-        String[] cmd = new String[]
-            {
-                mojo.getPackageMakerUtility().getAbsolutePath(),
-                "--root", ROOT + "/",
-                "--resources", "Resources/",
-                "--info", INFO_PLIST,
-                "--title", "Apache Directory Server " + mojo.getProject().getVersion(),
-                "--version", mojo.getProject().getVersion(),
-                "--scripts", SCRIPTS,
-                "--out", "Apache Directory Server Installer.pkg"
-        };
-
-        createPkgTask.setCommandline( cmd );
-        createPkgTask.setWorkingDirectory( targetDirectory );
-
-        try
-        {
-            createPkgTask.execute();
-        }
-        catch ( IOException e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed while trying to generate the PKG: " + e.getMessage() );
-        }
-
-        log.info( "  Creating Mac OS X DMG..." );
-
-        // Creating the disc image directory
-        File dmgDirectory = new File( mojo.getOutputDirectory(), target.getId() + DASH_DMG );
-
-        if ( !dmgDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, dmgDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        log.info( "    Copying DMG files" );
-
-        // Create dmg directory and its sub-directory
-        File dmgDmgBackgroundDirectory = new File( dmgDirectory, DMG_DOT_BACKGROUND );
-
-        if ( !dmgDmgBackgroundDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, dmgDmgBackgroundDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        // Copying the files
-        try
-        {
-            MojoHelperUtils.copyBinaryFile( mojo, "dmg-background.png",
-                getClass().getResourceAsStream( "dmg-background.png" ),
-                new File( dmgDirectory, "dmg/.background/background.png" ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, "DS_Store",
-                getClass().getResourceAsStream( "DS_Store" ),
-                new File( dmgDirectory, "dmg/.DS_Store" ) );
-
-            MojoHelperUtils.copyFiles( new File( targetDirectory, "Apache Directory Server Installer.pkg" ), new File(
-                dmgDirectory, "dmg/Apache Directory Server Installer.pkg" ) );
-
-        }
-        catch ( IOException e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed to copy DMG resources files." );
-        }
-
-        // Setting execution permission to the preflight and postflight scripts
-        // (unfortunately, the execution permission has been lost after the 
-        // copy of the PKG to the dmg folder)
-        MojoHelperUtils.exec( new String[]
-            { CHMOD, RWX_RX_RX,
-                new File( dmgDirectory, "dmg/Apache Directory Server Installer.pkg/Contents/Resources/preflight" )
-                    .toString() }, dmgDirectory, false );
-
-        MojoHelperUtils.exec( new String[]
-            { CHMOD, RWX_RX_RX,
-                new File( dmgDirectory, "dmg/Apache Directory Server Installer.pkg/Contents/Resources/postflight" )
-                    .toString() }, dmgDirectory, false );
-
-        // Generating the DMG
-        log.info( "    Generating Mac OS X DMG Installer" );
-        String finalName = target.getFinalName();
-
-        if ( !finalName.endsWith( ".dmg" ) )
-        {
-            finalName = finalName + ".dmg";
-        }
-
-        try
-        {
-            Execute createDmgTask = new Execute();
-            createDmgTask.setCommandline( new String[]
-                { hdiutilUtility.getAbsolutePath(), "makehybrid", "-quiet", "-hfs", "-hfs-volume-name",
-                    "Apache Directory Server Installer", "-hfs-openfolder", "dmg/", "dmg/", "-o", "TMP.dmg" } );
-            createDmgTask.setWorkingDirectory( dmgDirectory );
-            createDmgTask.execute();
-
-            createDmgTask.setCommandline( new String[]
-                {
-                    hdiutilUtility.getAbsolutePath(),
-                    "convert",
-                    "-quiet",
-                    "-format",
-                    "UDZO",
-                    "TMP.dmg",
-                    "-o",
-                    "../" + finalName } );
-            createDmgTask.execute();
-
-        }
-        catch ( IOException e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed while trying to generate the DMG: " + e.getMessage() );
-        }
-
-        log.info( "=> Mac OS X DMG generated at " + new File( mojo.getOutputDirectory(), finalName ) );
-    }
-
-
-    /**
-     * Verifies the target.
-     *
-     * @return
-     *      <code>true</code> if the target is correct, 
-     *      <code>false</code> if not.
-     */
-    private boolean verifyTarget()
-    {
-        // Verifying the target is Mac OS X
-        if ( !target.getOsName().equalsIgnoreCase( Target.OS_NAME_MAC_OS_X ) )
-        {
-            log.warn( "Mac OS X PKG installer can only be targeted for Mac OS X platform!" );
-            log.warn( "The build will continue, but please check the platform of this installer target." );
-            return false;
-        }
-
-        // Verifying the currently used OS is Mac OS X
-        if ( !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( OS_NAME ) ) )
-        {
-            log.warn( "Mac OS X PKG installer can only be built on a machine running Mac OS X!" );
-            log.warn( "The build will continue, generation of this target is skipped." );
-            return false;
-        }
-
-        // Verifying the PackageMaker utility exists
-        if ( !mojo.getPackageMakerUtility().exists() )
-        {
-            log.warn( "Cannot find 'PackageMaker' utility at this location: " + mojo.getPackageMakerUtility() );
-            log.warn( "The build will continue, but please check the location of your 'Package Maker' utility." );
-            return false;
-        }
-
-        // Verifying the hdiutil utility exists
-        if ( !hdiutilUtility.exists() )
-        {
-            log.warn( "Cannot find 'hdiutil' utility at this location: " + hdiutilUtility );
-            log.warn( "The build will continue, but please check the location of your 'hdiutil' utility." );
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void initializeFilterProperties()
-    {
-        super.initializeFilterProperties();
-
-        filterProperties.put( INSTALLATION_DIRECTORY_PROP, "/" + USR_LOCAL_APACHEDS
-            + mojo.getProject().getVersion() );
-        filterProperties.put( INSTANCES_DIRECTORY_PROP, "/" + USR_LOCAL_APACHEDS
-            + mojo.getProject().getVersion() + "/" + INSTANCES );
-        filterProperties.put( USER_PROP, ROOT );
-        filterProperties.put( WRAPPER_JAVA_COMMAND_PROP, WRAPPER_JAVA_COMMAND );
-        filterProperties.put( DOUBLE_QUOTE_PROP, "" );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public File getInstallationDirectory()
-    {
-        return new File( getTargetDirectory(), ROOT + "/" + USR_LOCAL_APACHEDS
-            + mojo.getProject().getVersion() );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public File getInstanceDirectory()
-    {
-        return new File( getInstallationDirectory(), INSTANCE_DEFAULT_DIR );
-    }
-
-
-    /**
-     * Copies wrapper files to the installation layout.
-     *
-     * @param mojo The maven plugin Mojo
-     * @throws MojoFailureException If the copy failed
-     */
-    public void copyWrapperFiles( GenerateMojo mojo ) throws MojoFailureException
-    {
-        try
-        {
-            // Mac OS X x86
-            if ( target.isOsArchx86() )
-            {
-                MojoHelperUtils.copyBinaryFile( mojo, INSTALLERS_PATH + "wrapper/bin/wrapper-macosx-universal-32",
-                    getClass().getResourceAsStream( INSTALLERS_PATH + "wrapper/bin/wrapper-macosx-universal-32" ),
-                    new File( getInstallationLayout().getBinDirectory(), WRAPPER ) );
-
-                MojoHelperUtils.copyBinaryFile(
-                    mojo,
-                    INSTALLERS_PATH + "wrapper/lib/libwrapper-macosx-universal-32.jnilib",
-                    getClass().getResourceAsStream(
-                        INSTALLERS_PATH + "wrapper/lib/libwrapper-macosx-universal-32.jnilib" ),
-                    new File( getInstallationLayout().getLibDirectory(), "libwrapper.jnilib" ) );
-            }
-
-            // Mac OS X x86_64
-            if ( target.isOsArchX86_64() )
-            {
-                MojoHelperUtils.copyBinaryFile( mojo, INSTALLERS_PATH + "wrapper/bin/wrapper-macosx-universal-64",
-                    getClass().getResourceAsStream( INSTALLERS_PATH + "wrapper/bin/wrapper-macosx-universal-64" ),
-                    new File( getInstallationLayout().getBinDirectory(), WRAPPER ) );
-
-                MojoHelperUtils.copyBinaryFile(
-                    mojo,
-                    INSTALLERS_PATH + "wrapper/lib/libwrapper-macosx-universal-64.jnilib",
-                    getClass().getResourceAsStream(
-                        INSTALLERS_PATH + "wrapper/lib/libwrapper-macosx-universal-64.jnilib" ),
-                    new File( getInstallationLayout().getLibDirectory(), "libwrapper.jnilib" ) );
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new MojoFailureException( "Failed to copy Tanuki binary files to lib and bin directories" );
-        }
-    }
-}

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgTarget.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgTarget.java?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgTarget.java (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgTarget.java Wed Jun 15 12:29:57 2016
@@ -1,48 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.server.installers.macosxpkg;
-
-
-import org.apache.directory.server.installers.Target;
-
-
-/**
- * A PKG installer for the Mac OS X platform.
- * 
- * To create a PKG installer we use the PackageMaker utility that is bundled 
- * in the (free) developer tools supplied by Apple.
- * 
- * More information on the use of the PackageMaker utility in the command line
- * can be found at this address: 
- * http://developer.apple.com/documentation/Darwin/Reference/Manpages/man1/packagemaker.1.html
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class MacOsXPkgTarget extends Target
-{
-    /**
-     * Creates a new instance of MacOsXPkgTarget.
-     */
-    public MacOsXPkgTarget()
-    {
-        setOsName( Target.OS_NAME_MAC_OS_X );
-        setOsArch( Target.OS_ARCH_X86_64 );
-    }
-}

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java Wed Jun 15 12:29:57 2016
@@ -1,323 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.server.installers.nsis;
-
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.installers.AbstractMojoCommand;
-import org.apache.directory.server.installers.GenerateMojo;
-import org.apache.directory.server.installers.MojoHelperUtils;
-import org.apache.directory.server.installers.Target;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.tools.ant.taskdefs.Execute;
-
-
-/**
- * Nullsoft INstaller System (NSIS) Installer command for Windows installers. It creates this layout :
- * 
- * <pre>
- * installers/
- *  |
- *  +-- target/
- *       |
- *       +-- installers/
- *            |
- *            +-- apacheds-win32/
- *                 |
- *                 +-- instancesFiles/
- *                 |    |
- *                 |    +-- default/
- *                 |         |
- *                 |         +-- run/
- *                 |         |
- *                 |         +-- partitions/
- *                 |         |
- *                 |         +-- log/
- *                 |         |
- *                 |         +-- cache/
- *                 |         |
- *                 |         +-- conf/
- *                 |              |
- *                 |              +-- wrapper-instance.conf
- *                 |              |
- *                 |              +-- log4j.properties
- *                 |              |
- *                 |              +-- config.ldif
- *                 |
- *                 +-- installationFiles/
- *                 |    |
- *                 |    +-- lib/
- *                 |    |    |
- *                 |    |    +-- wrapper.dll
- *                 |    |    |
- *                 |    |    +-- wrapper-3.2.3.jar
- *                 |    |    |
- *                 |    |    +-- apacheds-wrapper-2.0.0-M20-SNAPSHOT.jar
- *                 |    |    |
- *                 |    |    +-- apacheds-service-2.0.0-M20-SNAPSHOT.jar
- *                 |    |
- *                 |    +-- conf/
- *                 |    |    |
- *                 |    |    +-- wrapper.conf
- *                 |    |
- *                 |    +-- bin/
- *                 |    |    |
- *                 |    |    +-- wrapper.exe
- *                 |    |
- *                 |    +-- NOTICE
- *                 |    |
- *                 |    +-- LICENSE
- *                 |    |
- *                 |    +-- Manage ApacheDS.ex
- *                 |   
- *                 +-- header.bmp
- *                 |
- *                 +-- welcome.bmp
- *                 |
- *                 +-- installer.ico
- *                 |
- *                 +-- uninstaller.ico
- *                 |
- *                 +-- installer.nsi
- * </pre>
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class NsisInstallerCommand extends AbstractMojoCommand<NsisTarget>
-{
-    /** The list of windows files */
-    private static final String WRAPPER_EXE_RESOURCE = INSTALLERS_PATH + "wrapper/bin/wrapper-windows-x86-32.exe";
-    private static final String WRAPPER_EXE_FILE = "wrapper.exe";
-    private static final String WRAPPER_DLL_RESOURCE = INSTALLERS_PATH + "wrapper/lib/wrapper-windows-x86-32.dll";
-    private static final String WRAPPER_DLL_FILE = "wrapper.dll";
-    private static final String MANAGE_APACHEDS_EXE = "Manage ApacheDS.exe";
-    private static final String HEADER_BMP = "header.bmp";
-    private static final String WELCOME_BMP = "welcome.bmp";
-    private static final String INSTALLER_ICO = "installer.ico";
-    private static final String UNINSTALLER_ICO = "uninstaller.ico";
-    private static final String INSTALLER_NSI = "installer.nsi";
-    private static final String EXE_EXTENSION = ".exe";
-    private static final String INSTALLATION_FILES = "installationFiles";
-    private static final String INSTANCES_FILES = "instancesFiles";
-
-
-    /**
-     * Creates a new instance of NsisInstallerCommand.
-     *
-     * @param mojo the Server Installers Mojo
-     * @param target the NSIS target
-     */
-    public NsisInstallerCommand( GenerateMojo mojo, NsisTarget target )
-    {
-        super( mojo, target );
-        initializeFilterProperties();
-    }
-
-
-    /**
-     * Performs the following:
-     * <ol>
-     *   <li>Bail if target is not for windows or the NSIS compiler utility can't be found.</li>
-     *   <li>Execute NSIS compiler (makensis) to create the NSIS installer.</li>
-     * </ol>
-     */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        // Verifying the target
-        if ( !verifyTarget() )
-        {
-            return;
-        }
-
-        log.info( "  Creating NSIS installer..." );
-
-        // Creating the target directory
-        File targetDirectory = getTargetDirectory();
-
-        if ( !targetDirectory.mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, targetDirectory ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        log.info( "    Copying NSIS installer files" );
-
-        File installerFile = new File( targetDirectory, INSTALLER_NSI );
-
-        try
-        {
-            // Creating the installation and instance layouts
-            createLayouts();
-
-            // Copying the 'Manage ApacheDS' utility
-            MojoHelperUtils.copyBinaryFile( mojo, MANAGE_APACHEDS_EXE,
-                getClass().getResourceAsStream( MANAGE_APACHEDS_EXE ), new File( getInstallationDirectory(),
-                    MANAGE_APACHEDS_EXE ) );
-
-            // Copying the images and icons
-            MojoHelperUtils.copyBinaryFile( mojo, HEADER_BMP, getClass().getResourceAsStream( HEADER_BMP ),
-                new File(
-                    targetDirectory, HEADER_BMP ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, WELCOME_BMP, getClass().getResourceAsStream( WELCOME_BMP ),
-                new File(
-                    targetDirectory, WELCOME_BMP ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, INSTALLER_ICO, getClass().getResourceAsStream( INSTALLER_ICO ),
-                new File(
-                    targetDirectory, INSTALLER_ICO ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, UNINSTALLER_ICO,
-                getClass().getResourceAsStream( UNINSTALLER_ICO ), new File( targetDirectory, UNINSTALLER_ICO ) );
-
-            // Copying the 'installer.nsi' file
-            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, INSTALLER_NSI, getClass().getResourceAsStream(
-                INSTALLER_NSI ), installerFile, true );
-        }
-        catch ( Exception e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed to copy NSIS installer files." );
-        }
-
-        // Generating the NSIS installer
-        log.info( "    Generating NSIS installer" );
-        Execute createPkgTask = new Execute();
-        String[] cmd = new String[]
-            {
-                mojo.getMakensisUtility().getAbsolutePath(),
-                "-V2" /* V2 means 'only log warnings and errors' */,
-                installerFile.getAbsolutePath() };
-        createPkgTask.setCommandline( cmd );
-        createPkgTask.setWorkingDirectory( targetDirectory );
-
-        try
-        {
-            createPkgTask.execute();
-        }
-        catch ( IOException e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed while trying to generate the NSIS installer: " + e.getMessage() );
-        }
-
-        log.info( "=> NSIS installer generated at "
-            + new File( mojo.getOutputDirectory(), filterProperties.getProperty( FINAL_NAME_PROP ) ) );
-    }
-
-
-    /**
-     * Verifies the target.
-     *
-     * @return
-     *      <code>true</code> if the target is correct, 
-     *      <code>false</code> if not.
-     */
-    private boolean verifyTarget()
-    {
-        // Verifying the target is Mac OS X
-        if ( !target.getOsName().equalsIgnoreCase( Target.OS_NAME_WINDOWS ) )
-        {
-            log.warn( "NSIS installer can only be targeted for Windows platform!" );
-            log.warn( "The build will continue, but please check the the platform of this installer target." );
-            return false;
-        }
-
-        // Verifying the NSIS compiler utility exists
-        if ( !mojo.getMakensisUtility().exists() )
-        {
-            log.warn( "Cannot find NSIS compiler at this location: " + mojo.getMakensisUtility() );
-            log.warn( "The build will continue, but please check the location of your makensis executable." );
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void initializeFilterProperties()
-    {
-        super.initializeFilterProperties();
-
-        String finalName = target.getFinalName();
-
-        if ( !finalName.endsWith( EXE_EXTENSION ) )
-        {
-            finalName = finalName + EXE_EXTENSION;
-        }
-
-        filterProperties.put( FINAL_NAME_PROP, target.getFinalName() );
-        filterProperties.put( INSTALLATION_FILES, INSTALLATION_FILES );
-        filterProperties.put( INSTANCES_FILES, INSTANCES_FILES );
-        filterProperties.put( WRAPPER_JAVA_COMMAND_PROP, "wrapper.java.command=@java.home@\\bin\\java.exe" );
-        filterProperties.put( DOUBLE_QUOTE_PROP, "\"" );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public File getInstallationDirectory()
-    {
-        return new File( getTargetDirectory(), INSTALLATION_FILES );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public File getInstanceDirectory()
-    {
-        return new File( getTargetDirectory(), INSTANCES_FILES + "/" + DEFAULT );
-    }
-
-
-    /**
-     * Copies wrapper files to the installation layout.
-     *
-     * @param mojo The maven plugin Mojo
-     * @throws MojoFailureException If the copy failed
-     */
-    public void copyWrapperFiles( GenerateMojo mojo ) throws MojoFailureException
-    {
-        try
-        {
-            MojoHelperUtils.copyBinaryFile( mojo, WRAPPER_EXE_RESOURCE,
-                getClass().getResourceAsStream( WRAPPER_EXE_RESOURCE ),
-                new File( getInstallationLayout().getBinDirectory(), WRAPPER_EXE_FILE ) );
-
-            MojoHelperUtils.copyBinaryFile( mojo, WRAPPER_DLL_RESOURCE,
-                getClass().getResourceAsStream( WRAPPER_DLL_RESOURCE ), new File( getInstallationLayout()
-                    .getLibDirectory(), WRAPPER_DLL_FILE ) );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoFailureException( "Failed to copy Tanuki binary files to lib and bin directories" );
-        }
-    }
-}

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisTarget.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisTarget.java?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisTarget.java (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisTarget.java Wed Jun 15 12:29:57 2016
@@ -1,41 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.server.installers.nsis;
-
-
-import org.apache.directory.server.installers.Target;
-
-
-/**
- * A Nullsoft Installer System (NSIS) installer for the Windows platform.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class NsisTarget extends Target
-{
-    /**
-     * Creates a new instance of NsisTarget.
-     */
-    public NsisTarget()
-    {
-        setOsName( Target.OS_NAME_WINDOWS );
-        setOsArch( Target.OS_ARCH_X86 );
-    }
-}

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java Wed Jun 15 12:29:57 2016
@@ -1,369 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.server.installers.rpm;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.installers.GenerateMojo;
-import org.apache.directory.server.installers.LinuxInstallerCommand;
-import org.apache.directory.server.installers.MojoHelperUtils;
-import org.apache.directory.server.installers.Target;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.util.FileUtils;
-
-
-/**
- * The IzPack installer command.
- * 
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
-{
-    /** The rpm extension */
-    private static final String DOT_RPM = ".rpm";
-
-    /** The RPM specification file */
-    private static final String APACHEDS_SPEC_FILE = "apacheds.spec";
-
-    /** The names used inside the rpm file */
-    private static final String RPMS = "RPMS";
-    private static final String SOURCES = "SOURCES";
-    private static final String SPECS = "SPECS";
-    private static final String BUILD = "BUILD";
-    private static final String SRPMS = "SRPMS";
-
-
-    /**
-     * Creates a new instance of RpmInstallerCommand.
-     *
-     * @param mojo the Server Installers Mojo
-     * @param target the RPM target
-     */
-    public RpmInstallerCommand( GenerateMojo mojo, RpmTarget target )
-    {
-        super( mojo, target );
-        initializeFilterProperties();
-    }
-
-
-    /**
-     * Performs the following:
-     * <ol>
-     *   <li>Bail if target is not for linux or current machine is not linux (no rpm builder)</li>
-     *   <li>Filter and copy project supplied spec file into place if it has been specified and exists</li>
-     *   <li>If no spec file exists filter and deposite into place bundled spec template</li>
-     *   <li>Bail if we cannot find the rpm builder executable</li>
-     *   <li>Execute rpm build on the filtered spec file</li>
-     * </ol> 
-     */
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        // Verifying the target
-        if ( !verifyTarget() )
-        {
-            return;
-        }
-
-        log.info( "  Creating Rpm installer..." );
-
-        // Creating the target directory
-        if ( !getTargetDirectory().mkdirs() )
-        {
-            Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, getTargetDirectory() ) );
-            log.error( e.getLocalizedMessage() );
-            throw new MojoFailureException( e.getMessage() );
-        }
-
-        log.info( "    Copying Rpm installer files" );
-
-        try
-        {
-            // Create Rpm directories (BUILD, RPMS, SOURCES, SPECS & SRPMS)
-            File rpmBuild = new File( getTargetDirectory(), BUILD );
-
-            if ( !rpmBuild.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmBuild ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            File rpmRpms = new File( getTargetDirectory(), RPMS );
-
-            if ( !rpmRpms.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmRpms ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            File rpmSources = new File( getTargetDirectory(), SOURCES );
-
-            if ( !rpmSources.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmSources ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            File rpmSpecs = new File( getTargetDirectory(), SPECS );
-
-            if ( !rpmSpecs.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmSpecs ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            File rpmSrpms = new File( getTargetDirectory(), SRPMS );
-
-            if ( !rpmSrpms.mkdirs() )
-            {
-                Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, rpmSrpms ) );
-                log.error( e.getLocalizedMessage() );
-                throw new MojoFailureException( e.getMessage() );
-            }
-
-            // Creating the installation and instance layouts
-            createLayouts();
-
-            // Copying the init script for /etc/init.d/
-            MojoHelperUtils.copyAsciiFile( mojo, filterProperties, INSTALLERS_PATH + ETC_INITD_SCRIPT,
-                getClass().getResourceAsStream( INSTALLERS_PATH + ETC_INITD_SCRIPT ),
-                new File( getAdsSourcesDirectory(), ETC_INITD_SCRIPT ), true );
-
-            // Creating the spec file
-            createSpecFile();
-
-            // Generating tar.gz file
-            MojoHelperUtils.exec( new String[]
-                {
-                    TAR,
-                    "-zcf",
-                    APACHEDS_DASH + getVersion() + ".tar.gz",
-                    APACHEDS_DASH + getVersion()
-            },
-                new File( getTargetDirectory(), "/" + SOURCES ),
-                false );
-        }
-        catch ( Exception e )
-        {
-            log.error( e.getMessage() );
-            throw new MojoFailureException( "Failed to copy Rpm installer files." );
-        }
-
-        // Generating the Rpm
-        log.info( "    Generating Rpm installer" );
-
-        MojoHelperUtils.exec( new String[]
-            {
-                mojo.getRpmbuildUtility().getAbsolutePath(),
-                "--quiet",
-                "-ba",
-                "--target",
-                target.getOsArch() + "-linux",
-                "--define",
-                "_topdir " + getTargetDirectory(),
-                "--define",
-                "_tmppath /tmp",
-                SPECS + "/" + APACHEDS_SPEC_FILE
-        },
-            getTargetDirectory(),
-            false );
-
-        // Copying the rpm at the final destination
-        try
-        {
-            String rpmName = APACHEDS_DASH + getVersion() + "-1." + target.getOsArch() + DOT_RPM;
-            String finalName = target.getFinalName();
-
-            if ( !finalName.endsWith( DOT_RPM ) )
-            {
-                finalName = finalName + DOT_RPM;
-            }
-
-            File finalFile = new File( mojo.getOutputDirectory(), finalName );
-
-            FileUtils.copyFile( new File( getTargetDirectory(), RPMS + "/" + target.getOsArch() + "/" + rpmName ),
-                finalFile );
-
-            log.info( "=> RPM generated at " + finalFile );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoFailureException( "Failed to copy generated Rpm installer file." );
-        }
-    }
-
-
-    /**
-     * Verifies the target.
-     *
-     * @return
-     *      <code>true</code> if the target is correct, 
-     *      <code>false</code> if not.
-     */
-    private boolean verifyTarget()
-    {
-        // Verifying the target is Linux
-        if ( !target.isOsNameLinux() )
-        {
-            log.warn( "Rpm installer can only be targeted for Linux platforms!" );
-            log.warn( "The build will continue, but please check the the platform of this installer target" );
-            return false;
-        }
-
-        // Verifying the currently used OS to build the installer is Linux or Mac OS X
-        String osName = System.getProperty( OS_NAME );
-
-        if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( osName ) || Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( osName ) ) )
-        {
-            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." );
-            return false;
-        }
-
-        // Verifying the rpmbuild utility exists
-        if ( !mojo.getRpmbuildUtility().exists() )
-        {
-            log.warn( "Cannot find rpmbuild utility at this location: " + mojo.getRpmbuildUtility() );
-            log.warn( "The build will continue, but please check the location of your rpmbuild utility." );
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void initializeFilterProperties()
-    {
-        super.initializeFilterProperties();
-
-        filterProperties.put( INSTALLATION_DIRECTORY_PROP, OPT_APACHEDS_DIR + getVersion() );
-        filterProperties.put( INSTANCES_DIRECTORY_PROP, VAR_LIB_APACHEDS_DIR + getVersion() );
-        filterProperties.put( DEFAULT_INSTANCE_NAME_PROP, DEFAULT );
-        filterProperties.put( USER_PROP, APACHEDS );
-        filterProperties.put( GROUP_PROP, APACHEDS );
-        filterProperties.put( WRAPPER_JAVA_COMMAND_PROP, WRAPPER_JAVA_COMMAND );
-        filterProperties.put( DOUBLE_QUOTE_PROP, "" );
-        filterProperties.put( VERSION_PROP, getVersion() );
-    }
-
-
-    /**
-     * Creates the spec file.
-     * 
-     * @throws IOException 
-     */
-    private void createSpecFile() throws IOException
-    {
-        // Creating two strings for libraries
-        StringBuilder installLibs = new StringBuilder();
-        StringBuilder filesLibs = new StringBuilder();
-
-        // Getting the lib directory
-        File libDirectory = getInstallationLayout().getLibDirectory();
-
-        if ( libDirectory.exists() )
-        {
-            // Iterating on each file in the lib directory
-            for ( File file : libDirectory.listFiles() )
-            {
-                if ( file.isFile() )
-                {
-                    installLibs.append( "install -m 644 " + getBuidDirectory() + "/%{name}-%{version}/server/lib/"
-                        + file.getName() + " $RPM_BUILD_ROOT%{adshome}/lib/" + file.getName() + "\n" );
-                    filesLibs.append( "%{adshome}/lib/" + file.getName() + "\n" );
-                }
-            }
-        }
-
-        // Creating properties based on these values
-        Properties properties = new Properties();
-        properties.put( VERSION_PROP, getVersion() );
-        properties.put( "build.dir", getBuidDirectory() );
-        properties.put( "install.libs", installLibs.toString() );
-        properties.put( "files.libs", filesLibs.toString() );
-
-        // Copying and filtering the spec file
-        MojoHelperUtils.copyAsciiFile( mojo, properties, APACHEDS_SPEC_FILE,
-            getClass().getResourceAsStream( APACHEDS_SPEC_FILE ),
-            new File( getTargetDirectory(), SPECS + "/" + APACHEDS_SPEC_FILE ), true );
-    }
-
-
-    /**
-     * Gets the 'apacheds-${version}' directory inside 'SOURCES'.
-     *
-     * @return the 'apacheds-${version}' directory inside 'SOURCES'
-     */
-    private File getAdsSourcesDirectory()
-    {
-        return new File( getTargetDirectory(), SOURCES + "/" + APACHEDS_DASH + getVersion() );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public File getInstallationDirectory()
-    {
-        return new File( getAdsSourcesDirectory(), "server" );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public File getInstanceDirectory()
-    {
-        return new File( getAdsSourcesDirectory(), INSTANCE_DEFAULT_DIR );
-    }
-
-
-    /**
-     * Gets the version number.
-     *
-     * @return the version number
-     */
-    private String getVersion()
-    {
-        return mojo.getProject().getVersion().replace( '-', '_' );
-    }
-
-
-    /**
-     * Gets the BUILD directory path.
-     *
-     * @return the BUILD directory path
-     */
-    private String getBuidDirectory()
-    {
-        return getTargetDirectory().getAbsolutePath() + "/" + BUILD;
-    }
-}

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmTarget.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmTarget.java?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmTarget.java (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmTarget.java Wed Jun 15 12:29:57 2016
@@ -1,41 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.server.installers.rpm;
-
-
-import org.apache.directory.server.installers.Target;
-
-
-/**
- * An Rpm package target. The default OsName parameter is Linux.
- * 
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class RpmTarget extends Target
-{
-    /**
-     * Creates a new instance of RpmTarget.
-     */
-    public RpmTarget()
-    {
-        setOsName( Target.OS_NAME_LINUX );
-        setOsArch( Target.OS_ARCH_I386 );
-    }
-}

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE Wed Jun 15 12:29:57 2016
@@ -1,364 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---------------------------------------------------------------------------------------------------
-ANTLR 2 License
-
-We reserve no legal rights to the ANTLR--it is fully in the public domain. An individual or company
-may do whatever they wish with source code distributed with ANTLR or the code generated by ANTLR,
-including the incorporation of ANTLR, or its output, into commerical software.
-
-We encourage users to develop software with ANTLR. However, we do ask that credit is given to us
-for developing ANTLR. By "credit", we mean that if you use ANTLR or incorporate any source code
-into one of your programs (commercial product, research project, or otherwise) that you acknowledge
-this fact somewhere in the documentation, research report, etc... If you like ANTLR and have developed
-a nice tool with the output, please mention that you developed it using ANTLR. In addition, we ask that
-the headers remain intact in our source code. As long as these guidelines are kept, we expect to
-continue enhancing this system and expect to make other tools available as they are completed.
-
---------------------------------------------------------------------------------------------------
-/**
- * JDBM LICENSE v1.00
- *
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- *    statements and notices.  Redistributions must also contain a
- *    copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions and the
- *    following disclaimer in the documentation and/or other
- *    materials provided with the distribution.
- *
- * 3. The name "JDBM" must not be used to endorse or promote
- *    products derived from this Software without prior written
- *    permission of Cees de Groot.  For written permission,
- *    please contact cg@cdegroot.com.
- *
- * 4. Products derived from this Software may not be called "JDBM"
- *    nor may "JDBM" appear in their names without prior written
- *    permission of Cees de Groot.
- *
- * 5. Due credit should be given to the JDBM Project
- *    (http://jdbm.sourceforge.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE JDBM PROJECT AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * CEES DE GROOT OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2000 (C) Cees de Groot. All Rights Reserved.
- * Contributions are Copyright (C) 2000 by their associated contributors.
- *
- * $Id: LICENSE.txt,v 1.1 2000/05/05 23:59:52 boisvert Exp $
- */
---------------------------------------------------------------------------------------------------
-Copyright (c) 2000-2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-==================================================================================================
-slf4j 1.7.10 license:
---------------------------------------------------------------------------------------------------
-Copyright (c) 2004-2013 QOS.ch 
-All rights reserved. 
-
-Permission is hereby granted, free  of charge, to any person obtaining 
-a  copy  of this  software  and  associated  documentation files  (the 
-"Software"), to  deal in  the Software without  restriction, including 
-without limitation  the rights to  use, copy, modify,  merge, publish, 
-distribute,  sublicense, and/or sell  copies of  the Software,  and to 
-permit persons to whom the Software  is furnished to do so, subject to 
-the following conditions: 
-
-The  above  copyright  notice  and  this permission  notice  shall  be 
-included in all copies or substantial portions of the Software. 
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND, 
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND 
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION 
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------------------------
-Copyright (c) 1999, 2004 Tanuki Software
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of the Java Service Wrapper and associated
-documentation files (the "Software"), to deal in the Software
-without  restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license,
-and/or sell copies of the Software, and to permit persons to
-whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
-Portions of the Software have been derived from source code
-developed by Silver Egg Technology under the following license:
-
-Copyright (c) 2001 Silver Egg Technology
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sub-license, and/or
-sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-==========================================================================
-For the AVL Set code : http://bobah.net/d4d/source-code/misc/java-avl-tree
---------------------------------------------------------------------------
-Copyright 2001-2014 Vladimir Lysyy
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this source code except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-

Modified: directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE?rev=1748572&r1=1748571&r2=1748572&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE (original)
+++ directory/apacheds/branches/apacheds-value/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE Wed Jun 15 12:29:57 2016
@@ -1,6 +0,0 @@
-
-Apache Directory Server
-Copyright 2003-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).