You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/01/31 09:00:53 UTC
svn commit: r373754 - in /directory/trunks/daemon/installers-plugin/src/main: java/org/apache/directory/daemon/installers/ java/org/apache/directory/daemon/installers/inno/ java/org/apache/directory/daemon/installers/izpack/ resources/org/apache/direct...

Author: akarasulu
Date: Tue Jan 31 00:00:48 2006
New Revision: 373754

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

 o added new target field for the final name of the installer file
 o cleaned up some bugs left behind from package name changes 


Modified:
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java?rev=373754&r1=373753&r2=373754&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java (original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java Tue Jan 31 00:00:48 2006
@@ -60,6 +60,7 @@
     private String osFamily;
     private String osVersion;
     private String daemonFramework;
+    private String finalName;
     private File loggerConfigurationFile;
     private File serverConfigurationFile;
     private File bootstrapperConfiguraitonFile;
@@ -216,5 +217,17 @@
     public List getLibArtifacts()
     {
         return libArtifacts;
+    }
+
+
+    public void setFinalName( String finalName )
+    {
+        this.finalName = finalName;
+    }
+
+
+    public String getFinalName()
+    {
+        return finalName;
     }
 }

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java?rev=373754&r1=373753&r2=373754&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java (original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java Tue Jan 31 00:00:48 2006
@@ -214,6 +214,17 @@
             filterProperties.put( "app.author", target.getApplication().getAuthors().get( 0 ) );
         }
         
+        if ( target.getFinalName() != null )
+        {
+            filterProperties.put( "app.final.name" , target.getFinalName() );
+        }
+        else
+        {
+            String finalName = target.getApplication().getName() 
+                + "-" + target.getApplication().getVersion() + "-win32-setup.exe"; 
+            filterProperties.put( "app.final.name" , finalName );
+        }
+        
         filterProperties.put( "app.email" , target.getApplication().getEmail() );
         filterProperties.put( "app.url" , target.getApplication().getUrl() );
         filterProperties.put( "app.java.version" , target.getApplication().getMinimumJavaVersion() );

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java?rev=373754&r1=373753&r2=373754&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java (original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java Tue Jan 31 00:00:48 2006
@@ -69,7 +69,16 @@
         this.mymojo = mymojo;
         File imageDir = layout.getBaseDirectory().getParentFile();
         izPackBase = new File( imageDir, target.getId() );
-        izPackOutput = new File( imageDir, target.getId() + "_izpack_installer.jar" );
+        
+        if ( target.getFinalName() != null )
+        {
+            izPackOutput = new File( imageDir, target.getFinalName() );
+        }
+        else
+        {
+            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" );

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss?rev=373754&r1=373753&r2=373754&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss (original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss Tue Jan 31 00:00:48 2006
@@ -25,7 +25,7 @@
 DefaultGroupName={#MyAppName}
 LicenseFile={#SourceBase}\${app.license.name}
 OutputDir="${installer.output.directory}"
-OutputBaseFilename=${app}-${version}-setup
+OutputBaseFilename=${app.final.name}
 SetupIconFile={#SourceBase}\${app.icon.name}
 Compression=lzma
 SolidCompression=true
@@ -69,7 +69,7 @@
 Name: {group}\Test Service; Filename: {app}\bin\${app}.exe; IconIndex: 0
 
 [Run]
-Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Tasks: ; Languages: ; Parameters: "//IS//${app.displayname} --Description=""${app.description} Service ${app.version} - ${app.url}"" --DisplayName=${app.displayname} --Install=""{app}\bin\${app}.exe"" --StartMode=jvm --StopMode=jvm --StartClass=org.apache.directory.server.standalone.daemon.ProcrunBootstrapper --StartMethod prunsrvStart --StartParams=""{app}"" --StopClass=org.apache.directory.server.standalone.daemon.ProcrunBootstrapper --StopMethod prunsrvStop --StopParams=""{app}"" --Startup=manual --JvmOptions=""-D${app}.home={app}"" --Classpath=""{app}\bin\bootstrapper.jar;{app}\conf;{app}\bin\logger.jar;{app}\bin\daemon.jar"" --LogPath=""{app}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}\var\log\${app}-stdout.log"" --StdError=""{app}\var\log\${app}-stderr.log"""; Flags: runhidden
+Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Tasks: ; Languages: ; Parameters: "//IS//${app.displayname} --Description=""${app.description} Service ${app.version} - ${app.url}"" --DisplayName=${app.displayname} --Install=""{app}\bin\${app}.exe"" --StartMode=jvm --StopMode=jvm --StartClass=org.apache.directory.daemon.ProcrunBootstrapper --StartMethod prunsrvStart --StartParams=""{app}"" --StopClass=org.apache.directory.daemon.ProcrunBootstrapper --StopMethod prunsrvStop --StopParams=""{app}"" --Startup=manual --JvmOptions=""-D${app}.home={app}"" --Classpath=""{app}\bin\bootstrapper.jar;{app}\conf;{app}\bin\logger.jar;{app}\bin\daemon.jar"" --LogPath=""{app}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}\var\log\${app}-stdout.log"" --StdError=""{app}\var\log\${app}-stderr.log"""; Flags: runhidden
 Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app.displayname}; WorkingDir: {app}\bin; Flags: postinstall nowait; Description: Runs the configuration manager for the ${app} windows service
 
 [Registry]

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init?rev=373754&r1=373753&r2=373754&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init (original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init Tue Jan 31 00:00:48 2006
@@ -141,7 +141,7 @@
     -outfile $SERVER_HOME/var/log/${app}-stdout.log \
     -errfile $SERVER_HOME/var/log/${app}-stderr.log \
     -cp $CLASSPATH \
-    org.apache.directory.server.standalone.daemon.JsvcBootstrapper \
+    org.apache.directory.daemon.JsvcBootstrapper \
     $_${app.caps}_HOME start
 
     if [ `uname` = "Darwin" ] ; then
@@ -173,7 +173,7 @@
     -stop \
     -pidfile $PID_FILE \
     -Dlog4j.configuration=file://$SERVER_HOME/conf/log4j.properties\
-    org.apache.directory.server.standalone.daemon.JsvcBootstrapper stop
+    org.apache.directory.daemon.JsvcBootstrapper stop
 
     if [ `uname` = "Darwin" ] ; then
         [ "$RETVAL" -eq 0 ] && echo successful ${app} server shutdown || \