directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r372403 - in /directory/trunks: apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izp...
Date Thu, 26 Jan 2006 02:27:47 GMT
Author: akarasulu
Date: Wed Jan 25 18:27:35 2006
New Revision: 372403

URL: http://svn.apache.org/viewcvs?rev=372403&view=rev
Log:
changes ...

 o license file and code to place it - need config option (ASL 2.0 as Default)
 o readme file and code to place it - need config option (Bogus default readme)
 o app icon and code tp place it with config option (Default service icon)
 o add override for various izPackFiles
    - install.xml
    - shortcuts_windows.xml
    - shortcuts_unix.xml
    - user_input.xml
 o refactor code so each installer has its own package and resources in that package


Added:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java
  (contents, props changed)
      - copied, changed from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackInstallerCommand.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackTarget.java
      - copied, changed from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackTarget.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/LICENSE.txt
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/ShellLink.dll
  (props changed)
      - copied unchanged from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/ShellLink.dll
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_shortcuts_unix.xml
  (props changed)
      - copied unchanged from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_shortcuts_unix.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_shortcuts_windows.xml
      - copied unchanged from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_shortcuts_windows.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_unix_template.xml
      - copied unchanged from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_unix_template.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_user_input.xml
  (props changed)
      - copied unchanged from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_user_input.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_windows_template.xml
  (props changed)
      - copied unchanged from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_windows_template.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/logo.png
  (with props)
Removed:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackInstallerCommand.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackTarget.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/ShellLink.dll
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_shortcuts_unix.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_shortcuts_windows.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_unix_template.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_user_input.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_windows_template.xml
Modified:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImageCommand.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/MojoHelperUtils.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
    directory/trunks/mina/filter-ssl/pom.xml

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImageCommand.java?rev=372403&r1=372402&r2=372403&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImageCommand.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImageCommand.java
Wed Jan 25 18:27:35 2006
@@ -74,6 +74,64 @@
         File dir = new File( mymojo.getOutputDirectory(), target.getId() );
         layout = new InstallationLayout( dir );
         layout.mkdirs();
+
+
+        // copy over the read me file if present otherwise use the bundled copy
+        if ( mymojo.getReadmeFile().exists() )
+        {
+            File readmeTarget = layout.getReadmeFile( mymojo.getReadmeFile().getName() );
+            try
+            {
+                FileUtils.copyFile( mymojo.getReadmeFile(), readmeTarget );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy read me file " + mymojo.getReadmeFile()
+                    + " into position " + readmeTarget );
+            }
+        }
+        
+        // copy over the license file if present otherwise use the bundled copy
+        if ( mymojo.getLicenseFile().exists() )
+        {
+            File licenseTarget = layout.getLicenseFile( mymojo.getLicenseFile().getName()
);
+            try
+            {
+                FileUtils.copyFile( mymojo.getLicenseFile(), licenseTarget );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy license file " + mymojo.getLicenseFile()
+                    + " into position " + licenseTarget );
+            }
+        }
+        
+        // copy over the license file if present otherwise use the bundled copy
+        File iconTarget = layout.getLogoIconFile( mymojo.getApplicationIcon().getName() );
+        if ( mymojo.getApplicationIcon().exists() )
+        {
+            try
+            {
+                FileUtils.copyFile( mymojo.getApplicationIcon(), iconTarget );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy icon file " + mymojo.getApplicationIcon()
+                    + " into position " + iconTarget );
+            }
+        }
+        else
+        {
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "logo.png"
), iconTarget );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy icon file " + getClass().getResource(
"logo.png" )
+                    + " into position " + iconTarget );
+            }
+        }
         
         // copy over the REQUIRED bootstrapper.jar file 
         try
@@ -151,6 +209,10 @@
                     + " into position " + layout.getConfigurationFile(), e );
             }
         }
+        
+        // -------------------------------------------------------------------
+        // Copy OS Specific Files 
+        // -------------------------------------------------------------------
         
         // now copy over the jsvc executable renaming it to the applicationName 
         if ( target.getOsName().equals( "linux" ) && 

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/MojoHelperUtils.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/MojoHelperUtils.java?rev=372403&r1=372402&r2=372403&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/MojoHelperUtils.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/MojoHelperUtils.java
Wed Jan 25 18:27:35 2006
@@ -18,6 +18,7 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -45,7 +46,7 @@
  */
 public class MojoHelperUtils
 {
-    static void copyBinaryFile( InputStream from, File to ) throws IOException
+    public static void copyBinaryFile( InputStream from, File to ) throws IOException
     {
         FileOutputStream out = null;
         try 
@@ -61,7 +62,7 @@
     }
     
     
-    static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties,
InputStream from, 
+    public static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties,
InputStream from, 
         File to, boolean filtering ) throws IOException
     {
         // buffer so it isn't reading a byte at a time!
@@ -113,7 +114,14 @@
     }
 
 
-    static void copyDependencies( ServiceInstallersMojo mymojo, InstallationLayout layout
) throws MojoFailureException
+    public static void copyAsciiFile( ServiceInstallersMojo mymojo, Properties filterProperties,
File from, 
+        File to, boolean filtering ) throws IOException
+    {
+        copyAsciiFile( mymojo, filterProperties, new FileInputStream( from ), to, filtering
);
+    }
+
+
+    public static void copyDependencies( ServiceInstallersMojo mymojo, InstallationLayout
layout ) throws MojoFailureException
     {
         Artifact artifact = null;
         Iterator artifacts = mymojo.getProject().getRuntimeArtifacts().iterator();

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java?rev=372403&r1=372402&r2=372403&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
Wed Jan 25 18:27:35 2006
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.server.standalone.installers.izpack.IzPackInstallerCommand;
+import org.apache.directory.server.standalone.installers.izpack.IzPackTarget;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -119,6 +121,11 @@
     private String applicationDescription;
 
     /**
+     * @parameter expression="src/main/installers/logo.png"
+     */
+    private File applicationIcon;
+
+    /**
      * @parameter
      */
     private String encoding;
@@ -128,6 +135,16 @@
      */
     private Set excludes;
 
+    /**
+     * @parameter expression="LICENSE.txt"
+     */
+    private File licenseFile;
+
+    /**
+     * @parameter expression="README.txt"
+     */
+    private File readmeFile;
+
     /** daemon bootstrapper */
     private Artifact bootstrapper;
     /** logging API need by bootstraper */
@@ -374,5 +391,23 @@
     public String getApplicationDescription()
     {
         return this.applicationDescription;
+    }
+    
+    
+    public File getApplicationIcon()
+    {
+        return this.applicationIcon;
+    }
+    
+    
+    public File getReadmeFile()
+    {
+        return this.readmeFile;
+    }
+    
+    
+    public File getLicenseFile()
+    {
+        return this.licenseFile;
     }
 }

Copied: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java
(from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackInstallerCommand.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java?p2=directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java&p1=directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackInstallerCommand.java&r1=372286&r2=372403&rev=372403&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackInstallerCommand.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java
Wed Jan 25 18:27:35 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.directory.server.standalone.installers;
+package org.apache.directory.server.standalone.installers.izpack;
 
 
 import java.io.File;
@@ -22,6 +22,9 @@
 import java.util.Properties;
 
 import org.apache.directory.server.standalone.daemon.InstallationLayout;
+import org.apache.directory.server.standalone.installers.MojoCommand;
+import org.apache.directory.server.standalone.installers.MojoHelperUtils;
+import org.apache.directory.server.standalone.installers.ServiceInstallersMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.tools.ant.Project;
@@ -52,7 +55,7 @@
     private File izPackBase;
     
     
-    IzPackInstallerCommand( ServiceInstallersMojo mymojo, IzPackTarget target, InstallationLayout
layout )
+    public IzPackInstallerCommand( ServiceInstallersMojo mymojo, IzPackTarget target, InstallationLayout
layout )
     {
         this.target = target;
         this.layout = layout;
@@ -71,7 +74,7 @@
     
     public void execute() throws MojoExecutionException, MojoFailureException
     {
-        generateInstallerFiles( target, layout );
+        doIzPackFiles();
         Project antProject = new Project();
         IzPackTask task = new IzPackTask();
         task.setBasedir( izPackBase.getPath() );
@@ -81,36 +84,103 @@
         task.setTaskName( "izpack" );
         task.execute();
     }
-
-
-    private void generateInstallerFiles( IzPackTarget target, InstallationLayout layout )
throws MojoFailureException
+    
+    
+    private void doIzPackFiles() throws MojoFailureException
     {
+        // -------------------------------------------------------------------
+        // For windows we include use a different template file than for unix
+        // if the project does not supply one.  We also add the windows short-
+        // cuts file template as well in the same fashion.  Also a native dll
+        // is deposited outside of the image folder to create windows shortcuts
+        // -------------------------------------------------------------------
+
         if ( target.getOsFamily().equals( "windows" ) )
         {
-            try
-            {
-                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                    getClass().getResourceAsStream( "izpack_install_windows_template.xml"
), izPackInput, true );
-            }
-            catch ( IOException e )
+            // handle the installer file
+            if ( target.getIzPackInstallFile().exists() )
             {
-                mymojo.getLog().error( "Failed to copy izpack input file "  
-                    + getClass().getResource( "izpack_install_windows_template.xml" )
-                    + " into position " + izPackInput, e );
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        target.getIzPackInstallFile(), izPackInput, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy project supplied izpack install
file template "  
+                        + target.getIzPackInstallFile() + " into position " + izPackInput,
e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using project supplied installer configuration
file: " 
+                        + target.getIzPackInstallFile() );
+                }
+            }
+            else
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        getClass().getResourceAsStream( "izpack_install_windows_template.xml"
), izPackInput, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy bundled izpack windows install
file "  
+                        + getClass().getResource( "izpack_install_windows_template.xml" )
+                        + " into position " + izPackInput, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using bundled installer configuration file: "

+                        + getClass().getResource( "izpack_install_windows_template.xml" )
);
+                }
+            }
+
+            // handle the windows shortcuts file 
+            if ( target.getIzPackShortcutsWindowsFile().exists() )
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        target.getIzPackShortcutsWindowsFile(), izPackWindowsShortcuts, true
);
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy project supplied izpack windows
shortcuts file "  
+                        + target.getIzPackShortcutsWindowsFile()
+                        + " into position " + izPackWindowsShortcuts, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using project supplied windows shortcuts configuration
file: " 
+                        + target.getIzPackShortcutsWindowsFile() );
+                }
+            }
+            else
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        getClass().getResourceAsStream( "izpack_install_shortcuts_windows.xml"
), izPackWindowsShortcuts, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy bundled izpack windows shortcuts
file "  
+                        + getClass().getResource( "izpack_install_shortcuts_windows.xml"
)
+                        + " into position " + izPackWindowsShortcuts, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using bundled windows shortcuts configuration
file: " 
+                        + getClass().getResource( "izpack_install_shortcuts_windows.xml"
) );
+                }
             }
-
-            try
-            {
-                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                    getClass().getResourceAsStream( "izpack_install_shortcuts_windows.xml"
), izPackWindowsShortcuts, true );
-            }
-            catch ( IOException e )
-            {
-                mymojo.getLog().error( "Failed to copy izpack windows shortcuts file "  
-                    + getClass().getResource( "izpack_install_shortcuts_windows.xml" )
-                    + " into position " + izPackWindowsShortcuts, e );
-            }
-
+            
+            // copy the ShellLink creation dll into the images folder
             try
             {
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "ShellLink.dll"
), shellLinkDll );
@@ -124,53 +194,140 @@
         }
         else if ( target.getOsFamily().equals( "unix" ) || target.getOsFamily().equals( "mac"
) )
         {
+            if ( target.getIzPackInstallFile().exists() )
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        target.getIzPackInstallFile(), izPackInput, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy project supplied izpack input
file "  
+                        + target.getIzPackInstallFile()
+                        + " into position " + izPackInput, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using project supplied installer configuration
file: " 
+                        + target.getIzPackInstallFile() );
+                }
+            }
+            else
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        getClass().getResourceAsStream( "izpack_install_unix_template.xml"
), izPackInput, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy bundled izpack input file for
unix "  
+                        + getClass().getResource( "izpack_install_unix_template.xml" )
+                        + " into position " + izPackInput, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using bundled installer configuration file: "

+                        + getClass().getResource( "izpack_install_unix_template.xml" ) );
+                }
+            }
+
+            if ( target.getIzPackShortcutsUnixFile().exists() )
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        target.getIzPackShortcutsUnixFile(), izPackUnixShortcuts, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy project supplied izpack unix shortcuts
file "  
+                        + target.getIzPackShortcutsUnixFile()
+                        + " into position " + izPackUnixShortcuts, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using project supplied unix shortcuts configuration
file: " 
+                        + target.getIzPackShortcutsUnixFile() );
+                }
+            }
+            else
+            {
+                try
+                {
+                    MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                        getClass().getResourceAsStream( "izpack_install_shortcuts_unix.xml"
), izPackUnixShortcuts, true );
+                }
+                catch ( IOException e )
+                {
+                    mymojo.getLog().error( "Failed to copy bundled izpack unix shortcuts
file "  
+                        + getClass().getResource( "izpack_install_shortcuts_unix.xml" )
+                        + " into position " + izPackUnixShortcuts, e );
+                }
+                
+                if ( mymojo.getLog().isInfoEnabled() )
+                {
+                    mymojo.getLog().info( "Using bundled unix shortcuts configuration file:
" 
+                        + getClass().getResource( "izpack_install_shortcuts_unix.xml" ) );
+                }
+            }
+
             try
             {
                 MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                    getClass().getResourceAsStream( "izpack_install_unix_template.xml" ),
izPackInput, true );
+                    getClass().getResourceAsStream( "../template.init" ), layout.getInitScript(),
true );
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to copy izpack input file "  
-                    + getClass().getResource( "izpack_install_unix_template.xml" )
-                    + " into position " + izPackInput, e );
+                mymojo.getLog().error( "Failed to copy init script "  
+                    + getClass().getResource( "../template.init" )
+                    + " into position " + layout.getInitScript(), e );
             }
+        }
 
+        if ( target.getIzPackUserInputFile().exists() )
+        {
             try
             {
                 MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                    getClass().getResourceAsStream( "izpack_install_shortcuts_unix.xml" ),
izPackUnixShortcuts, true );
+                    target.getIzPackUserInputFile(), izPackUserInput, true );
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to copy izpack unix shortcuts file "  
-                    + getClass().getResource( "izpack_install_shortcuts_unix.xml" )
-                    + " into position " + izPackUnixShortcuts, e );
+                mymojo.getLog().error( "Failed to copy project supplied izpack input file
"  
+                    + target.getIzPackUserInputFile()
+                    + " into position " + izPackUserInput, e );
             }
-
+            
+            if ( mymojo.getLog().isInfoEnabled() )
+            {
+                mymojo.getLog().info( "Using project supplied user input configuration file:
" 
+                    + target.getIzPackUserInputFile() );
+            }
+        }
+        else
+        {
             try
             {
                 MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                    getClass().getResourceAsStream( "template.init" ), layout.getInitScript(),
true );
+                    getClass().getResourceAsStream( "izpack_install_user_input.xml" ), izPackUserInput,
true );
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to copy init script "  
-                    + getClass().getResource( "template.init" )
-                    + " into position " + layout.getInitScript(), e );
+                mymojo.getLog().error( "Failed to copy bundled izpack input file "  
+                    + getClass().getResource( "izpack_install_user_input.xml" )
+                    + " into position " + izPackUserInput, e );
+            }
+            
+            if ( mymojo.getLog().isInfoEnabled() )
+            {
+                mymojo.getLog().info( "Using bundled user input configuration file: " 
+                    + target.getIzPackUserInputFile() );
             }
-        }
-
-        try
-        {
-            MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                getClass().getResourceAsStream( "izpack_install_user_input.xml" ), izPackUserInput,
true );
-        }
-        catch ( IOException e )
-        {
-            mymojo.getLog().error( "Failed to copy izpack input file "  
-                + getClass().getResource( "izpack_install_user_input.xml" )
-                + " into position " + izPackUserInput, e );
         }
     }
 
@@ -205,20 +362,17 @@
         // izpack compiler will barf if these files are not present
         // files which are user specified also from mojo
         // these files need to be copied to the image folder of the target
-        if ( ! layout.getLicenseFile().exists() )
-        {
-            touchFile( layout.getLicenseFile() );
-        }
+        
+        // this one is installed or a defualt is installed by create image command
         filterProperties.put( "app.license" , layout.getLicenseFile().getPath() );
+
         if ( ! layout.getReadmeFile().exists() )
         {
             touchFile( layout.getReadmeFile() );
         }
         filterProperties.put( "app.readme" , layout.getReadmeFile().getPath() );
-        if ( ! layout.getLogoIconFile().exists() )
-        {
-            touchFile( layout.getLogoIconFile() );
-        }
+
+        // this one is installed or a default is installed by create image command
         filterProperties.put( "app.icon" , layout.getLogoIconFile().getPath() );
         
         // generated files

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackTarget.java
(from r372286, directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackTarget.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackTarget.java?p2=directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackTarget.java&p1=directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackTarget.java&r1=372286&r2=372403&rev=372403&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/IzPackTarget.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackTarget.java
Wed Jan 25 18:27:35 2006
@@ -14,7 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.directory.server.standalone.installers;
+package org.apache.directory.server.standalone.installers.izpack;
+
+import java.io.File;
+
+import org.apache.directory.server.standalone.installers.Target;
 
 
 /**
@@ -25,5 +29,56 @@
  */
 public class IzPackTarget extends Target
 {
+    private File izPackInstallFile;
+    private File izPackShortcutsWindowsFile;
+    private File izPackShortcutsUnixFile;
+    private File izPackUserInputFile;
+    
+    
+    public void setIzPackInstallFile(File izPackInstallFile)
+    {
+        this.izPackInstallFile = izPackInstallFile;
+    }
+    
+    
+    public File getIzPackInstallFile()
+    {
+        return izPackInstallFile;
+    }
+    
+    
+    public void setIzPackShortcutsWindowsFile(File izPackShortcutsWindowsFile)
+    {
+        this.izPackShortcutsWindowsFile = izPackShortcutsWindowsFile;
+    }
+    
+    
+    public File getIzPackShortcutsWindowsFile()
+    {
+        return izPackShortcutsWindowsFile;
+    }
+    
+    
+    public void setIzPackShortcutsUnixFile(File izPackShortcutsUnixFile)
+    {
+        this.izPackShortcutsUnixFile = izPackShortcutsUnixFile;
+    }
+    
+    
+    public File getIzPackShortcutsUnixFile()
+    {
+        return izPackShortcutsUnixFile;
+    }
+    
+    
+    public void setIzPackUserInputFile(File izPackUserInputFile)
+    {
+        this.izPackUserInputFile = izPackUserInputFile;
+    }
+    
     
+    public File getIzPackUserInputFile()
+    {
+        return izPackUserInputFile;
+    }
 }

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/LICENSE.txt?rev=372403&view=auto
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/LICENSE.txt
(added)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/LICENSE.txt
Wed Jan 25 18:27:35 2006
@@ -0,0 +1,18 @@
+/*
+ *                                 Apache License
+ *                           Version 2.0, January 2004
+ *                        http://www.apache.org/licenses/
+ *
+ *   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.
+ *
+ */

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/ShellLink.dll
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_shortcuts_unix.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_user_input.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack/izpack_install_windows_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/logo.png
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/logo.png?rev=372403&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/trunks/mina/filter-ssl/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/filter-ssl/pom.xml?rev=372403&r1=372402&r2=372403&view=diff
==============================================================================
--- directory/trunks/mina/filter-ssl/pom.xml (original)
+++ directory/trunks/mina/filter-ssl/pom.xml Wed Jan 25 18:27:35 2006
@@ -14,7 +14,7 @@
 
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
-      <artifactId>org.apache.mina</artifactId>
+      <artifactId>mina-core</artifactId>
       <version>0.9.1-SNAPSHOT</version>
     </dependency>
 



Mime
View raw message