You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2005/12/31 20:04:56 UTC

svn commit: r360411 - in /geronimo/trunk: assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml etc/project.properties plugins/geronimo-izpack-plugin/plugin.jelly

Author: jlaskowski
Date: Sat Dec 31 11:04:50 2005
New Revision: 360411

URL: http://svn.apache.org/viewcvs?rev=360411&view=rev
Log:
Make j2ee-installer work
 + change Geronimo IZPack Plugin to accept the latest release notes version

Thanks Sachin for the idea and patch!

Modified:
    geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
    geronimo/trunk/etc/project.properties   (contents, props changed)
    geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly

Modified: geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml?rev=360411&r1=360410&r2=360411&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml Sat Dec 31 11:04:50 2005
@@ -71,11 +71,7 @@
 	    <file src="${InstallSource}/BUILDING.txt" targetdir="$INSTALL_PATH"/>
 	    <file src="${InstallSource}/LICENSE.txt" targetdir="$INSTALL_PATH"/>
 	    <file src="${InstallSource}/README.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/RELEASE-NOTES-1.0-M1.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/RELEASE-NOTES-1.0-M2.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/RELEASE-NOTES-1.0-M3.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/RELEASE-NOTES-1.0-M4.txt" targetdir="$INSTALL_PATH"/>
-	    <file src="${InstallSource}/RELEASE-NOTES-1.0-M5.txt" targetdir="$INSTALL_PATH"/>
+	    <file src="${InstallSource}/RELEASE-NOTES-${ReleaseNotesVersion}.txt" targetdir="$INSTALL_PATH"/>
 	    <file src="${InstallSource}/bin" targetdir="$INSTALL_PATH"/>
 	    <file src="${InstallSource}/lib" targetdir="$INSTALL_PATH"/>
 	    <file src="${InstallSource}/config-store" targetdir="$INSTALL_PATH"/>

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=360411&r1=360410&r2=360411&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sat Dec 31 11:04:50 2005
@@ -1,5 +1,3 @@
-
-
 ##
 ##
 ##   Copyright 2003-2004 The Apache Software Foundation
@@ -18,7 +16,7 @@
 ##
 
 ##
-## $Rev: 356017 $ $Date$
+## $Rev$ $Date$
 ##
 
 #####################################################
@@ -85,6 +83,7 @@
 tranql_version=1.2.1
 tranql_connector_version=1.1
 tranql_vendors_version=1.1
+release_notes_version=1.0
 
 geronimo_packaging_plugin_version=1.1.1
 geronimo_assembly_plugin_version=1.1.2

Propchange: geronimo/trunk/etc/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Dec 31 11:04:50 2005
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Rev Date

Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly?rev=360411&r1=360410&r2=360411&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly Sat Dec 31 11:04:50 2005
@@ -43,7 +43,7 @@
         </fileScanner>
         <j:set var="GeronimoVersion" value="${geronimo_version}"/>
         <j:set var="InstallSource" value="${geronimo.assembly.dest}"/>
-        <j:set var="ReleaseNotesVersion" value="1.0-M5"/>
+        <j:set var="ReleaseNotesVersion" value="${release_notes_version}"/>
         <j:forEach var="installer" items="${installFiles.iterator()}">
             <j:set var="installerName" value="${installer.name}"/>
             <echo>Processing installer file ${installerName}</echo>