directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r372101 - in /directory/trunks/apacheds/standalone/installers/plugin/src/main: java/org/apache/directory/server/standalone/installers/ resources/org/apache/directory/server/standalone/installers/
Date Wed, 25 Jan 2006 04:36:23 GMT
Author: akarasulu
Date: Tue Jan 24 20:36:16 2006
New Revision: 372101

URL: http://svn.apache.org/viewcvs?rev=372101&view=rev
Log:
got the izpack compiler generating the installers at least for linux

Added:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/ShellLink.dll
  (with props)
    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_windows_template.xml
      - copied, changed from r372075, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_template.xml
Removed:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_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/IzPackInstallerCommand.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init

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=372101&r1=372100&r2=372101&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
Tue Jan 24 20:36:16 2006
@@ -130,22 +130,6 @@
             }
         }
         
-        // copy over the init script template
-        if ( target.getOsFamily().equals( "unix" ) )
-        {
-            try
-            {
-                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                    getClass().getResourceAsStream( "template.init" ), layout.getInitScript(),
true );
-            }
-            catch ( IOException e )
-            {
-                mymojo.getLog().error( "Failed to copy server configuration file "  
-                    + target.getServerConfigurationFile()
-                    + " into position " + layout.getInitScript(), e );
-            }
-        }
-        
         // now copy over the jsvc executable renaming it to the applicationName 
         if ( target.getOsName().equals( "linux" ) && 
              target.getOsArch().equals( "i386" ) )

Modified: 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/IzPackInstallerCommand.java?rev=372101&r1=372100&r2=372101&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/IzPackInstallerCommand.java
Tue Jan 24 20:36:16 2006
@@ -48,6 +48,8 @@
     private File izPackWindowsShortcuts;
     private File izPackUnixShortcuts;
     private File izPackOutput;
+    private File shellLinkDll;
+    private File izPackBase;
     
     
     IzPackInstallerCommand( ServiceInstallersMojo mymojo, IzPackTarget target, InstallationLayout
layout )
@@ -55,22 +57,14 @@
         this.target = target;
         this.layout = layout;
         this.mymojo = mymojo;
-        
-        izPackOutput = layout.getBaseDirectory().getParentFile();
-        izPackOutput = new File( izPackOutput, target.getId() + "_izpack_installer.jar" );
-        
-        izPackInput = layout.getBaseDirectory().getParentFile();
-        izPackInput = new File( izPackInput, target.getId() + "_izpack_install.xml" );
-        
-        izPackUserInput = layout.getBaseDirectory().getParentFile();
-        izPackUserInput = new File( izPackUserInput, target.getId() + "_izpack_install_user_input.xml"
);
-        
-        izPackWindowsShortcuts = layout.getBaseDirectory().getParentFile();
-        izPackWindowsShortcuts = new File( izPackWindowsShortcuts, target.getId() + "_izpack_windows_shortcuts.xml"
);
-        
-        izPackUnixShortcuts = layout.getBaseDirectory().getParentFile();
-        izPackUnixShortcuts = new File( izPackUnixShortcuts, target.getId() + "_izpack_unix_shortcuts.xml"
);
-        
+        File imageDir = layout.getBaseDirectory().getParentFile();
+        izPackBase = new File( imageDir, target.getId() );
+        izPackOutput = new File( imageDir, target.getId() + "_izpack_installer.jar" );
+        izPackInput = new File( imageDir, target.getId() + "_izpack_install.xml" );
+        izPackUserInput = new File( imageDir, target.getId() + "_izpack_install_user_input.xml"
);
+        izPackWindowsShortcuts = new File( imageDir, target.getId() + "_izpack_windows_shortcuts.xml"
);
+        izPackUnixShortcuts = new File( imageDir, target.getId() + "_izpack_unix_shortcuts.xml"
);
+        shellLinkDll = new File( imageDir, "ShellLink.dll" );
         initializeFiltering();
     }
     
@@ -80,7 +74,7 @@
         generateInstallerFiles( target, layout );
         Project antProject = new Project();
         IzPackTask task = new IzPackTask();
-        task.setBasedir( layout.getBaseDirectory().getParent() );
+        task.setBasedir( izPackBase.getPath() );
         task.setProject( antProject );
         task.setInput( izPackInput.getPath() );
         task.setOutput( izPackOutput.getPath() );
@@ -91,16 +85,80 @@
 
     private void generateInstallerFiles( IzPackTarget target, InstallationLayout layout )
throws MojoFailureException
     {
-        try
+        if ( target.getOsFamily().equals( "windows" ) )
         {
-            MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                getClass().getResourceAsStream( "izpack_install_template.xml" ), izPackInput,
true );
-        }
-        catch ( IOException e )
-        {
-            mymojo.getLog().error( "Failed to copy izpack input file "  
-                + getClass().getResource( "izpack_install_template.xml" )
-                + " into position " + izPackInput, e );
+            try
+            {
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                    getClass().getResourceAsStream( "izpack_install_windows_template.xml"
), izPackInput, true );
+            }
+            catch ( IOException e )
+            {
+                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, 
+                    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 );
+            }
+
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "ShellLink.dll"
), shellLinkDll );
+            }
+            catch ( IOException e )
+            {
+                mymojo.getLog().error( "Failed to copy izpack shellLinkDll file "  
+                    + getClass().getResource( "ShellLink.dll" )
+                    + " into position " + shellLinkDll, e );
+            }
+        }
+        else if ( target.getOsFamily().equals( "unix" ) || target.getOsFamily().equals( "mac"
) )
+        {
+            try
+            {
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                    getClass().getResourceAsStream( "izpack_install_unix_template.xml" ),
izPackInput, true );
+            }
+            catch ( IOException e )
+            {
+                mymojo.getLog().error( "Failed to copy izpack input file "  
+                    + getClass().getResource( "izpack_install_unix_template.xml" )
+                    + " into position " + izPackInput, e );
+            }
+
+            try
+            {
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                    getClass().getResourceAsStream( "izpack_install_shortcuts_unix.xml" ),
izPackUnixShortcuts, 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 );
+            }
+
+            try
+            {
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                    getClass().getResourceAsStream( "template.init" ), layout.getInitScript(),
true );
+            }
+            catch ( IOException e )
+            {
+                mymojo.getLog().error( "Failed to copy init script "  
+                    + getClass().getResource( "template.init" )
+                    + " into position " + layout.getInitScript(), e );
+            }
         }
 
         try
@@ -114,30 +172,6 @@
                 + getClass().getResource( "izpack_install_user_input.xml" )
                 + " into position " + izPackUserInput, e );
         }
-
-        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 );
-        }
-
-        try
-        {
-            MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
-                getClass().getResourceAsStream( "izpack_install_shortcuts_unix.xml" ), izPackUnixShortcuts,
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 );
-        }
     }
 
 
@@ -158,25 +192,6 @@
             filterProperties.put( "app.init.message", mymojo.getApplicationDescription()
);
         }
 
-/*
-optional properties from mojo but should default:
-${app.author}
-${app.email}
-${app.url}
-${app.java.version}
-
-files which are user specified also from mojo:
-${app.license}
-${app.readme}
-${app.icon}
-
-files generated:
-${windows.shortcuts}
-${unix.shortcuts}
-${user.input}
-${image.basedir}
-${server.init}
-*/
         // -------------------------------------------------------------------
         // WARNING: hard code values just to for testing
         // -------------------------------------------------------------------
@@ -207,11 +222,28 @@
         filterProperties.put( "app.icon" , layout.getLogoIconFile().getPath() );
         
         // generated files
-        filterProperties.put( "windows.shortcuts" , izPackWindowsShortcuts.getPath() );
-        filterProperties.put( "unix.shortcuts", izPackUnixShortcuts.getPath() );
+        if ( target.getOsFamily().equals( "windows" ) )
+        {
+            filterProperties.put( "windows.shortcuts" , izPackWindowsShortcuts.getPath()
);
+        }
+        
+        if ( target.getOsFamily().equals( "unix" ) && target.getOsFamily().equals(
"unix" ) )
+        {
+            filterProperties.put( "unix.shortcuts", izPackUnixShortcuts.getPath() );
+        }
         filterProperties.put( "user.input", izPackUserInput.getPath() );
         filterProperties.put( "image.basedir", layout.getBaseDirectory().getPath() );
-        filterProperties.put( "server.init", layout.getInitScript().getPath() );
+
+        if ( target.getOsFamily().equals( "mac" )|| target.getOsFamily().equals( "unix" )
)
+        {
+            System.out.println( " ***************************************** " );
+            System.out.println( layout.getInitScript().getName() );
+            System.out.println( " ***************************************** " );
+            filterProperties.put( "server.init", layout.getInitScript().getName() );
+        }
+        
+        // for the substitution of the application's installation path done by izPack
+        filterProperties.put( "app.install.base", "%INSTALL_PATH" );
     }
     
     

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

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

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_unix_template.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_unix_template.xml?rev=372101&view=auto
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_unix_template.xml
(added)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_unix_template.xml
Tue Jan 24 20:36:16 2006
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  /*
+  *   Copyright 2004 The Apache Software Foundation
+  *
+  *   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.
+  *
+  */
+-->
+
+<installation version="1.0">
+  <info>
+    <appname>${app}</appname>
+    <appversion>${app.version}</appversion>
+    <appsubpath>${app}-${app.version}</appsubpath>
+    <authors>
+      <author name="${app.author}" email="${app.email}" />
+    </authors>
+    <url>${app.url}</url>
+    <javaversion>${app.java.version}</javaversion>
+  </info>
+
+  <guiprefs height="480" resizable="yes" width="640">
+    <laf name="metouia">
+      <os family="unix" />
+    </laf>
+  </guiprefs>
+
+  <locale>
+    <langpack iso3="eng" />
+  </locale>
+
+  <resources>
+    <res id="installer.langsel.img" src="${app.icon}" />
+    <res id="Installer.image" src="${app.icon}" />
+    <res id="Installer.image.0" src="${app.icon}" />
+    <res id="Installer.image.1" src="${app.icon}" />
+    <res id="Installer.image.2" src="${app.icon}" />
+    <res id="Installer.image.3" src="${app.icon}" />
+    <res id="Installer.image.4" src="${app.icon}" />
+    <res id="Installer.image.5" src="${app.icon}" />
+    <res id="LicencePanel.licence" src="${app.license}" />
+    <res id="InfoPanel.info" src="${app.readme}" />
+    <res id="ImgPacksPanel.img.0" src="${app.icon}" />
+    <res id="ImgPacksPanel.img.1" src="${app.icon}" />
+    <res id="shortcutSpec.xml" src="${unix.shortcuts}" />
+    <res id="Unix_shortcutSpec.xml" src="${unix.shortcuts}" />
+    <res id="userInputSpec.xml" src="${user.input}" />
+  </resources>
+
+  <panels>
+    <panel classname="HelloPanel" />
+    <panel classname="InfoPanel" />
+    <panel classname="LicencePanel" />
+    <panel classname="TargetPanel" />
+    <panel classname="ImgPacksPanel" />
+    <panel classname="InstallPanel" />
+    <panel classname="ShortcutPanel" />
+    <panel classname="FinishPanel" />
+  </panels>
+
+  <packs>
+    <pack name="Binaries" required="yes">
+      <description>Binary Executables</description>
+      <fileset dir="${image.basedir}" targetdir="$INSTALL_PATH">
+        <include name="**/*" />
+      </fileset>
+    
+      <executable os="unix" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true"
/>
+      <singlefile os="unix" src="bin/${server.init}" target="/etc/init.d/${app}" />
+      <parsable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" type="shell" />
+      <parsable os="unix" targetfile="/etc/init.d/${app}" type="shell" />
+      <executable os="unix" targetfile="/etc/init.d/${app}" stage="never" keep="true"
/>
+      <executable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" stage="never"
keep="true" />
+    </pack>
+  </packs>
+</installation>

Copied: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_windows_template.xml
(from r372075, directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_template.xml)
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_windows_template.xml?p2=directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_windows_template.xml&p1=directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_template.xml&r1=372075&r2=372101&rev=372101&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_template.xml
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/izpack_install_windows_template.xml
Tue Jan 24 20:36:16 2006
@@ -1,159 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!--
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   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.
- *
- */
- -->
-
+  /*
+  *   Copyright 2004 The Apache Software Foundation
+  *
+  *   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.
+  *
+  */
+-->
 <installation version="1.0">
+  <info>
+    <appname>${app}</appname>
+    <appversion>${app.version}</appversion>
+    <appsubpath>${app}-${app.version}</appsubpath>
+    <authors>
+      <author name="${app.author}" email="${app.email}" />
+    </authors>
+    <url>${app.url}</url>
+    <javaversion>${app.java.version}</javaversion>
+  </info>
+
+  <guiprefs height="480" resizable="yes" width="640">
+    <laf name="looks">
+      <os family="windows" />
+      <param name="variant" value="extwin" />
+    </laf>
+  </guiprefs>
+
+  <locale>
+    <langpack iso3="eng" />
+  </locale>
+
+  <resources>
+    <res id="installer.langsel.img" src="${app.icon}" />
+    <res id="Installer.image" src="${app.icon}" />
+    <res id="Installer.image.0" src="${app.icon}" />
+    <res id="Installer.image.1" src="${app.icon}" />
+    <res id="Installer.image.2" src="${app.icon}" />
+    <res id="Installer.image.3" src="${app.icon}" />
+    <res id="Installer.image.4" src="${app.icon}" />
+    <res id="Installer.image.5" src="${app.icon}" />
+
+    <res id="LicencePanel.licence" src="${app.license}" />
+    <res id="InfoPanel.info" src="${app.readme}" />
+
+    <res id="ImgPacksPanel.img.0" src="${app.icon}" />
+    <res id="ImgPacksPanel.img.1" src="${app.icon}" />
+    <res id="Win_shortcutSpec.xml" src="${windows.shortcuts}" />
+    <res id="userInputSpec.xml" src="${user.input}" />
+  </resources>
+
+  <native type="izpack" name="ShellLink.dll" />
+
+  <panels>
+    <panel classname="HelloPanel" />
+    <panel classname="InfoPanel" />
+    <panel classname="LicencePanel" />
+    <panel classname="TargetPanel" />
+    <panel classname="ImgPacksPanel" />
+    <panel classname="InstallPanel" />
+    <panel classname="ShortcutPanel" />
+    <panel classname="FinishPanel" />
+  </panels>
 
-    <!-- 
-        The info section.
-        The meaning of the tags should be natural ...
-    -->
-    <info>
-        <appname>${app}</appname>
-        <appversion>${app.version}</appversion>
-        <appsubpath>${app}-${app.version}</appsubpath>
-        <authors>
-            <author name="${app.author}" email="${app.email}"/>
-        </authors>
-        <url>${app.url}</url>
-        <javaversion>${app.java.version}</javaversion>
-    </info>
-    
-    <!-- 
-        The gui preferences indication.
-        Sets the installer window to 640x480. It will not be able to change the size.
-    -->
-
-    <guiprefs height="480" resizable="yes" width="640">
-      <laf name="metouia">
-        <os family="unix" />
-      </laf>
-      <laf name="looks">
-        <os family="windows" />
-        <param name="variant" value="extwin" />
-      </laf>
-    </guiprefs>
-
-    <!--
-        The variables section
-    -->
-    <variables>
-    </variables>
-
-    <!--
-        The locale section.
-    -->
-    <locale>
-      <langpack iso3="eng"/>
-      <langpack iso3="chn"/>
-      <langpack iso3="deu"/>
-      <langpack iso3="spa"/>
-      <langpack iso3="fra"/>
-    </locale>
-    
-    <!-- 
-        The resources section.
-        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-    -->
-    <resources>
-      <res id="installer.langsel.img" src="${app.icon}"/>
-      <res id="Installer.image" src="${app.icon}"/>
-      <res id="Installer.image.0" src="${app.icon}"/>
-      <res id="Installer.image.1" src="${app.icon}"/>
-      <res id="Installer.image.2" src="${app.icon}"/>
-      <res id="Installer.image.3" src="${app.icon}"/>
-      <res id="Installer.image.4" src="${app.icon}"/>
-      <res id="Installer.image.5" src="${app.icon}"/>
-
-      <res id="LicencePanel.licence" src="${app.license}"/>
-      <res id="InfoPanel.info" src="${app.readme}"/>
-
-      <res id="ImgPacksPanel.img.0" src="${app.icon}"/>
-      <res id="ImgPacksPanel.img.1" src="${app.icon}"/>
-
-      <res id="shortcutSpec.xml" src="${unix.shortcuts}"/>
-      <res id="Win_shortcutSpec.xml" src="${windows.shortcuts}"/>
-      <res id="Unix_shortcutSpec.xml" src="${unix.shortcuts}"/>
-
-      <res id="userInputSpec.xml" src="${user.input}"/>
-    </resources>
-    
-    <native type="izpack" name="ShellLink.dll"/>
-
-    <!--
-        The panels section.
-        We indicate here which panels we want to use. The order will be respected.
-    -->
-    <panels>
-        <panel classname="HelloPanel"/>
-        <panel classname="InfoPanel"/>
-        <panel classname="LicencePanel"/>
-        <panel classname="TargetPanel"/> 
-        <panel classname="ImgPacksPanel"/>
-        <!--
-        <panel classname="UserInputPanel"/>
-        -->
-        <panel classname="InstallPanel"/>
-        <!-- Use a ProcessPanel to make server a service or drop
-             a startup script with links
-        -->
-        <panel classname="ShortcutPanel"/>
-        <panel classname="FinishPanel"/>
-    </panels>
-    
   <!--
-      The packs section.  We specify here our packs.
+    The packs section.  We specify here our packs.
   -->
   <packs>
     <pack name="Binaries" required="yes">
       <description>Binary executables</description>
       <fileset dir="${image.basedir}" targetdir="$INSTALL_PATH">
-          <include name="**/*"/>
-      </fileset>  
-
-      <!--  MAC section
-      <executable os="mac" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true"/>
-      -->
-      <!-- the servier.init file is really the substituted one that is copied to this
file name -->
-      <!--
-      <executable os="mac" targetfile="$INSTALL_PATH/etc/${server.init}" stage="never"
keep="true"/>
-      <parsable os="mac" targetfile="$INSTALL_PATH/etc/${server.init}" type="shell"/>
-      -->
-      
-      <executable os="unix" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true"/>
-      <singlefile os="unix" src="../bin/${app}-init-sub.sh" target="/etc/init.d/${app}"/>
-      <parsable   os="unix" targetfile="/etc/init.d/${app}" type="shell"/>
-      <executable os="unix" targetfile="/etc/init.d/${app}" stage="never" keep="true"/>
+        <include name="**/*" />
+      </fileset>
 
       <!-- WINDOWS section
-      <parsable   os="windows" targetfile="$INSTALL_PATH/bin/${windows.uninstall.bat}"
/>
-      <executable os="windows" targetfile="$INSTALL_PATH/bin/${windows.uninstall.bat}"
failure="warn" stage="uninstall" keep="false"/>
-      <singlefile os="windows" src="../bin/win32/${app}.exe" target="$INSTALL_PATH/bin/${app}.exe"/>
-      <singlefile os="windows" src="../bin/win32/${app}w.exe" target="$INSTALL_PATH/bin/${app}w.exe"/>
-      <executable os="windows" targetfile="$INSTALL_PATH/bin/${app}.exe" stage="never"
keep="true"/>
-      <executable os="windows" targetfile="$INSTALL_PATH/bin/${app}w.exe" stage="never"
keep="true"/>
-      <parsable   os="windows" targetfile="$INSTALL_PATH/bin/install-service.bat" />
-      <executable os="windows" targetfile="$INSTALL_PATH/bin/install-service.bat" failure="warn"
stage="postinstall" keep="false"/>
-      <executable os="windows" targetfile="$INSTALL_PATH/bin/${app}w.exe" stage="postinstall"
keep="true"/>
+        <parsable   os="windows" targetfile="$INSTALL_PATH/bin/${windows.uninstall.bat}"
/>
+        <executable os="windows" targetfile="$INSTALL_PATH/bin/${windows.uninstall.bat}"
failure="warn" stage="uninstall" keep="false"/>
+        <singlefile os="windows" src="../bin/win32/${app}.exe" target="$INSTALL_PATH/bin/${app}.exe"/>
+        <singlefile os="windows" src="../bin/win32/${app}w.exe" target="$INSTALL_PATH/bin/${app}w.exe"/>
+        <executable os="windows" targetfile="$INSTALL_PATH/bin/${app}.exe" stage="never"
keep="true"/>
+        <executable os="windows" targetfile="$INSTALL_PATH/bin/${app}w.exe" stage="never"
keep="true"/>
+        <parsable   os="windows" targetfile="$INSTALL_PATH/bin/install-service.bat" />
+        <executable os="windows" targetfile="$INSTALL_PATH/bin/install-service.bat" failure="warn"
stage="postinstall" keep="false"/>
+        <executable os="windows" targetfile="$INSTALL_PATH/bin/${app}w.exe" stage="postinstall"
keep="true"/>
       -->
       <!-- looks like we're going to need a batch file for registering the service 
-      <executable os="windows" targetfile="$INSTALL_PATH/bin/install-service.bat" stage="postinstall"
keep="false"/>
+        <executable os="windows" targetfile="$INSTALL_PATH/bin/install-service.bat" stage="postinstall"
keep="false"/>
       -->
     </pack>
   </packs>

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init?rev=372101&r1=372100&r2=372101&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
Tue Jan 24 20:36:16 2006
@@ -69,8 +69,8 @@
 
 if [ -z "$_${app.caps}_HOME" ] ; then
   # try to find install home 
-  if [ -d ${app.install.base}/${app}-${version} ] ; then
-    ${app.caps}_HOME=${app.install.base}/${app}-${version}
+  if [ -d ${app.install.base} ] ; then
+    ${app.caps}_HOME=${app.install.base}
   fi
 
   if [ -d "$HOME/${app}-${version}" ] ; then



Mime
View raw message