Index: win_installer/.cvsignore
===================================================================
diff -u
--- win_installer/.cvsignore	(revision 0)
+++ win_installer/.cvsignore	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1 @@
+build
Index: win_installer/.project
===================================================================
diff -u
--- win_installer/.project	(revision 0)
+++ win_installer/.project	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>win_installer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>net.sf.eclipsensis.installoptions.InstallOptionsBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>net.sf.eclipsensis.installoptions.InstallOptionsNature</nature>
+	</natures>
+</projectDescription>
Index: win_installer/README
===================================================================
diff -u
--- win_installer/README	(revision 0)
+++ win_installer/README	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,19 @@
+README
+------
+
+Notes
+1. The build.xml doesn't completely compile the installer, but only does some 
+   helper tasks (TODO)
+2. NSIS plugin for Eclipse: http://eclipsensis.sourceforge.net (you still need 
+   to install the NSIS compiler)
+
+Steps to build installer
+0. Build LAMS as usual.  Make sure you have also checked out jsMath (needed for
+   step 4).  
+   If using an alternate location for JBOSS_HOME and LAMS_CONF, specify these at
+   the top of src/installer.nsi.
+1. Run the dump-db and compile-java targets in the main build.xml file
+2. Make sure the dump.sql in build/ is encoded in UTF-8 (I haven't tested what 
+   happens if it isn't, but just in case)
+3. Compile src/lams-start.nsi and src/lams-stop.nsi
+4. Compile src/installer.nsi.
Index: win_installer/apache-ant-1.6.5/INSTALL
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/INSTALL	(revision 0)
+++ win_installer/apache-ant-1.6.5/INSTALL	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,2 @@
+For installation instructions see the manual in the docs subdirectory
+or online at <http://ant.apache.org/manual/index.html>.
Index: win_installer/apache-ant-1.6.5/KEYS
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/KEYS	(revision 0)
+++ win_installer/apache-ant-1.6.5/KEYS	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,310 @@
+This file contains the PGP keys of various developers.
+
+Users: pgp < KEYS
+       gpg --import KEYS
+Developers: 
+        pgp -kxa <your name> and append it to this file.
+        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+        (gpg --list-sigs <your name>
+             && gpg --armor --export <your name>) >> this file.
+
+Type Bits/KeyID    Date       User ID
+pub  1024/FEECAAED 1998/11/11 Stefan Bodewig <bodewig@bost.de>
+                              Stefan Bodewig <bodewig@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: 2.6.3i
+
+mQCNAzZJoiMAAAEEAMzhUxTOC20Nprp6K4nLTiARt+EXii/dovNWWcfzZcYXi/lX
+r3zpUTTZxlKQpd4RaHjFmGgoOraZE4jCRFARVcFJgYmGUKpcWJZO7YKL36WUizTM
++dyB2ycOtzlty1W5VmRL3FGqo67pKA9F/QHg3NSu9hY1W9xPPK7Kq3f+7KrtAAUR
+tCBTdGVmYW4gQm9kZXdpZyA8Ym9kZXdpZ0Bib3N0LmRlPokAlQIFEDZSrGXHcgyK
+jiW9zQEBshEEAMlG4qVjKp4/agdJG56M6izx9oaKecFLXHQJrFUy3w2PvZHFYtXc
+osXKorX6bPrE8uB57MxbY2WapKeVRodlG0+j39vAf501duK8q2rktfWt9Cl4JjJ4
+DbWhSWfV1ci62u2gCxwYQe22F9Wh+vhOR5NK9RTbSKhupdlFsnrk/i7xiQCVAwUQ
+NkmiI67Kq3f+7KrtAQGdxQQAlcFOzSv7G6M4uGbgvw7IGgrhx7rawtIyv9hLXgVC
+7ua9xaZV8G0Fl9gh8RnbdcZ4R/aT+KIiAFaslfZ3t6hlC4MTbnAJqvdS/NO98ZkJ
+YvnzZSKHflAbd5gyE7IVxBC9/xRlF/Wls5sYNwb6RjoRCaOjxN/y3WCLa3Va101v
+zNy0I1N0ZWZhbiBCb2Rld2lnIDxib2Rld2lnQGFwYWNoZS5vcmc+iQCVAwUQOxIo
+BK7Kq3f+7KrtAQGn6gP/SBACdHakA4H//otpyESSrk4PmyOaYF0Kyok43Gee2mT+
+m9+jZ3jLcC0oav6iH+otL/lhk9t/JDM8LjD2kAkdWWoIvvuPyCx97gOzojIo0Ve2
+1wuxJTF/VIjwyOtE8FzE7p4tkc6EubVpeZkV9Pq9HFRBCUcyKJDLnF4tbstScLU=
+=OBLe
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub  1024D/51898504 2001-05-29 Conor MacNeill <conor@cortexebusiness.com.au>
+sig 3       51898504 2001-05-29   Conor MacNeill <conor@cortexebusiness.com.au>
+sig         5F6B8B72 2002-01-11   Stefan Bodewig <bodewig@apache.org>
+uid                            Conor MacNeill <conor@apache.org>
+sig 3       51898504 2001-05-29   Conor MacNeill <conor@cortexebusiness.com.au>
+sig         5F6B8B72 2002-01-11   Stefan Bodewig <bodewig@apache.org>
+sub  1024g/D1ECBA5D 2001-05-29
+sig         51898504 2001-05-29   Conor MacNeill <conor@cortexebusiness.com.au>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.0 (GNU/Linux)
+
+mQGiBDsTqygRBACiZckNdclTlQFonLaIKBFGhMy0KKByw0x8XA4iwdbCXuF6xNIc
+HIFHajJ74AHchQ4d8xtomBy6b8yvFgWVeaZensvn69BlLeqGdyeJRzfPt6TgRnzZ
+2eWhb0HXdG3JwxL/2BabDhHfs4YJOrgB/vhRFQku6oCMRiBPtJj2werD6wCg0/zp
+jacYTw6+CR+sVvneCNyySFED/R3j10c4RnR8djgv1jKT8CKPuHYraupI9INEe+I6
+7qWjtJ02GzvMO6TElAtUsf4aysu45GgwkwEBnuG6mYb3Pq0V2c5tJc2A3Tj3DrdR
+i3HUNwurbus76I0sPyyENPu12QPeC6mvWLEsxVJ9o0hRKFayGvYUmrwWK9UFLjvp
+p9cXBACDHgLn7MAVLqUdYhRrUj/M+GOUpvBikEgoJJrEUmb5X4+++dffMh5HBIO4
+5LA11qEKuM2xnKqOilP7NLYXz1Fe0ocqv0jsHB4SprFTTai7ma31uwuRQvCQXVv1
+yJ5CLqYda64h/UA2kmmR2dfopmvDogYEMz/HU5voozxe7BEI7bQhQ29ub3IgTWFj
+TmVpbGwgPGNvbm9yQGFwYWNoZS5vcmc+iFcEExECABcFAjsTqygFCwcKAwQDFQMC
+AxYCAQIXgAAKCRCBBGRPUYmFBDgIAKCZztXqKhK6kXOnoGy7opCNmWU0lwCgsPDa
+4m+ruW3ch0rfbqtR75S52R+IRgQQEQIABgUCPD6eTgAKCRCiEVrhX2uLcqCcAKCr
+1Wylqju9YjBi5Twej9ze69JFBQCeOaMgo6yjnkcV3PnVInLlaMwPr5q0LUNvbm9y
+IE1hY05laWxsIDxjb25vckBjb3J0ZXhlYnVzaW5lc3MuY29tLmF1PohXBBMRAgAX
+BQI7E6xMBQsHCgMEAxUDAgMWAgECF4AACgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs
+5hybpyvnvEiPYqYAn2+ryxdtz8XyOMExGRmHNlhG7svsiEYEEBECAAYFAjw+nlUA
+CgkQohFa4V9ri3JYYACg1WN+NCptfKVP1mbrIa+0ajztsiIAnAn+m70iwRRFZCxr
+jcULoY5SjyTLuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c
+u+4Oj5mi0x6azZIhwCa+K3ihLVOyG1mCRnzztGTIxWYRhq3TESIVOfgm+NgLGrmA
+XUTFyCT+21TExLCpuVZKmUHsWXLxDtfQ1diPeQpiQ8+Fvb/4jLGFjFIrQ2VjtFQn
+kumkSwADBgP9H0bF4hdMuVEcSJ9imxSoJshcOOA3Vd2+YiCTZhBygWM49wY5jNos
+/DArIjNCE53IlOu/UtHB2jqkSqjF0soGYsUjeCWouiTP9hLuMKPjnqj9ryJPTDKz
+nTCZ4TuB5CtzrKTlWLmPCPpFsGqe4KjMeKg/mqGqjPKl97xgStK9N9GIRgQYEQIA
+BgUCOxOrLQAKCRCBBGRPUYmFBMM6AJsF3FFyZGEmbt9aGG1W/u0oI9mcLgCfQyJ+
+aalbspazea4J9zgi59SSwOM=
+=cBdR
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub  1024D/5F6B8B72 2001-05-28 Stefan Bodewig <bodewig@apache.org>
+sig 3       5F6B8B72 2001-05-28   Stefan Bodewig <bodewig@apache.org>
+sig         51898504 2002-01-11   Conor MacNeill <conor@cortexebusiness.com.au>
+sig 3       F88341D9 2003-03-17   Lars Eilebrecht <lars@eilebrecht.org>
+sig 3       2261D073 2003-03-17   Astrid Ke�ler (Kess) <kess@kess-net.de>
+sig         21D0A71B 2003-03-17   Dirk-Willem van Gulik <dirkx@apache.org>
+sig         75A67692 2003-03-18   Erik Abele <erik@codefaktor.de>
+sig         B3B2A12C 2003-05-20   ct magazine CERTIFICATE <pgpCA@ct.heise.de>
+sig 3       8103A37E 2003-04-04   Andre Malo <nd@apache.org>
+uid                            Stefan Bodewig <bodewig@bost.de>
+sig 3       5F6B8B72 2001-05-28   Stefan Bodewig <bodewig@apache.org>
+sig         51898504 2002-01-11   Conor MacNeill <conor@cortexebusiness.com.au>
+sig 3       F88341D9 2003-03-17   Lars Eilebrecht <lars@eilebrecht.org>
+sig 3       2261D073 2003-03-17   Astrid Ke�ler (Kess) <kess@kess-net.de>
+sig         21D0A71B 2003-03-17   Dirk-Willem van Gulik <dirkx@apache.org>
+sig         75A67692 2003-03-18   Erik Abele <erik@codefaktor.de>
+sig         B3B2A12C 2003-05-20   ct magazine CERTIFICATE <pgpCA@ct.heise.de>
+sig 3       8103A37E 2003-04-04   Andre Malo <nd@apache.org>
+uid                            Stefan Bodewig <stefan.bodewig@freenet.de>
+sig 3       5F6B8B72 2003-03-07   Stefan Bodewig <bodewig@apache.org>
+sig 3       F88341D9 2003-03-17   Lars Eilebrecht <lars@eilebrecht.org>
+sig 3       2261D073 2003-03-17   Astrid Ke�ler (Kess) <kess@kess-net.de>
+sig         21D0A71B 2003-03-17   Dirk-Willem van Gulik <dirkx@apache.org>
+sig         75A67692 2003-03-18   Erik Abele <erik@codefaktor.de>
+sig         B3B2A12C 2003-05-20   ct magazine CERTIFICATE <pgpCA@ct.heise.de>
+sig 3       8103A37E 2003-04-04   Andre Malo <nd@apache.org>
+sub  1024g/24774157 2001-05-28
+sig         5F6B8B72 2001-05-28   Stefan Bodewig <bodewig@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.0 (GNU/Linux)
+
+mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
+5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
+EXwWOFuYMJisuxdT940iQzosm3GOv4MJdEg3oI2SgfEyRQQ6vO4Ob5rHDwCg5taZ
+nrHOrXx2dIGHxpxRZ0SUl30D/jmtttFjYOQ3LBMriikz5mh2sK3ZnoSRF4o5O0zW
+Ve6e2SFXOEjVjImKsH6KCbdQNelrAdgiyOoXClyQKsQ27pncbdWo6bO0E3POJZVm
+XaeW7iudHVr63rU5PViXObIQrdQl0D59j5brKj4vdlTyUw8kaHPvbKPDEOwvZq4Y
+LJQ5BACA1YilTeXRJqwFsNlpcxCHwlULD4QUVP496prQWf1B7Z6g0KvLGrQsO0Vn
+Jcn+fEqukysTJixSXCPebosltd4RalJIupVYkp4w6MJ7biaDAlLuNhDcI/AiXTmV
+dXUedVXIaM8I3Ne23gucwbAyc0Hvb+3cSAKRhl/azFQhuHBvlrQjU3RlZmFuIEJv
+ZGV3aWcgPGJvZGV3aWdAYXBhY2hlLm9yZz6IWgQTEQIAGgULBwoDBAMVAwIDFgIB
+AheAAhkBBQI7EiJPAAoJEKIRWuFfa4tyjzgAn3a+nFeNb3mAZQR4lRcXy3F+8eTh
+AJ4iuLt4No6TUB9xNETrm3Y/0TvkU4hGBBARAgAGBQI8PtWPAAoJEIEEZE9RiYUE
+nZIAnjOkQx1BfxN9+E7Yiz4MOxqZjSUpAKDQi0Alv/VR61fmR7KHZ11J2g+HSIiZ
+BBMBAgAGBQI+dd8MAAoJED6Pt/L4g0HZJ2QD5RzYjJ0fi1Gr6NsjmIiU/lvfvPqj
+bNoK2A2flkmLo2lk9jSa1AmF0ETOoCg8hZZHCbxyPZRdsmDJFXrZZWVTdUyZHhHb
+Wx53DR3HavmVEEdDZBSkxfXdSu1CNq31sbdcumtd03FI6SV827cPzl1/RGUiOkEL
+eK0hZb3IvSd5iEYEExECAAYFAj512sEACgkQ7tHqOSJh0HNFuACfb7quMJZHOk5p
+pmTxf4GVS5bh3E4AniLa5788ktdcZCBE5Or+G+yuIGooiD8DBRA+daoa/W+IxiHQ
+pxsRAkQFAKDmlWVuQnWfaGK9z8CP4vESTfiXyQCgpnf1yJWDgqWvUHOAvOeaTPDR
+cOmIRgQQEQIABgUCPnekEAAKCRAVP6DNdaZ2ki/rAJ9Q0x5m4SE3hMNGUoMgS0MN
+mYXDOQCdGa0QW2fZW4B1wSjiUIi6VgY+F7GIRgQQEQIABgUCPsoulgAKCRDb0kX8
+s7KhLBfwAKDV6uwqf9AMBJlr4aE45rWOnlWAeQCgjBYQVHWFjV1cmpT06vE4bMDV
+J6+IRgQTEQIABgUCPo3OLAAKCRDKaTl0gQOjfpFKAJ9TY+mKmq0INLC9iqxbEETj
+NwOn0gCgspeNEqX1SUjt932Lj3IvXR6fkAi0IFN0ZWZhbiBCb2Rld2lnIDxib2Rl
+d2lnQGJvc3QuZGU+iFcEExECABcFAjsSOYEFCwcKAwQDFQMCAxYCAQIXgAAKCRCi
+EVrhX2uLcsm6AKDaA//SYJv2pcXwGBC89OSzGvxy3gCg1kx6qu6zJKaWaE1L9oFq
+Vc65OUSIRgQQEQIABgUCPD7VlQAKCRCBBGRPUYmFBNCzAJ9tv7tNS6NwaOZQ8cR0
+pGslJGKtuQCgpttMmhhRrUwyVuEXc+dKX7rdQMKImQQTAQIABgUCPnXfDwAKCRA+
+j7fy+INB2Vm6A+IDxiYtMvd/mad+7hRoKXvD5AddB1SwnvQdJe0ewStFBYZxZdNO
+LXdkVngCwAJziPGZcQmocEHVMrN+Mxe+3OX0PEZ+3KOOsAUi+fTov2xvf8EWKgX9
+d0li9iEytVA4M0c52a3bPTC0Kki/KAY3m8oNvAmTwWB9dBSooFFDMIhGBBMRAgAG
+BQI+ddrHAAoJEO7R6jkiYdBzruYAnAzvTrvDQNvoAoaDQJ+o/ydqMA8ZAJwNEOQD
+Hsz+6ynbMPoQmKmUqfEISIg/AwUQPnWqIf1viMYh0KcbEQIkpwCeInf4o3C5Ykh/
+xBodVImrp2Cvcy8AoMn3me5p4Sl2rm2tjVxTJZt2sUr7iEYEEBECAAYFAj53pBoA
+CgkQFT+gzXWmdpIpGgCgiTARP6Cf+JKOxUaVFr0L9DC5oUcAoIxF7D5mOVK/AFcp
+1cxNk3BLtdq3iEYEEBECAAYFAj7KLjIACgkQ29JF/LOyoSwAbACglNp7V2Pw4U57
+5IuooM677bZf8pwAn2U2TcHj7PYprU+qYRkyJ3pa7FyyiEYEExECAAYFAj6NzjUA
+CgkQymk5dIEDo35YPwCeJIU/monN96nP4jJjAuflEXMbemUAoJXq7oVCYuOCqWr/
+T3VW0DM3W+dntCpTdGVmYW4gQm9kZXdpZyA8c3RlZmFuLmJvZGV3aWdAZnJlZW5l
+dC5kZT6IXAQTEQIAHAUCPmiBXAIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQohFa
+4V9ri3JPKACfXhFOr4gMMIQwEGvUb6J/X4asuzIAnje2H9T1r/jSVi1NbIEtQfbp
+myQXiJkEEwECAAYFAj513w8ACgkQPo+38viDQdmGkgPnUYJfHlDrQ2jYJWuPDve9
+n4pV9OvyIllKyLdfULjsLWXw4Jm+fMQJgWr2GEov1ZYIyS2+rGDZpbz/vxaBVbgq
+M8TPdiXzxwU8AFq4k+Em4fKXR58ByLSJjvLLza61spNHJennEUFp3tTpEsr4bNuu
+aoRYhtiKzTqNuoC+0x+IRgQTEQIABgUCPnXaxwAKCRDu0eo5ImHQc5lcAJ9FOoAL
+4uHMuqHXrrxsEVPJvEJ2/ACggaOR62EziUqcqpdm/1Zy3P4T22iIPwMFED51qjj9
+b4jGIdCnGxECWssAoKnkR63bWGCFDB5YJtfZJ+nQq3TAAKD1bzG/kITQpIHsT2vC
+Y1yBmlWbBYhGBBARAgAGBQI+d6QaAAoJEBU/oM11pnaS+9IAn0kFlXAzOhhu4r5f
+glMVuw5bTAd0AKCtYRX2ESU/+tsE8vuXWtsMCGeI5YhGBBARAgAGBQI+yi67AAoJ
+ENvSRfyzsqEsSccAoKqG39X2y6xoQa56nviF5iCj/oTFAJwLKx9GyKEUbSM9f/IQ
+7AsZPhHT54hGBBMRAgAGBQI+jc41AAoJEMppOXSBA6N+xYgAn1HbGamcXTDYSFjn
+3U5ik2vQa8nuAKC/uUM01gsdn+71EiAkmrjlH6H9MLkBDQQ7EiJUEAQAzVKWS8Qr
+kysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT8bcEnz43MCSx
+8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6sby4dTVxac0r
+loxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2mlJoE7MK3vAhg
+KwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlphSR2qxJCAcBTe
+OMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6XEXH5tGJ5Qvx9
+Qid6ZfBaXx7bc8yKyCb4iEYEGBECAAYFAjsSIlQACgkQohFa4V9ri3INMgCgnc22
+kj8TfjktU6u4SUUqud25ZZcAn0B2b0zPjKjGuiwdKSnkFbNcFS3g
+=9dY9
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub  1024R/697ECEDD 2000-04-06 Henri Gomez <hgomez@slib.fr>
+sig         697ECEDD 2000-04-06   Henri Gomez <hgomez@slib.fr>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.0 (GNU/Linux)
+
+mQCNAzjsydwAAAEEAMpwFU/ci3/wR3ryCGp9Exr+Rx/hTQ7hWAJcVw8ejlBXlT4T
+yITlRUs0HGfRWxME2J55PuXXsIEPZzjfozNtvOyq8WlLlJ7iaiyWxVRoPJ25sSEj
+C9etm6wjj4E66ZgzuElZkm1m69uEsCHPPNuz1oQ/g1O+SmIVxIYirlxpfs7dAAUR
+tBxIZW5yaSBHb21leiA8aGdvbWV6QHNsaWIuZnI+iQCVAwUQOOzJ3IYirlxpfs7d
+AQFQyQQAj0D9G0hEL7SQGaSCkkoXwvamQw42N8+tNm+jfWHWdE4HAiVlhJmI2GyD
+sdcXVAcR8R7ILIRB5AY7a3bF+qMk0r+vO6oR878RKKn9AvtaAIOnrh6tr0tiPwf5
+XDUMySxIWJEF3SmJAy9Lq3bAl5GMzZCFHiS0NW2gtWgmr/u1RuM=
+=6l+I
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub  1024R/397DCAD5 2002-07-03 Henri Gomez <hgomez@users.sourceforge.net>
+sig         397DCAD5 2002-07-03   Henri Gomez <hgomez@users.sourceforge.net>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.0 (GNU/Linux)
+
+mQCNAz0i0UUAAAEEALXePN6IHne0W96YRMnR+4EXB6402QY5f8ZLcnSUZUH55Fb1
+qcZGBc3WRKlPiUvwBD+eVYgCpNSXF/H+oV1mawxNJN5XwqBEpfYmY8MRIPcqa61h
+bJc3LBSm1qNf05G5Cwxeed+OgVm0r1HBy6DAgDHAqNlkC8DZ/BVgqMA5fcrVAAUR
+tCpIZW5yaSBHb21leiA8aGdvbWV6QHVzZXJzLnNvdXJjZWZvcmdlLm5ldD6JAJUD
+BRA9ItFFFWCowDl9ytUBASNyA/458T84LUVhqq6Y9fPBAfcFMWY2kehuDWsQEXkO
+46XoK+AnFZCkKuyDLqPHchVUO5pK/gZYsDK/xJkfh3u4FTDTsecb9wFmIeyayVIN
+SI8o6l8EZzDX/PGwqEwzxHrbQkIgIktNn5ApIoazvdBpbkQfNj1vr2wWoMYPLAWM
+8xzecA==
+=UmZ8
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub  1024D/307A10A5 2002-07-18 Henri Gomez <hgomez@users.sourceforge.net>
+sig 3       307A10A5 2002-07-18   Henri Gomez <hgomez@users.sourceforge.net>
+sub  2048g/862B8F70 2002-07-18
+sig         307A10A5 2002-07-18   Henri Gomez <hgomez@users.sourceforge.net>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.0 (GNU/Linux)
+
+mQGiBD02vbERBAC1v8fR6gjERpaz4UMfdy0hRVWCPSbOdF+Swm/IenjVzErco6zb
+MTa13umUNrDPBy/tTWiCCZrOnqi7fgDzWqPEqrXJjKAFVLEWE6MmKylPPEPG1/bm
+idkNGERSAZduvhKv777PzvEJJ/8eGe3wy/O8NbgIjCPtr4UklwCZS8cFuwCg8oMO
+UdT8qZRtzdxdAyu1m5fUb+MD/3IKJYWXsdtb6iBphCU4f/BoyjVC9EZJ1ywLuiVM
+siKbuaDUaXU9nWcbNKv+fx8uZ1NaadpfLokqqhnWcpnSiqw8HNR7SwsF1D33rkXK
+O4FSuVss/tIoqGdWFcJyPkP4yP5shxqR335narVw2vDa0+BiWkALbA2qVsSIdZDB
+LeFZA/47AMBS0U2BRk2rQT8LmMuFl7mR+wNBM4n7FUGdxsGn3TcYd4pXTNrEQPrV
+YNdooKlikgGk4hgFnIFX09Spmimqgq0goFue81rttVdZZ4uep8dTghY6gwmvcOxX
+jATbhWStBhdu9B35kzfHc+1QihD5Z94u4uyWIVBIzikcdiY8LbQqSGVucmkgR29t
+ZXogPGhnb21lekB1c2Vycy5zb3VyY2Vmb3JnZS5uZXQ+iFcEExECABcFAj02vbEF
+CwcKAwQDFQMCAxYCAQIXgAAKCRAZMdaEMHoQpYijAKCCP68ndU/kTXR9XAKLvibC
+3S8+1QCfUFQYte3Jo+MHKaWjsu9JGptRzo+5Ag0EPTa93RAIAKlsRJ5gOGTFsmaR
+W9k6MIh4c/MCy7J7HUxT5xTdHROa+3zUh+FAE/JaOx9ZtZtH863DFHA8cP4L+tpi
+PjBT6g2E94dwGcuH/OiSSCT4JSBukbGbOuLLdmFXqUl8+4gsL90Xal67FtNLwyLG
+1n7geLir0byD+OT7VLA5w+6G0NOpJEveV/FIa2qLgdRZ8vz73ybgMh18hBUrUmro
+jncp0rln2VU7VCH1C2aClKm7kK4mGAjIFIzKbguK+kM3b8NDHmXKpT6syyCtIM3h
+prkV1TUCAFqLI32aSdlTN79lpeA2zDga9k4/4X/RDHsFpRN2neRFGTNUtuUgYpQQ
+E5zWBmMAAwUH/RiGxyeBsad923IwE1+GAjxFl2tqF9xWk0J6yTnSK4nfhYAE9evV
+jwDEok9jRl4ILCcXx6YN/d/lWNuSbARKHz/3hLiTouPpwd3SSJ8is2x9PgpJz5JX
+cD0y1SkbPLvs3jH3ZmdcxZpuAmJeI/typqFKK5pWP44oXIH+XH/8nWDtmLEBkgKQ
+/ATQWenMTmZ6MIJ6aWKWGkO9QS6iYRz3PPPGQ1O8W02CeprM2wBtlb8J1Z3RxNhM
+rZcg/1Qi3V3D1HI4zw6tAFmDeBb8J4PaBQzqlhzx2EBTbfwNPhV8AlPvpxHEeGGn
+v+O1yhZr33SnyZdINNoNDn+owVMdmkobe9GIRgQYEQIABgUCPTa93QAKCRAZMdaE
+MHoQpRsTAJ4qst3MhLm48fBAEnzuzi/BIKr+AgCfYaCB/AvPoncQbHc8BcNGRimR
+P9A=
+=hQhz
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub  1024D/EDF62C35 2002-04-10 Magesh Umasankar <umagesh@apache.org>
+sig 3       EDF62C35 2002-04-10   Magesh Umasankar <umagesh@apache.org>
+sig 3       5F6B8B72 2003-03-07   Stefan Bodewig <bodewig@apache.org>
+sub  1024g/B5FFC53F 2002-04-10
+sig         EDF62C35 2002-04-10   Magesh Umasankar <umagesh@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.0 (GNU/Linux)
+
+mQGiBDy0ebgRBADuKIKD8PuJ4wKEV1h2AprwJjxCRx8vn48XNwfLZuvhw8cpArtK
+rZwhoGPPUPEEXgtTNerlKq4VwpAwcnvRz7oC/7aWkUbcR2sAyhfe2scohwPgw7Xv
++isWC0NDPdrxvXG/PUOG/cnELunr51ymybBqBxUd2gMhYIxPo67D+YPYLwCgwcZp
+yc/6kJa116ESWHrti342GD8D/1srpnRs9CiS1DQF1uZ1wW4vzj4VD61tKsjdWD8D
+V573R22iMDLSj4oMB536WxUH7snz8XsAKm/peqJ6G9m0smtmWA1ago5yzQj70WqF
+xzWBhHn2I/YfAQ8pb2s9q1lClj8elnCxT65L27ydBAZteejb2VqjtQ6iGy86PUT2
+wRUvBADZmoV1eIZJEM5NnxBv1EtvRYZtIQEzZ8dO2A1LOS7qlVr8IypljNPLGhzX
+VHNvVsjC9QMUSWeBsDedvQHQ3hJpIMnTI32XE1V4gX06gfVTZdhf2fLTtwnsHZp0
+oumqshGDVRhNJJdDYLikxWOxOfkNveKEqJFvtuBR+ZqqluQKebQlTWFnZXNoIFVt
+YXNhbmthciA8dW1hZ2VzaEBhcGFjaGUub3JnPohXBBMRAgAXBQI8tHm4BQsHCgME
+AxUDAgMWAgECF4AACgkQ76Pnee32LDWSRwCfeASWXvpdt7bSFPMtszU/7uPEktsA
+n23mYUN5WKJA1ZreW+0CcZ2ESnOviEYEExECAAYFAj5ogYgACgkQohFa4V9ri3IW
+YACgsxGig0PL0M86rJsA/IpXjBdg3ysAoJzsoUZ/7s2BxDfzF/FRTVIzS+TMuQEN
+BDy0eb8QBACBVb9YDJRp9Irzmq71Jf9FIPw+4g/cWpF3t/Eb7eSzMcOvTAXyNIWz
+aaOjHre7lFctHfq8ls/6gR7uqajiAnfQcfTcu7pp+F5KsU0Embt83SFzZ3aoJwET
+mB/LqUyrrGDiue3lU+flJO7UmcsRvtk0+BDkyCeB9HgfdpXbBLCyuwADBQP+PNxX
+4e1tg3ZJo/xNEnD2Re3HjmQRrr0RYJLUGjgQrAEONSgowx3IW8/JssmNJVjnYm0q
+jSKsb8rergCFJhPNZ8Dd/k00pKcrq+IN6j7WTYLqPce87zrGAZUtmDwDSp5mxy5E
+xWJJxsgBPk4YBQLzJt21A3BgK/i24Sze2VLbaZuIRgQYEQIABgUCPLR5vwAKCRDv
+o+d57fYsNa8xAJ4mLfonZbd64+YY9rfvhIh3Vsl3AACeLPPKtma2K6XCfhTBEDnj
+hzSr4vo=
+=lBfF
+-----END PGP PUBLIC KEY BLOCK-----
+pub  1024D/265B4C63 2003-08-18 Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+sig 3       265B4C63 2003-12-06   Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+sig 3       5F6B8B72 2003-12-12   Stefan Bodewig <bodewig@apache.org>
+uid                            Antoine Levy-Lambert (Apache Ant Committer) <antoine@antbuild.com>
+sig 3       265B4C63 2003-08-18   Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+sig 3       5F6B8B72 2003-12-12   Stefan Bodewig <bodewig@apache.org>
+sub  1024g/A3060393 2003-08-18
+sig         265B4C63 2003-08-18   Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.2 (MingW32)
+
+mQGiBD9AzmcRBACMqgb7IFvC/nLxw7mUAgHENeZXY3JOQJ8wVBevIbbMEeFvzHE2
+diFydqUXocPexduYr0ahkf033WvWdAiNqDLfVW/HFOsc1TpjbHkqPUHtJ62Ya5tg
+nH4UGN9BYZfMbfVDOSz41lYwmfK5HYgpZN/sBQBSKf2qgoFB+LxYaae8YwCgrWlu
+fYhf7fkKbbdSf3BGS67ggNkD/0VvkXkw1SEnPaqrkKGkPKomCTb2auGxcYYI3/rP
+1m+SGRf0gE1NtocmIEitiR6WvfKUjoMAXSCp5KdnUXmO9rwzkM002KCA7K5CY+e/
+2bLDuiQ3rNiD4mFfG6M+UnmZ+GMFba1p9Cp4PqLNLsCHz67t7hEsscTZQ8mZ9xKM
++GCsA/9P+XFM7JDn9MLhYab9qo1CkceBkthUP6jWGjuAZ00elmBCkpkzNv5aIzss
+xih2GpaU/tmcMjw8FGp0dTwzqdpmbZBLjunRnuBTir4m4l5G9rwl4JbfK1PVqk4a
+VKkh9W7/yqBcEfNcsfJO9cqaQ+PzcnCoDiD9UHEBYzUhrCKwhLRCQW50b2luZSBM
+ZXZ5LUxhbWJlcnQgKEFwYWNoZSBBbnQgQ29tbWl0dGVyKSA8YW50b2luZUBhbnRi
+dWlsZC5jb20+iFsEExECABsFAj9AzmcGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ
+hhTWqyZbTGMnOgCeJV2gI+1CIxMR7dcIhXjPkiusreIAn2SGOsPS0o89l0EIVuc9
+J2F03aB+iEYEExECAAYFAj/ZwioACgkQohFa4V9ri3J8CACgiGlh+td0BAnJPq19
+ovEQR2DJ02MAoLP203EF+BLPpykeTcGp8UEWmeGQtEBBbnRvaW5lIExldnktTGFt
+YmVydCAoQXBhY2hlIEFudCBDb21taXR0ZXIpIDxhbnRvaW5lQGFwYWNoZS5vcmc+
+iF4EExECAB4FAj/SSwYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQhhTWqyZb
+TGOh/QCfbrSoipMlizyGT6c8BOPEd9zzfi0AnRRTqTDzXzsGk4CG/BJME9CCm7Ts
+iEYEExECAAYFAj/ZwiMACgkQohFa4V9ri3IOVACgh2QHS1+cVjvM4eLjls1bJwWi
+o5IAoLtAszHrwHS5qrhvr2rtnlyyyV2guQENBD9AzmkQBACNpBfqi2PweozCtxoX
+PqzKdRDKqCw7TOrDR6lbP3z/ov/1SN5Vc0XqNzBSGqwBcmGWtneABkX7n4uzJrC5
+wvX/TZ/DkMvypPyeNVMu+/ZMlzdbx06OUDKr6Fy/NtaI7cN1rw+Igyv22Q8ilhhg
+s/5Rdj84EtJkWQjVRml6wXSAZwADBwP/TqyhOC4sA5YrePYGH8i46h0SU9dXjfEF
+JijC8vXZ+BNQHQVK3fjEXedZL8Zvvp1bsMu7Muz9SMnqygM1unp2NGxLRd/9315p
+Qh0VStYKn0xq13ybOKr0Gsyx5yyl3Nzlu/1qAR0es/zN4jV7/IQi3R2GOvezcpHX
+mkbsYiZAhu2IRgQYEQIABgUCP0DOaQAKCRCGFNarJltMYxcsAKCSJJUABlXYnLBj
+b+WtmAzu0JjZNACdFJ4KIATJDK/5ajFq5+irOpodoHc=
+=UomR
+-----END PGP PUBLIC KEY BLOCK-----
Index: win_installer/apache-ant-1.6.5/LICENSE
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/LICENSE	(revision 0)
+++ win_installer/apache-ant-1.6.5/LICENSE	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,203 @@
+/*
+ *                                 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.
+ */
Index: win_installer/apache-ant-1.6.5/LICENSE.dom
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/LICENSE.dom	(revision 0)
+++ win_installer/apache-ant-1.6.5/LICENSE.dom	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,71 @@
+This license came from:
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+
+W3C� SOFTWARE NOTICE AND LICENSE
+Copyright � 1994-2001 World
+Wide Web Consortium, <a href="http://www.w3.org/">World
+Wide Web Consortium</a>, (<a href=
+"http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href=
+"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related
+items) is being provided by the copyright holders under the
+following license. By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions:
+Permission to use, copy, modify, and distribute this software
+and its documentation, with or without modification,� for any
+purpose and without fee or royalty is hereby granted, provided that
+you include the following on ALL copies of the software and
+documentation or portions thereof, including modifications, that
+you make:
+
+The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.
+
+Any pre-existing intellectual property disclaimers, notices, or
+terms and conditions. If none exist, a short notice of the
+following form (hypertext is preferred, text is permitted) should
+be used within the body of any redistributed or derivative code:
+"Copyright � [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de
+Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/"
+
+Notice of any changes or modifications to the W3C files,
+including the date changes were made. (We recommend you provide 
+URIs to the location from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.
+____________________________________
+This formulation of W3C's notice and license became active on
+August 14 1998 so as to improve compatibility with GPL. This
+version ensures that W3C software licensing terms are no more
+restrictive than GPL and consequently W3C software may be
+distributed in GPL packages. See the older formulation for the
+policy prior to this date. Please see our Copyright FAQ for common 
+questions about using materials from
+our site, including specific terms and conditions for packages like
+libwww, Amaya, and Jigsaw. 
+Other questions about this notice can be
+directed to site-policy@w3.org.
+
+webmaster
Index: win_installer/apache-ant-1.6.5/LICENSE.sax
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/LICENSE.sax	(revision 0)
+++ win_installer/apache-ant-1.6.5/LICENSE.sax	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,20 @@
+This license came from: http://www.megginson.com/SAX/copying.html
+  However please note future versions of SAX may be covered 
+  under http://saxproject.org/?selected=pd
+
+
+This page is now out of date -- see the new SAX site at 
+http://www.saxproject.org/ for more up-to-date
+releases and other information. Please change your bookmarks.
+
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david@megginson.com
+2000-05-05
\ No newline at end of file
Index: win_installer/apache-ant-1.6.5/LICENSE.xerces
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/LICENSE.xerces	(revision 0)
+++ win_installer/apache-ant-1.6.5/LICENSE.xerces	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,56 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights 
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 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 end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:  
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written 
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
Index: win_installer/apache-ant-1.6.5/NOTICE
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/NOTICE	(revision 0)
+++ win_installer/apache-ant-1.6.5/NOTICE	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,15 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Ant distribution.                      ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   This product includes also software developed by :
+     - the W3C consortium (http://www.w3c.org) ,
+     - the SAX project (http://www.saxproject.org)
+
+   Please read the different LICENSE files present in the root directory of
+   this distribution.
Index: win_installer/apache-ant-1.6.5/README
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/README	(revision 0)
+++ win_installer/apache-ant-1.6.5/README	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,70 @@
+
+                                 A     N     T
+ 
+
+  What is it? 
+  -----------
+  
+  Ant is a Java based build tool. In theory it is kind of like "make" 
+  without makes wrinkles and with the full portability of pure java code.
+
+  
+  Why?
+  ----
+  
+  Why another build tool when there is already make, gnumake, nmake, jam, 
+  and others? Because all of those tools have limitations that its original 
+  author couldn't live with when developing software across multiple platforms. 
+  
+  Make-like tools are inherently shell based. They evaluate a set of 
+  dependencies and then execute commands not unlike what you would issue on a 
+  shell. This means that you can easily extend these tools by using or writing 
+  any program for the OS that you are working on. However, this also means that 
+  you limit yourself to the OS, or at least the OS type such as Unix, that you 
+  are working on.
+  
+  Makefiles are inherently evil as well. Anybody who has worked on them for any 
+  time has run into the dreaded tab problem. "Is my command not executing 
+  because I have a space in front of my tab!!!" said the original author of Ant 
+  way too many times. Tools like Jam took care of this to a great degree, but 
+  still use yet another format to use and remember.
+  
+  Ant is different. Instead a model where it is extended with shell based 
+  commands, it is extended using Java classes. Instead of writing shell 
+  commands, the configuration files are XML based calling out a target tree 
+  where various tasks get executed. Each task is run by an object which 
+  implements a particular Task interface.
+  
+  Granted, this removes some of the expressive power that is inherent by being 
+  able to construct a shell command such as `find . -name foo -exec rm {}` but 
+  it gives you the ability to be cross platform. To work anywhere and 
+  everywhere. And hey, if you really need to execute a shell command, Ant has 
+  an exec rule that allows different commands to be executed based on the OS 
+  that it is executing on.
+
+  The Latest Version
+  ------------------
+
+  Details of the latest version can be found on the Apache Ant
+  Project web site <http://ant.apache.org/>.
+
+
+  Documentation
+  -------------
+
+  Documentation is available in HTML format, in the docs/ directory.
+  For information about building and installing Ant, see
+  docs/manual/index.html
+
+
+  Licensing
+  ---------
+
+  This software is licensed under the terms you may find in the file 
+  named "LICENSE" in this directory.
+  
+
+  Thanks for using Ant.
+
+                                          The Apache Ant Project
+                                         <http://ant.apache.org/>
Index: win_installer/apache-ant-1.6.5/TODO
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/TODO	(revision 0)
+++ win_installer/apache-ant-1.6.5/TODO	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,9 @@
+Things that are scheduled for Ant 1.6.2.  Once this list is empty, we
+can roll the first beta.
+
+Please go ahead and assign things that are not already assigned to
+anybody else (assignments look like [Stefan]) to yourself - and please
+remove items from this list once they are complete.
+
+
+
Index: win_installer/apache-ant-1.6.5/WHATSNEW
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/WHATSNEW	(revision 0)
+++ win_installer/apache-ant-1.6.5/WHATSNEW	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,2950 @@
+Changes from Ant 1.6.4 to Ant 1.6.5
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+Fixed bugs:
+-----------
+
+* <move> was unable to replace existing files or write into
+  existing directories.  Bugzilla report 34962.
+
+* <macrodef> with redefined default values was incorrect. (Fix for
+   31215 had a bug). Bugzilla report 35109.
+
+* <javadoc> will convert backslashes to forwardslashes when generating file
+  list by useexternalfile. Bugzilla report 27814.
+
+Changes from Ant 1.6.3 to Ant 1.6.4
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+Fixed bugs:
+-----------
+
+* Sun javah failed with java.lang.NoClassDefFoundError.
+  Bugzilla report 34681.
+
+* DirectoryScanner.slowScan() was broken. Bugzilla report 34722.
+
+* DirectoryScanner.scan() could throw a NullPointerException on
+  case-insensitive filesystems (read Windows or MacOS X).
+
+* Get w/authentication failed with ArrayOutOfBoundsExceptions.
+  Bugzilla report 34734.
+
+* Granularity attribute for <sync> task was undocumented.
+  Bugzilla report 34871.
+
+* <unzip> and <untar> could leave file handles open on invalid
+  archives.  Bugzilla report 34893.
+
+* propertyset threw NPE with nested, mapped propertysets.
+
+* <ftp> up to date calculations were wrong.
+  Bugzilla report 34941.
+
+Other changes:
+--------------
+
+* AntXMLContext.setCurrentTargets() is now public. Bugzilla report 34680.
+
+Changes from Ant 1.6.2 to Ant 1.6.3
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* The subant task used the canonical version of a file path. This
+  has been changed to use the absolute path. Bugzilla 30438.
+
+* Tar now writes two EOF blocks rather than one.
+  Bugzilla report 28776
+
+* The Reference object now has a project field which it uses in preference
+  to the project passed in. This allows composite references to be
+  handled to nested projects.
+  Bugzilla report 25777
+
+* <junit> with filtertrace="true" will now also swallow lines for the
+  sun.reflect package.  If you need to see them in your stack trace,
+  you must set filtertrace to false.
+  Bugzilla Report 22758
+
+* The jikes compiler adapter now supports -bootclasspath, -extdirs and
+  -sourcepath and also uses the same logic for debug flags as javac.
+  This means, the jikes compiler adapter now requires Jikes 1.15 or later.
+  Bugzilla Reports 25868, 26404 and 32609.
+
+* Targets with identical name work in imported project. Bugzilla Report 34566.
+
+* The gcj compiler adapter used to include the Java runtime classes
+  even if includeJavaRuntime was set to false, unless the
+  bootclasspath has been specified as well.  It will now always adhere
+  to includeJavaRuntime, you may need to set it to true explicitly now
+  if you relied on the old behavior.
+
+Other changes:
+--------------
+
+* <javadoc> can now take an attribute 'executable'. Bugzilla report 30606.
+
+* New attribute ignorecontents for <different> selector
+
+* Javadoc fixes for Location, Project, and RuntimeConfigurable
+  Bugzilla 30160.
+
+* Enable to choose the regexp implementation without system property.
+  Bugzilla Report 15390.
+
+* Expose objects and methods in IntrospectionHelper. Bugzilla Report 30794.
+
+* Allow file attribute of <move> to rename a directory.
+  Bugzilla Report 22863.
+
+* Add xmlcatalog nested element to XmlProperty. Bugzilla report 27053.
+
+* New attribute alwayslog for <redirector> type.
+
+* Added <target> nested elements to <ant> and <antcall> to allow
+  specification of multiple sub-build targets, which are executed
+  with a single dependency analysis.
+
+* Refactored Target invocation into org.apache.tools.ant.Executor
+  implementations.  Bugzilla Reports 21421, 29248.
+
+* <rmic> now also supports Kaffe's rmic version shipping with Kaffe
+  1.1.2 and above.
+
+* added casesensitive attribute to <globmapper> and <regexpmapper>
+  Bugzilla report 16686
+
+* added handledirsep attribute to <globmapper> and <regexpmapper>
+  Bugzilla report 32487
+
+* added a new mapper <filtermapper>
+
+* When a BuildListener tried to access System.err or System.out, Ant
+  would have thrown an exception - this has been changed.  Ant now
+  silently ignores the message.  BuildListeners still should avoid
+  accessing either stream.
+
+* Added a comment attribute to the zip task.
+  Bugzilla report 22793.
+
+* Overloaded FileUtils.createNewFile with a boolean mkdirs attribute
+  to create nonexistent parent directories.
+
+* <apply> has a new "force" attribute that, when true, disables
+  checking of target files.
+
+* Made the dest attribute of the apply task optional; mapped target
+  filenames will be interpreted as absolute pathnames when dest is omitted.
+
+* Changed default tempdir for <javac> from user.dir to java.io.tmpdir.
+
+* Added searchpath attribute to <exec> for searching path variable(s)
+  when resolveexecutable = true.
+
+* Added revision and userid attributes to <pvcs> documentation.
+
+* Added support to the touch task for a mkdirs attribute to create
+  nonexistent parent directories before touching new files.
+
+* Added support to the touch task for a pattern attribute to allow
+  alternate datetime formats.
+
+* Added support to the touch task to map touched files using a nested
+  mapper element.
+
+* Added support to the touch task for a verbose attribute to suppress
+  logging of new file creation.
+
+* bad link in docs to the enhancement page in bugzilla.
+  Bugzilla report 33252.
+
+* Added length task to get strings' and files' lengths.
+
+* <native2ascii> and <javah> now also support Kaffe's versions.
+
+* Recursive token expansion in a filterset can now be disabled by
+  setting its recurse attribute to false.
+
+* Pathconvert no longer requires that one of (targetos|pathsep|dirsep)
+  be set; platform defaults are used when this is the case.
+
+* Added preservelastmodified attribute to fixcrlf task. Bugzilla 25770.
+
+* Added isfileselected condition.
+
+* Added verbose="true|false" attribute to <subant>. When verbose is enabled,
+  the directory name is logged on entry and exit of the sub-build. Bugzilla 33787.
+
+* Added -nouserlib option to allow running ant without automatically loading
+  up ${user.home}/.lib/ant. This is useful when compiling ant, and antlibs.
+  Modified the build.sh and build.bat to use the option.
+
+* Added -noclasspath option to allow running ant WITHOUT using CLASSPATH env
+  variable. Modified ant.bat to do this so that %CLASSPATH% is not looked at.
+
+* Add else attribute to the condition task, which specifies an
+  optional alternate value to set the property to if the nested
+  condition evaluates to false. Bugzilla report 33074.
+
+* Ant generated jar files should now be detected as jar files by
+  Solaris.  Bugzilla Report 32649.
+
+* Added two tutorials
+  - beginner: introduction into Ant
+  - task developers: using path, fileset etc
+
+* <rpm> has new attributes failonerror and quiet.
+
+Fixed bugs:
+-----------
+
+* Do not pass on ThreadDeath when halting <java fork="false">. Bugzilla
+  32941.
+
+* Killing a thread running <java fork="true"> (e.g. from an IDE) would
+  not stop the forked process. Bugzilla 31928.
+
+* Programs run with <java fork="true"> can now accept standard input
+  from the Ant console.  (Programs run with <java fork="false"> could
+  already do so.)  Bugzilla 24918.
+
+* AbstractCvsTask prematurely closed its outputStream and errorStream.
+  Bugzilla 30097.
+
+* Impossible to use implicit classpath for <taskdef>
+  when Ant core loader != Java application loader and
+  Path.systemClassPath taken from ${java.class.path} Bugzilla 30161.
+
+* MacroInstance did not clean up nested elements correctly in the execute 
+  method, causing multiple use of the same macro instance with nested
+  elements to fail.
+
+* checksum fileext property doc wrong. Bugzilla 30787.
+
+* FTP task, getTimeDiff method was returning wrong value. Bugzilla 30595.
+
+* Zip task was not zipping when only empty directories were found.
+  Bugzilla 30365.
+
+* Jar task was not including manifest files when duplicate="preserve" was
+  chosen. Bugzilla 32802.
+
+* Classpath was treated in the same way as -lib options. Bugzilla 28046.
+
+* Manual page for cvsversion contained incorrect attributes and did not
+  say since 1.6.1. Bugzilla 31408.
+
+* Typo in definition of <cvsversion> task causing it not to be defined.
+  Bugzilla 31403.
+
+* Execution of top level tasks in imported files get delayed by targets.
+  Bugzilla report 31487.
+
+* ExecTask executes checkConfiguration() even though os does not match.
+  Bugzilla report 31805.
+
+* Concat task instance could not be run twice.
+  Bugzilla report 31814.
+
+* NPE using XmlLogger and antlib.
+  Bugzilla report 31840.
+
+* Properties.propertyNames() should be used instead of .keys().
+  Bugzilla report 27261.
+
+* Target location is not set for default target.
+  Bugzilla report 32267.
+
+* Incorrect classloader parent in junittask when using with
+  ant-junit.jar and junit.jar not in the project classloader. Bugzilla
+  report 28474.
+
+* getResources() on the classloader returned by ClasspathUtils would
+  see each resource twice - if the resource is in the project
+  classpath and if the classloader is requested with a null path.
+
+* XMLValidate used URL#getFile rather than the ant method FileUtils#fromURI
+  Bugzilla report 32508
+
+* fixed Regexp-Mapper docs which gave outdated instructions (optional.jar)
+  Bugzilla report 28584
+
+* <scp> using <fileset> didn't work with OpenSSH 3.9 and later.
+  Bugzilla report 31939
+
+* <setproxy> failed to set user/password on some JDKs.
+  Bugzilla report 32667
+
+* untar would go into infinite loop for some invalid tar files.
+  Bugzilla report 29877
+
+* forked <javac> won't pass -source to a JDK 1.1 or 1.2 javac anymore.
+  Bugzilla report 32948
+
+* propertyset references did not handle nested propertyset references.
+
+* oata.types.Description.getDescription(Project) would throw a
+  NullPointerException when the "ant.targets" reference was unset.
+
+* Wrapper scripts did not detect WINNT value of dynamic OS environment
+  variable when logged into workstations using Novell authentication.
+  Bugzilla Report 30366.
+
+* DependScanner.getResource() always returned nonexistent resources,
+  even when the resource actually existed.  Bugzilla Report 30558.
+
+* <apply> was broken with classfilesets.  Bugzilla Report 30567.
+
+* <available> returned false positives when checking a file
+  passed in with the current basedir leading twice:
+  e.g. ${basedir}${file.separator}${basedir}${file.separator}foo .
+
+* The first file open that took place when using input files with the
+  <exec>, <apply>, or <java> tasks was always logged to System.out
+  instead of to the managing Task.
+
+* <telnet> and <rexec> would try to disconnect from servers they never
+  connetced to, potentially leading to exceptions in commons-net.
+  Bugzilla Report 33618.
+
+* <zip> would drop files matched by defaultexcludes during updates.
+  Bugzilla Report 33412.
+
+* <zip> couldn't store files with size between 2GB and 4GB (the
+  upper limit set by the ZIP format itself).  Bugzilla Report 33310.
+
+* NPE when when <presetdef> tries to configure a task that
+  cannot be instantiated. Bugzilla Report 33689.
+
+* <javac debug="false"> created an invalid command line when running
+  the Symantec Java compiler.
+
+* Get with usetimestamp did not work on Java 1.2.
+
+* Get with usetimestamp did not work when local timestamp roughly >= now.
+
+* The framed JUnit report now handles multiple reports for the same
+  testcase properly.  Bugzilla Report 32745.
+
+* <cab> didn't work for files with spaces in their names on Windows.
+  Bugzilla Report 17182.
+
+* The VAJ tasks could fail if the project name contained characters
+  that need to get URL encoded.  Bugzilla Report 23322.
+  
+* The FTP task could crash with an ArrayIndexOutOfBoundsException
+  Bugzilla Report 28797
+  
+* Improved handling of paths on cygwin
+  Bugzilla Report 31245
+
+* TarInputStream#read() wasn't implemented correctly.  Bugzilla Report
+  34097.
+
+* <xslt> failed to process file-hierarchies of more than one level if
+  scanincludeddirectories was true.  Bugzilla Report 24866.
+
+* forkmode="perBatch" or "once" would ignore extension attributes that
+  had been specified for <formatter>s.  Bugzilla Report 32973.
+  
+* minor performance update of Locator.fromUri. Bugzilla Report 34529.
+
+* The refid attribute of the I/O redirector was not functional.
+
+* SQL task would try access result sets of statements that didn't
+  return any, causing problems with Informix IDS 9.2 and IBM DB2 8.1
+  FixPak 6 (or later). Bugzilla Reports 27162 and 29954.
+
+* make sure that Zip and its derivates call the createEmptyZip method when
+ there are no resources to zip/jar/...
+
+* ant.bat was missing runAntNoClasspath label for goto.
+  Bugzilla 34510.
+
+
+Changes from Ant 1.6.1 to Ant 1.6.2
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* The import task used the canonical version of a file path. This
+  has been changed to use the absolute path. Bugzilla 28505.
+
+* ant-xalan2.jar has been removed since the only class contained in it
+  didn't depend on Xalan-J 2 at all.  Its sole dependency has always
+  been TraX and so it has been merged into ant-trax.jar.
+
+* All exceptions thrown by tasks are now wrapped in a buildexception
+  giving the location in the buildfile of the task.
+
+* Nested elements for namespaced tasks and types may belong to the
+  Ant default namespace as well as the task's or type's namespace.
+
+* <junitreport> will very likely no longer work with Xalan-J 1.
+
+  Note that Xalan-J 1 has been deprecated for a very long time and we
+  highly recommend that you upgrade.
+
+  If you really need to continue using Xalan-J 1, please copy the
+  junit-frames-xalan1.xsl from the distribution's etc directory as
+  junit-frames.xsl into a new directory and use the task's styledir
+  attribute to point to.  This is the last version of the XSLT
+  stylesheet that is expected to be compatible with Xalan-J 1.
+
+* <csc>'s extraoptions can now contain multiple arguments.
+  Bugzilla Report 23599.
+
+* <macrodef> with default values set by properties would be
+  seen as new definitions when called twice with different properties.
+  This was confusing so the definitions are now treated as similar.
+  Bugzilla Report 31215.
+
+* <javadoc> has a new attribute "includenosourcepackages" that can be
+  used to document packages that don't hold source files but a
+  package.html file.  Bugzilla Report 25339.
+
+Fixed bugs:
+-----------
+
+* eliminate memory leak in AntClassLoader. Bugzilla Report 8689.
+
+* subant haltonfailure=false did not catch all failures. Bugzilla Report 27007.
+
+* macrodef @@ escaping was broken.  Bugzilla Report 27069.
+
+* SQL task did not work with Informix IDS 9.2. Bugzilla Report 27162.
+
+* MacroDef did not allow attributes named 'description'. Bugzilla Report 27175.
+
+* Throw build exception if name attribute missing from patternset#NameEntry.
+  Bugzilla Report 25982.
+
+* Throw build exception if target repeated in build file, but allow targets
+  to be repeated in imported files. 
+
+* <apply> didn't compare timestamps of source and targetfiles when
+  using a nested <filelist>.  Bugzilla Report 26985.
+
+* tagdiff.xml was broken in ant 1.6.1. Bugzilla Report 27057.
+
+* if the basedir contained .. or . dirs, and the build file name contained
+  .. or ., the basedir was set incorrectly. Bugzilla Report 26765.
+
+* regression from ant 1.5, exec task outputted two redundant trailing newlines.
+  Bugzilla Report 27546.
+
+* NPE when running commons listener. Bugzilla Report 27373.
+
+* <java> swallowed the stack trace of exceptions thrown by the
+  executed program if run in the same VM.
+
+* -projecthelp swallowed (configuration) errors silently.
+  Bugzilla report 27732.
+
+* filterset used by filtertask doesn't respect loglevel. Bugzilla Report 27568.
+
+* wrong compare used in ProjectComponent for logging. Bugzilla Report 28070.
+
+* failOnAny attribute for <parallel> was broken. Bugzilla Report 28122.
+
+* If <javac> uses gcj and any of the nested <compilerarg>s implies
+  compilation to native code (like -o or --main), Ant will not pass
+  the -C switch to gcj.  This means you can now compile to native code
+  with gcj which has been impossible in Ant < 1.6.2.
+
+* <import optional="false"> and <import optional="true">
+  behaved identically.
+
+* <xslt> now sets the context classloader if you've specified a nested
+  <classpath>.  Bugzilla Report 24802.
+
+* <zip> and friends would delete the original file when trying to update
+  a read-only archive.  Bugzilla Report 28419.
+
+* <junit> and <assertions> are working together. Bugzilla report 27218
+
+* AntClassLoader#getResource could return invalid URLs.  Bugzilla
+  Report 28060.
+
+* Ant failed to locate tools.jar if the jre directory name wasn't all
+  lowercase.  Bugzilla Report 25798.
+
+* Redirector exhibited inconsistent behavior with regard to split
+  output.  When sent to file only, files would be created in all
+  cases; when split file-property, files were only created if
+  writes were performed.
+
+* fixed case handling of scriptdef attributes and elements.
+
+* UNC pathnames did not work for ANT_HOME or -lib locations on Windows.
+  Bugzilla report 27922.
+
+* replacestring tokenfilter only replaced the first occurrence.
+
+* AntLikeTasksAtTopLevelTest failed on cygwin.
+
+* I/O-intensive processes hung when executed via <exec spawn="true">.
+  Bugzilla reports 23893/26852.
+
+* JDependTask did not close an output file. Bugzilla Report 28557.
+
+* Using <macrodef> could break XmlLogger. Bugzilla Report 28993.
+
+* <genkey> no longer requires keytool to be in your PATH.  Bugzilla
+  Report 29382.
+
+* <symlink> could create cyclic links.  Bugzilla Report 25181.
+
+* <zip whenempty="skip"> didn't work in a common situation.  Bugzilla
+  Report 22865.
+
+* <scp> now properly handles remote files and directories with spaces
+  in their names.  Bugzilla Report 26097.
+
+* <scp> now has (local|remote)tofile attributes to rename files on the
+  fly.  Bugzilla Report 26758.
+
+* <telnet> and <rexec> didn't close the session.  Bugzilla Report 25935.
+
+* <subant> and XmlLogger didn't play nicley together.
+
+Other changes:
+--------------
+* doc fix concerning the dependencies of the ftp task
+  Bugzilla Report 29334.
+
+* <xmlvalidate> has now a property nested element,
+  allowing to set string properties for the parser
+  Bugzilla Report 23395.
+
+* Docs fixes for xmlvalidate.html, javadoc.html, starteam.
+  Bugzilla Reports 27092, 27284, 27554.
+
+* <pathconvert> now accepts nested <mapper>s.  Bugzilla Report 26364.
+
+* Shipped XML parser is now Xerces-J 2.6.2.
+
+* Added nested file element to filelist.
+
+* spelling fixes, occurred. Bugzilla Report 27282.
+
+* add uid and gid to tarfileset. Bugzilla Report 19120.
+
+* <scp> has a verbose attribute to get some feedback during the
+  transfer and new [local|remote][File|Todir] alternatives to file and
+  todir that explicitly state the direction of the transfer.
+
+* The OS/2 wrapper scripts have been adapted to use the new launcher.
+  Bugzilla Report 28226.
+
+* <sshexec> now also captures stderr output.  Bugzilla Report 28349.
+
+* <xslt> now supports a nested <mapper>.  Bugzilla Report 11249.
+
+* <touch> has filelist support.
+
+* <nice> task lets you set the priority of the current thread; non-forking
+  <java> code will inherit this priority in their main thread.
+
+* New attribute "negate" on <propertyset> to invert selection criteria.
+
+* Target now supports a Location member.  Bugzilla Report 28599.
+
+* New "pattern" attribute for <date> selector.
+
+* <junit> has a new forkmode attribute that controls the number of
+  Java VMs that get created when forking tests.  This allows you to
+  run all tests in a single forked JVM reducing the overhead of VM
+  creation a lot.  Bugzilla Report 24697.
+
+* <jar> can now optionally create an index for jars different than the
+  one it currently builds as well.  See the new <indexjars> element
+  for details.  Bugzilla Report 14255.
+
+* Permit building under JDK 1.5. Bugzilla Report 28996.
+
+* minor Javadoc changes. Bugzilla Report 28998.
+
+* Misc. corrections in SignJar.java. Bugzilla Report 28999.
+
+* Remove redundant <hr> from javah.html. Bugzilla Report 28995.
+
+* Ignore built distributions. Bugzilla Report 28997.
+
+* A new roundup attribute on <zip> and related task can be used to
+  control whether the file modification times inside the archive will
+  be rounded up or down (since zips only store modification times with
+  a granularity of two seconds).  The default remains to round up.
+  Bugzilla Report 17934.
+
+* A binary option has been added to <concat>. Bugzilla Report 26312.
+
+* Added DynamicConfiguratorNS, an namespace aware version of
+  DynamicConfigurator. Bugzilla Report 28436.
+
+* Add implicit nested element to <macrodef>. Bugzilla Report 25633.
+
+* Add deleteonexit attribute to <delete>.
+
+* Added Target.getIf/Unless().  Bugzilla Report 29320.
+
+* <fail> has a status attribute that can be used to pass an exit
+  status back to the command line.
+
+* <fail> accepts a nested <condition>.
+
+* <loadproperties> supports loading from a resource.
+  Bugzilla Report 28340.
+
+* Nested file mappers and a container mapper implementation have been
+  introduced.  Additionally, the <mapper> element now accepts "defined"
+  nested FileNameMapper implementations directly, allowing a usage
+  comparable to those of <condition>, <filter>, and <selector>.
+
+* New <redirector> type introduced to provide extreme I/O flexibility.
+  Initial support for <exec>, <apply>, and <java> tasks.
+
+* <apply> has a new ignoremissing attribute (default true for BC)
+  which will allow nonexistent files specified via <filelist>s to
+  be passed to the executable.  Bugzilla Report 29585.
+
+* <junitreport> now also works with Xalan XSLTC and/or JDK 1.5.
+  Bugzilla Report 27541.
+
+* <jspc> doesn't work properly with Tomcat 5.x.  We've implemented a
+  work-around but don't intend to support future changes in Tomcat
+  5.x.  Please use the jspc task that ships with Tomcat instead of
+  Ant's.
+
+Changes from Ant 1.6.0 to Ant 1.6.1
+=============================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* License is now Apache Software License 2.0
+  see http://www.apache.org/licenses/ for more information
+
+Fixed bugs:
+-----------
+* Remove a recursive template call in the junit xsls that could trigger a stack
+  overflow. It now uses Xalan extensions to call a Java class directly.
+  Bugzilla Report 19301
+  
+* Fix spurious infinite loop detection for filters (introduced in ant 1.6.0).
+  Bugzilla Report 23154.
+
+* Fix handling of default ant namespace for nested elements.
+
+* Fix jboss element of ejb task (introduced in ant 1.6.0).
+
+* <whichresource> failed to load classes correctly.
+
+* Ant could fail to start with a NullPointerException if
+  ANT_HOME/lib/ant-launcher.jar was part of the system CLASSPATH.
+
+* presetdef'ed types did not work with the ant-type attribute
+
+* fixed case handling of macrodef attributes and elements. Bugzilla
+  Reports 25687 and 26225.
+
+* <java> ignored the append attribute, Bugzilla Report 26137.
+
+* The gcj compiler adapter for <javac> failed if the destination
+  directory didn't exist.  Bugzilla Report 25856.
+
+* Ant now fails with a more useful message if a new process will be
+  forked in a directory and that directory doesn't exist.
+
+* <splash> used to break the build on non-GUI environments.  Bugzilla
+  report 11482.
+
+* Ant 1.6.0 cannot run build scripts in directories with non-ASCII names.
+  Bugzilla Report 26642.
+
+Other changes:
+--------------
+* Shipped XML parser is now Xerces-J 2.6.1
+
+* Translate task logs a debug message specifying the number of files
+  that it processed.  Bugzilla Report 13938.
+
+* <fixcrlf> has a new attribute - fixlast. Bugzilla Report 23262.
+
+* <p4submit> has 2 new attributes, needsresolveproperty and changeproperty.
+  Bugzilla Report 25711.
+
+* add description attributes to macrodef attributes and elements.
+  Bugzilla Report 24711.
+
+* Extending ClearCase Tasks :
+ - Added an extra option to 'failonerr' to each ClearCase task/command.
+ - Extended the functionality of cccheckout. It can check (notco) to see if
+  the desired element is already checked out to the current view. Thus it
+   won't attempt to check it out again.
+ - Added three new ClearCase commands: ccmkattr, ccmkdir, ccmkelem
+  Bugzilla Report 26253.
+
+* added nested text support to <macrodef>
+  
+* added initial support for Java 1.5.  Java 1.5 is now correctly
+  detected by Ant and treated just like Java 1.4.  You can now specify
+  source="1.5" in the <javac> task.
+
+* created new task <cvsversion>
+
+* added support for branch logging via the tag attribute in <cvschangelog>
+  Bugzilla Report 13510.
+
+* added support the groovy language in the script and scriptdef tasks
+
+Changes from Ant 1.5.4 to Ant 1.6.0
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* This version of Ant can not be built with JDK 1.1 and requires at
+  least Java 1.2 at runtime as well.  Compiling for a 1.1 target is
+  still supported.
+
+* Targets cannot have the empty string as their name any longer.
+
+* ant.jar's manifest does no longer include a Class-Path entry, so it
+  is no longer possible to run Ant via "java -jar ant.jar" without
+  manually altering the CLASSPATH.  Instead of that a file
+  ant-bootstrap.jar is included in the etc directory of the binary
+  distribution, copy this to the lib directory and use
+  "java -jar ant-bootstrap.jar" instead if you want to run Ant without
+  the wrapper script (not recommended).
+
+* The <script> task now requires Apache BSF instead of the older IBM
+  version.  See <http://jakarta.apache.org/bsf/>
+
+* <xmlproperty> will no longer fail if the file to be loaded doesn't exist.
+
+* XML namespaces are now enabled in the XML parser, meaning XML namespace
+  declarations no longer cause errors. However task names containing colons
+  will cause errors unless there is a corresponding namespace uri.
+
+* The <ftp> and <telnet> tasks now require Jakarta Commons Net instead
+  of the older ORO Netcomponents version.  See
+  <http://jakarta.apache.org/commons/net/index.html>.
+
+* <input> will no longer prompt the user and wait for input if the
+  addproperty attribute is set to a property that has already been
+  defined in the project.  If you rely on the task waiting for input,
+  don't use the addproperty attribute.
+
+* The Class-Path attribute in manifests will no longer merge the
+  entries of all manifests found, but will be treated like all other
+  manifest attributes - the most recent attribute(s) will be used.
+
+* New Launch mechanism implemented. This moves some functionality from
+  the batch files / shell scripts into Java. This removes environment
+  limitations, for command issues, directory depth issues on Windows. Also
+  allows a per-user library location to be used if the main Ant install
+  is locked down.
+
+* The Entry nested element of PropertyFile will not any more have its value
+  attribute (actually increment) overwritten with the new value of the entry
+  after execution.
+
+* Output stored from a <java> or <exec> task is now exactly as generated. No
+  conversion to platform end-of-line characters is performed.
+
+* <translate> will now preserve line endings.
+
+* <ftp> followsymlinks="false" in nested fileset definitions is explicitly
+  required in order to exclude remote symbolic links (when doing a get, chmod,
+  delete, rmdir).
+
+* The values of the Copy#fileCopyMap variable has changed from String to
+  String[]. (In java 1.5 terms it was Hashtable<String, String> and
+  is now Hashtable<String, String[]>). This will affect third party code
+  that extend Copy and override Copy#doFileOperations.
+
+* <loadproperties> didn't expand properties while <property file="..."/>
+  does, so they were not equivalent.  This has been fixed, which means
+  that propetries may get expanded twice if you use an
+  <expandproperties> filterreader.  Bugzilla Report 17782.
+
+* User defined tasks and typedefs are now handled internally in the
+  same way as predefined tasks and typedefs. Also tasks and typedefs
+  are resolved at a later stage. This causes some
+  differences especially for user defined task containers.
+
+* <checksum> log message "Calculating checksum ..." has been degraded
+  from INFO to VERBOSE.
+
+Fixed bugs:
+-----------
+* Filter readers were not handling line endings properly.  Bugzilla
+  Report 18476.
+
+* Filtersets were also not handling line endings properly.
+
+* Expand tasks did not behave as expected with PatternSets.
+
+* <property environment=... /> now works on OS/400.
+
+* <cab> could hang listcab on large <fileset>s.
+
+* The starteam stcheckout, stcheckin tasks now correctly compute
+  status of files against whatever local tree they are run against
+  and, optionally, will not process a file if it is current.
+  Previously you had to process everything unless you ran against the
+  default folder which wasn't the normal use-case for ant-starteam.
+  The stlist task now similarly displays that status correctly making
+  it a more generally useful tool.
+
+* entity includes would cause exceptions if path names included spaces.
+
+* addConfiguredXXX would not work for TaskAdapter wrapped tasks
+
+* Fix <ilasm> outputfile testing so that the output file does not need
+  to exist beforehand.
+
+* Ant will now exit with a return code of 1 if it encounters problems
+  with the command line arguments.
+
+* ClassLoader creation changes to use a factory method in Project. A new
+  class AntClassLoader2 implemented for 1.2+ specific features including
+  Package information and addition of classes specified in the Class-Path
+  element of a Jar's manifest.
+
+* It is now possible in <exec> to resolve the executable to a project
+  basedir or execution dir relative executable. The resolveExecutable
+  must be used to pick up such executables.
+
+* splash screen wouldn't disappear when build was finished.
+
+* <exec> output and error streams can now be redirected independently
+  to either a property or a file (or both)
+
+* TarEntry's File-arg constructor would fail with a
+  StringIndexOutOfBoundsException on all OSes where os.name is shorter
+  than seven characters.  Bugzilla Report 18105.
+
+* <copy> and <move>'s failonerror didn't apply to filesets pointing to
+  non-existant directories.  Bugzilla Report 18414.
+
+* The <stripjavacomments> filter sometimes removed parts of string
+  constants.  Bugzilla Report 17441.
+
+* <antlr> will now recompile your grammar if the supergrammar has
+  changed.  Bugzilla Report 12691.
+
+* <property env> will now work on Unices with /bin/env instead of
+  /usr/bin/env.  Bugzilla Report 17642.
+
+* <jar index="on"> could include multiple index lists.  Bugzilla 10262.
+
+* The index created by <jar> didn't conform to the spec as it didn't
+  include the top-level entries.  Bugzilla Report 16972.
+
+* <tar> and <zip> didn't honor the defaultexcludes attribute for the
+  implicit fileset.  Bugzilla Report 18637.
+
+* The <replacetokens> filter would throw an exception if the token's
+  value was an empty string.  Bugzilla Report 18625.
+
+* Perforce tasks relying on output from the server such as <p4change>
+  and <p4label> were hanging. Bugzilla Reports 18129 and 18956.
+
+* Improve exception and logging behavior of Perforce tasks.
+  Bugzilla report 18154.
+
+* build.sh install had a problem on cygwin (with REALANTHOME).
+  Bugzilla Report 17257
+
+* <replaceregexp> didn't work for multi-byte encodings if byline was false.
+  Bugzilla Report 19187.
+
+* <replaceregexp> was altering unnecessarily the timestamp of the directories
+  containing the files to process
+  Bugzilla Report 22541.
+
+* file names that include spaces need to be quoted inside the @argfile
+  argument using forked <javac> and (all JDKS).  Bugzilla Report 10499.
+  NB : a first correction was only introducing quotes for JDK 1.4
+  It has been changed to quote for all external compilers when paths
+  contain spaces.
+  Also the backslashes need to be converted to forward slashes
+  Bugzilla Report 17683.
+
+* Setting filesonly to true in <zip> and related tasks would cause the
+  archives to be always recreated.  Bugzilla Report 19449.
+
+* file names that include spaces need to be quoted inside the @argfile
+  argument using <javadoc> and JDK 1.4.  Bugzilla Report 16871.
+
+* <junit> didn't work with custom formatters that were only available
+  on the user specified classpath when a timeout occured.  Bugzilla
+  Report 19953.
+
+* <different> selector : make ignoreFileTimes effectively default to true
+  and fix a bug in the comparison of timestamps. Bugzilla Report 20205.
+
+* <different> selector can now be nested directly under a fileset
+  Bugzilla Report 20220.
+
+* <cvstagdiff> had a problem with "dd-MM-yy hh:mm:ss" formats
+  Bugzilla Report 15995.
+
+* <cvstagdiff> cvsroot and package attributes added to the root
+  element tagdiff of the xml output
+  Bugzilla Report 16081.
+
+* <cvstagdiff> had a problem with aliased modules and with requests for multiple modules
+  Bugzilla Reports 21373 and 22877.
+
+* <cvstagdiff> could not parse properly the revision number of new files with CVS 1.11.9 or higher
+  Bugzilla Report 24406.
+
+* <fixcrlf> make fixcrlf create its temporary files in the default directory
+  of FileUtils#createTempFile instead of the destination dir of fixcrlf.
+  Bugzilla Report 20870.
+
+* <ejbjar> implementation for Borland.
+  Prevent the task from being blocked by error messages coming from java2iiop.
+  Bugzilla Report 19385.
+
+* <unzip>'s and <untar>'s nested patternsets didn't work as documented
+  when the pattern ended in a slash or backslash.  Bugzilla Report 20969.
+
+* <fixcrlf> will now create the parent directories for the destination
+  files if necessary.  Bugzilla Report 20840.
+
+* <xmlproperty> now handles CDATA sections. BugZilla Report 17195
+
+* <translate> now translate tokens that are placed close together.
+  Bugzilla Report 17297
+
+* Nested websphere element for ejbjar does not support spaces in file name.
+  Bugzilla Report 21298
+
+* Don't multiply Class-Path attributes when updating jars.  Bugzilla
+  Report 21170.
+
+* Do not overwrite the value (increment) attribute of PropertyFile nested Entry element.
+  Bugzilla Report 21505.
+
+* Prevent sysproperties with no key or no value from being added in <junit>.
+  Bugzilla Report 21684.
+
+* Allow references to be properly inherited via antcall
+  Bugzilla Report 21724.
+
+* ftp chmod failed when the remote system was UNIX and local system Windows
+  Bugzilla Report 21865.
+
+* ftp put with chmod failed when the remote system was UNIX and local system Windows
+  Bugzilla Report 23143.
+
+* ftp did not set the ascii mode explicity, causing problems with ftp servers
+  having binary as default
+
+* ftp was not able to download files when they were pointed to by symbolic links
+  Bugzilla Report 14063.
+
+* ftp is able to download also directories pointed to by symbolic links.
+
+* replace would change \r\n into \r\r\n under Windows.
+
+* junitreport with frames did not display a link for classes without a package
+  or in the top package.
+  Bugzilla Report 21915.
+
+* Project.toBoolean(String) now handles null as argument and does not throw a
+  NullPointerException any more.
+
+* The socket condition will now close the socket created to test.
+  Bugzilla Report 23040.
+
+* <junit includeantruntime="true" fork="true"> replaced the CLASSPATH instead
+  of adding to it.  Bugzilla Report 14971.
+
+* <splash> could fail on JVMs that use null to indicate the system classloader.
+  Bugzilla Report 23320.
+
+* <xmlcatalog>s only worked when defined inside of tasks.  Bugzilla
+  Report 20965.
+
+* <csc> and siblings (<vbc> <jsharpc>) handle large filesets by
+automatic use of response files.  Bugzilla report #19630
+
+Other changes:
+--------------
+
+* Shipped XML parser is now Xerces 2.6.0
+
+* All tasks can be used outside of <target>s.  Note that some tasks
+  will not work at all outside of targets as they would cause infinite
+  loops (<antcall> as well as <ant> and <subant> if they invoke the
+  current build file).
+
+* Six new Clearcase tasks added.
+
+* A new filter reader namely tokenfilter has been added.  Bugzilla
+  Report 18312.
+
+* A new attribute named skip is added to the TailFilter and
+  HeadFilter filter readers.
+
+* The filesetmanifest attribute of <jar> has been reenabled.
+
+* The start and end tokens for <translate> may now be longer than a
+  single character.
+
+* <setproxy> lets you set the username and password for proxies that
+  want authentication
+
+* <loadproperties> has a new encoding attribute.
+
+* <echoproperties> can now create XML output.
+
+* <echoproperties> has a new srcfile attribute that can make it read
+  properties files and output them instead of Ant's properties.
+
+* <filterset> will now resolve filters recursively.
+
+* <input> has a new attribute that allows you to specify a default value.
+
+* Added <image> task (requires JAI).
+
+* <image> task has now proportions attribute in the <scale/> nested element
+  instead of keepproportions (bringing in more functionality)
+
+* New condition <isreference>
+
+* <ftp> now has a preservelastmodified attribute to preserve the
+  timestamp of a downloaded file.
+
+* new rmdir action for <ftp> that removes directories from a fileset.
+
+* <ftp> has attributes timediffauto and timediffmillis to use together
+  with the newer attribute to tell ant to take into account a time difference
+  between client and remote side.
+  Bugzilla Report 19358.
+
+* <ftp> has been optimized to go directly to the include patterns.
+  This reduces scanning time under UNIX when followsymlinks="true"
+  and casesensitive="true" (the default)
+  Bugzilla Report 20103.
+
+* The SOS and VSS tasks will no longer unconditionally prepend a $ to
+  vsspath or projectpath.
+
+* OS/400 now gets detected by the os condition.
+
+* <arg> has a new attribute pathref that can be used to reference
+  previously defined paths.
+
+* <xmlproperty> has been improved, you can now expand ${properties},
+  define ids or paths and use Ant's location magic for filename resolutions
+  in the XML file.
+
+* <xmlcatalog> will now support external catalogs according to the
+  OASIS "Open Catalog" standard - if resolver.jar (newer than version
+  1.0) from Apache's xml-commons is in your CLASSPATH.
+
+* Starteam tasks now have support for revision labels and build labels.
+  Checkouts now have the option of using repository timestamps, instead
+  of current.
+
+* new task <symlink> that creates and maintains symbolic links.
+
+* new tasks <chown> and <chgrp> which are wrappers of the Unix commands.
+
+* new task <attrib> to change file attributes on Windows systems.
+
+* <style> has a new attribute reloadstylesheet to work around a
+  bug in widespread Xalan versions.
+
+* <tarfileset> has a new dirmode attribute to specify the permissions
+  for directories.
+
+* <fixcrlf>'s eol attribute now also understands "mac", "unix" and "dos".
+
+* <classfileset> now picks up dependencies of the form MyClass.class. This
+  works for the code generated by the Sun java compiler. It may not work for
+  all compilers.
+
+* a new attribute "globalopts" can be added to all Perforce tasks.
+  You can put in it all the strings described by p4 help usage. Refer to
+  the docs for more information.
+
+* new Perforce tasks <p4integrate> , <p4resolve>, and <p4labelsync>
+
+* <p4submit> will change the property p4.change if the Perforce server
+  renumbers the change list.
+  It will set the property p4.needsresolve if the submit fails,
+  and the message says that file(s) need to be resolved.
+
+* <replaceregexp> now has an optional encoding attribute to support
+  replacing in files that are in a different encoding than the
+  platform's default.
+
+* The <exec> task may now have its input redirected from either a file
+  or a string from the build file. The error output can be separated
+  to a different file when outut is redirected. standard error may be
+  logged to the Ant log when redirecting output to a file
+
+* The <java> task also supports the input redirection and separate
+  error streams introduced to the <exec> task. In addition, it is now
+  possible to save the output into a property for use within the build
+  file as was possible with <exec> in Ant 1.5
+
+* The <javadoc> task <tag> subelement has been enhanced to allow files
+  with tag mappings to be used.
+
+* New tasks: <scp> supports file transfers, <sshexec> executes a
+  command over SSH.  They require jsch, a BSD licensed SSH library that
+  can be found at http://www.jcraft.com/jsch/index.html
+
+* New filterreader <escapeunicode/>.
+
+* Support for HP's NonStop Kernel (Tandem) OS has been added.
+
+* <cab>'s basedir attribute is now optional if you specify nested
+  filesets.  Bugzilla Report 18046.
+
+* New task <sync> that synchronizes two directory trees.
+
+* <apply> has new forwardslash attribute that can force filenames to
+  use forward slashes (/) as file separators even on platforms with a
+  different separator.  This is useful if you want to run certain
+  ported Unix tools.
+
+* Copy has a new outputencoding attribute that can be used to change
+  the encoding while copying files.  Bugzilla Report 18217.
+
+* The xml formatter for JUnit will now honor test case names set with
+  setName.  Bugzilla Report 17040.
+
+* JUnit now has an attribute reloading, which, when set to false,
+  makes the task reuse the same class loader for a series of tests.
+
+* <concat> now supports filtering and can check timestamps before
+  overriding a file.  Bugzilla Report 18166.
+
+* <junit> has a new attribute tempdir that controls the placement of
+  temporary files.  Bugzilla Report 15454.
+
+* <jdepend> now supports a new nested element <classespath> which is
+  the same as <sourcespath> but point to compiled classes (the
+  prefered mode of operation for JDepend > 2.5).  Additionally, nested
+  <exclude> elements can be used to exclude certain packages from
+  being parsed.  Bugzilla Report 17134.
+
+* The JProbe tasks now also work with JProbe 4.x.  Bugzilla Report 14849.
+
+* <javacc> and <jjtree> will now autodetect JavaCC 3.x and can use it.
+
+* <sql> has a new attribute to control escape processing.
+
+* <sql> is able to display properly several resultsets if you are
+  running a compound sql statement. Bugzilla Report 21594.
+
+* A new <containsregexp> selector has been added, that selects files
+  if their content matches a certain regular expression.
+
+* <antlr>'s debug attribute has been enabled.  Bugzilla Report 19051.
+
+* <mail> has a new attribute charset. Bugzilla Report 15434.
+
+* <mail> has new attributes user and password for SMTP auth.
+  maillogger can also use this.
+  The implementation only works with JavaMail (encoding="MIME").
+  Implementation with plain mail remains to do.
+  Bugzilla Report 5969.
+
+* <mail> and mailloger support SMTP over TLS/SSL
+  Bugzilla Report 19180.
+
+* <mail> the attributes from, replyto ,tolist, cclist, bcclist
+  can now contain email addresses of the form name <address@xyz.com>
+  or (name) address@xyz.com
+  Bugzilla Report 22474.
+
+* <mail> (version PlainMail)
+  prevent blank headers from being sent,
+  make the order of the headers of plain mail messages predictable
+  Bugzilla Report 22088.
+
+* <zipfileset> can now be defined in the main body of a project
+  and referred to with refid="xyz". Bugzilla Report 17007.
+
+* A wrapper script for OS/2 has been added.
+
+* <unzip> will now detect and successfully extract self-extracting
+  archives.  Bugzilla Report 16213.
+
+* <stcheckout> has a new attribute "converteol" that can be used to
+  control the automatic line-end conversion performed on ASCII files.
+  Bugzilla Report 18884.
+
+* Users can now modify the list of default excludes using the new
+  defaultexcludes task.  Bugzilla Report 12700.
+
+* There is a new data type <propertyset> that can be used to collect
+  properties.  It is supported by <ant>, <antcall>, <subant>, <java>,
+  <echoproperties> and <junit>.
+
+* <concat> can now control the encoding of the output as well and optionally
+  add new-line characters at the end of files that get concatenated but
+  don't end in newlines.  Bugzilla Report 12511.
+
+* <rpm> will detect the rpmbuild executable of RedHat 8.0 and newer
+  and use that if it is on your PATH.  Bugzilla Report 14650.
+
+* A new task <rexec> has been added that requires commons-net to work.
+  Bugzilla Report 19541.
+
+* <javadoc> now supports a nested <arg> element in addition to the
+  additionalparams attribute.
+
+* You can now determine the order of standard tags in <javadoc> via
+  <tag> elements - you must not use the description attribute for them.
+  Bugzilla Report 18912.
+
+* <javadoc> now supports the -noqualifier switch.  Bugzilla Report 19288.
+
+* <javac>'s executable attribute can now also be used to specify the
+  executable for jikes, jvc, sj or gcj.  Bugzilla Report 13814.
+
+* <javac> has a new attribute tempdir that can control the placement
+  of temporary files.  Bugzilla Report 19765.
+
+* A new magic property build.compiler.jvc.extensions has been added
+  that can be used to turn of Microsoft extensions while using the jvc
+  compiler.  Bugzilla Report 19826.
+
+* You can now limit the parallelism of <apply> and <chmod> by using the new
+  maxparallel attribute.
+
+* With the new addsourcefile attribute, you can make <apply> ommit the
+  source file names from the command line.  Bugzilla Report 13654.
+
+* <apply> and <chmod> now support nested <filelist>s as well as <dirset>s.
+  Bugzilla Reports 15929 and 20687.
+
+* <apply> and <chmod> will display a summary if you set the new
+  verbose attribute to true.  Bugzilla Report 19883.
+
+* <copy>/<move>'s failonerror attribute can now also be used to
+  continue the build if an I/O error caused a problem.  Bugzilla
+  Report 12999.
+
+* new selector <type/> allowing to select only files or only directories.
+  Bugzilla Report 20222.
+
+* <java> and <junit> now support a nested <bootclasspath> element that
+  will be ignored if not forking a new VM.
+
+* <junit>'s nested <formatter> elements now support if/unless clauses.
+
+* <ejbjar>
+  cmpversion attribute added
+  jboss element will look for jbosscmp-jdbc.xml descriptor
+  if ejbjar has cmpversion="2.0" set
+  Bugzilla Reports 14707 and 14709.
+
+* <pvcs> config attribute added to set the location of a specific PVCS
+  .cfg file
+  Bugzilla Report 9752
+
+* <mapper> has an "unpackage" mapper
+  Bugzilla Report 18908
+
+* Added <scriptdef> task allowing tasks to be defined using any BSF-supported
+  scripting language.
+
+* <touch>'s datetime attribute can now accept time with a granularity
+  of seconds as well.  Bugzilla Report 21014.
+
+* <checksum> has two new properties: totalproperty and todir.
+
+* FileUtils#createTempFile will now create temporary files in the
+  directory pointed to by the property java.io.tmpdir
+
+* <unzip> and friends now supports an optional encoding attribute to
+  enable it to expand archives created with filenames using an encoding
+  other than UTF8.  Bugzilla Report 10504.
+
+* <patch> has a new attribute destfile that can be used to create a new
+  file instead of patching files in place.
+
+* OpenVMS is detected as a valid OS family.
+
+* DirectoryScanner has been optimized for cases where include patterns do not
+  start with wildcards.  Bugzilla Report 20103.
+
+* DirectoryScanner begins to be optimized not to scan excluded directories.
+  Bugzilla Report 21941.
+
+* Added keep-going feature. Bugzilla Report 21144
+
+* The archives generated by <zip> and friends will now contain CRC and
+  size information in the "local file header", thereby providing this
+  information to applications that read the archives using
+  java.util.ZipInputStream.  Bugzilla Report 19195.
+
+* <copy> and <move> can now handle mappers that return multiple
+  mappings per source path. This behaviour is enabled by using
+  an enablemultiplemapping attribute. Bugzilla Report 21320.
+
+* <exec> will now work on OpenVMS (please read the notes in
+  <exec>'s manual page).  Bugzilla Report 21877.
+
+* <exec> will now have a new attribute spawn (default false).
+  If set to true, the process will be spawned. Bugzilla Report 5907.
+
+* <java> will now have a new attribute spawn (default false).
+  If set to true, the process will be spawned. Bugzilla Report 5907.
+
+* <parallel> now supports a timeout which can be used to recover
+  from deadlocks, etc in the parallel threads. <parallel> also
+  now supports a <daemons> nested element. This can be used to
+  run tasks in daemon threads which the parallel task will not
+  wait for before completing. A new attribute failonany will cause
+  <parallel> to throw an exception if any thread fails without
+  waiting for all other threads to complete.
+
+* <zip> and friends will consume far less memory than they used to
+  when run with compress="false".  Bugzilla Report 21899.
+
+* <if/> and <unless/> attributes added to <param/> element of <style>
+   Bugzilla Report 22044
+
+* <zip> and friends have a new attribute "keepcompression" that can be
+  used to incrementally build an archive mixing compressed and uncompressed
+  entries.
+
+* <junit>'s XML formatter adds a new classname attribute to the <testcase>
+  elements.
+
+* new <permissions> type add permission handling to the code
+  this type can be nested in the <java> and <junit> tasks.
+  Bugzilla Report 22533.
+
+* additional shortcuts for ant options (-d --> -debug, -e --> -emacs,
+  -h --> -help, -p --> -projecthelp, -s --> -find).
+
+* new selector <modified>. "cache" was renamed to "modified".
+  Bugzilla Report 20474.
+
+* <stcheckout> and <stlist> have a new asofdate attribute that can be
+  used to checkout/list files based on a date instead of a label.
+  Bugzilla Report 20578.
+
+* New filter <concatfilter>. Adds the content of file at the beginning
+  or end of a file. Discussion started at
+  http://marc.theaimsgroup.com/?l=ant-user&m=106366791228585&w=2
+
+* New task <import>
+
+* New task <macrodef>
+
+* New task <presetdef>
+
+* Ant libraries that can make use of namespaces to avoid name
+  clashes of custom tasks
+
+
+* <java> and <junit> now support <assertions>, which let you enable
+  and disable Java1.4 assertions on a package or class basis. These
+  only work when fork=true, currently.
+
+* .NET tasks expanded with VB support <vbc> and J#, via <jsharp>,
+  <importtypelib> and <ilasm>. <csc> supports nested <src> types,
+  <defines> for (potentially conditional) definitions, <reference>
+  filesets for references. The executable attribute lets you switch to
+  mono or other implementations -<csc> has been tested with Mono on
+  Linux and OSX.
+
+
+Changes from Ant 1.5.3 to Ant 1.5.4
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* If the Visual Age tasks used to work for you, they may stop doing so
+  now - and we'd like to know about it.  The current set of tasks is
+  supposed to work with any version of VAJ starting with 3.0.
+
+Fixed bugs:
+-----------
+
+* The Visual Age for Java tasks didn't work (at least for versions 3.0
+  and higher).  Bugzilla Report 10016.
+
+* URL-encoding in <vaj*port> didn't work properly.
+
+* VAJRemoteUtil called getAbsolutePath instead of getPath
+  causing problems when using a Windows VAJ server from a UNIX server.
+  Bugzilla Report 20457.
+
+* VAJImport task failed with NullPointerException when using DirectoryScanner.
+  Bugzilla Report 22080.
+
+Other changes:
+--------------
+
+* Shipped XML parser is now Xerces 2.5.0
+
+* <javah> will invoke oldjavah on JDK 1.4.2.  Bugzilla Report 18667.
+
+* The VAJ tasks now support a haltonfailure attribute to conditionally
+  keep building even if they fail.
+
+* It is now possible to use the latest (versioned or unversioned) edition
+  in <vajload> by using special wildcard characters.  Also fixes
+  Bugzilla Report 2236.
+
+Changes from Ant 1.5.2 to Ant 1.5.3
+===================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* The <zip> task and friends have again changed a method signature
+  (sorry, was necessary to fix bug 17780).  The return type of
+  getResourcesToAdd has changed.
+
+Fixed bugs:
+-----------
+
+* <zipfileset>'s filemode would get ignored and the dirmode was used
+  for the included files as well.  As a side effect, WinZIP was unable
+  to extract or display the files, so they seemed to be missing from
+  the archive.  Bugzilla Report 17648.
+
+* <ftp> could use the wrong path separator when trying to change the
+  remote working directory.  Bugzilla Report 17735.
+
+* <jar update="true"> would loose all original files if you didn't
+  specify any nested <(zip)fileset>s and the manifest had changed.
+  Bugzilla Report 17780.
+
+* If you used a value starting with \ on Windows for the appxml
+  attribute of <ear> or the webxml attribute of <war>, it would be
+  ignored.  Bugzilla Report 17871.
+
+* Ant will no longer implicitly add Sun's rt.jar in <javac> when you
+  use jvc and don't specify a bootclasspath.  Bugzilla Report 18055.
+
+* The prefix attribute of <zipfileset> would not generate directory
+  entries for the prefix itself.  Bugzilla Report 18403.
+
+* starteam checkout can now handle deleted labels.  Bugzilla Report 17646.
+
+* The Unix wrapper script failed if you invoked it as a relative
+  symlink and ANT_HOME has not been set.  Bugzilla Report 17721.
+
+Other Changes:
+--------------
+* Added ability to specify manifest encoding for the <jar> and
+  <manifest> tasks
+
+Changes from Ant 1.5.1 to Ant 1.5.2
+=============================================
+
+Changes that could break older environments:
+--------------------------------------------
+* ANT_OPTS environment variable is now applied at the start of the
+  Java command line, allowing position specific parameters of some
+  JVMs, such as -classic to be specified.
+
+* ZipScanner#getIncludedFiles will now return the names of the ZipEntries
+  that have been matched instead of the name of the archive.
+
+* The <zip> task and friends have been heavily modified, almost every
+  method signature of the Zip class has changed.  If you have subclassed
+  Zip (or one of its subclasses), your class will most likely not
+  compile against the current code base.  If it still compiles, it will
+  probably not work as in Ant 1.5.1.
+
+Fixed bugs:
+-----------
+* <translate> was not ignoring comment lines.
+
+* <manifest> wouldn't update an existing manifest if only an attribute
+  of an existing section changed.
+
+* ant.bat now supports the ANT_ARGS and JAVACMD environment variables
+  again (like Ant 1.5 did).
+
+* The "plain" <junit> <formatter> could throw a NullPointerException
+  if an error occured in setUp.
+
+* <junit> will now produce output when a test times out as well.
+
+* <replace> would count some internal character replacements when
+  reporting the number of replaced tokens.
+
+* <concat> would cause an exception if a <filelist> pointed to files
+  that do not exist.
+
+* <javadoc> will now pass -source to custom doclets as well.
+
+* <cvstagdiff> would throw a NullPointException if there had been no
+  differences.
+
+* <cvschangelog> could miss today's changes.
+
+* <concat> could append newline characters between concatenated files.
+
+* <xmlvalidate> ignored the specified encoding of the files to
+  validate.
+
+* the errorsbeginat attribute of the <http> condition didn't work.
+
+* Ant will try to force loading of certain packages like com.sun.*
+  from the system classloader.  The packages are determined by the
+  version of the JVM running Ant.
+
+* Ant didn't find the runtime libraries on IBM's JDK 1.4 for Linux.
+
+* random component of temporary files is now always a positive integer.
+
+* Ant could incorrectly try to use the 1.4 regexp implementation even
+  if it isn't available if you run the JVM with -Xverify:none.
+
+* Ant would die with an exception if you used nested <reference>
+  elements in Ant and the refid attribute didn't point to an existing
+  project reference.
+
+* The <get> task can now be compiled (and Ant thus bootstrapped) using
+  Kaffee.
+
+* build.sysclasspath will now be honored by more tasks.
+
+* The signjar keystore attribute has been reverted to a String allowing
+  it to once again accept URLs. This should not affect current File based usage
+  unless you are extending the Signjar task.
+
+* <jar update="true"> would remove the original manifest.
+
+* fix up folder creation in PVCS task
+
+* <tar>'s up-to-date check didn't work for nested <(tar)fileset>s.
+
+* Corrected a problem in XMLLogger where it would not associated
+  messages with a taskdef'd task
+
+* <uptodate> now works when using attributes (i.e. not filesets) and pointing
+  to the same file
+
+* Java task (and output system) now stores output which doos not end
+  with a line feed.
+
+* splash screen wouldn't disappear when build was finished.
+
+* <exec> now supports OS/2.
+
+* <zip> and friends would only update/recreate existing archives if
+  the files to add/update have been newer than the archive.
+
+* <javadoc>'s <link> element could fail for offline="true" on some JDKs.
+
+Other changes:
+--------------
+
+* MailLogger now sets the Date header correctly.
+
+* Shipped XML parser is now Xerces 2.3.0
+
+* signjar now accepts a maxmemory attribute to allow the memory allocated to the
+  jarsigner tool to be specified. The jarsigner from the JDK's JAVA_HOME bin
+  dir is now used rather than the first jarsigner on the path.
+
+* **/.DS_Store has been added to the list of default pattern excludes.
+
+* The Created-By header in the default manifest now contains the JVM
+  vendor and version according to the jar specification. A new header,
+  Ant-Version provides the Ant version used to create the jar.
+
+* <zip> can now store Unix permissions in a way that can be
+  reconstructed by Info-Zip's unzip command.
+
+Changes from Ant 1.5.1Beta1 to 1.5.1
+====================================
+
+Fixed bugs:
+-----------
+
+* <tstamp>'s prefix attribute failed to apply to nested <format> elements.
+
+* <junitreport> created an empty junit-noframes.html if no format had
+  been specified.
+
+* <basename> would remove more than it should if the file name
+  contained more than one dot.
+
+* <filterset>s nested into <filterset>s didn't work.
+
+Other changes:
+--------------
+
+* Shipped XML parser is now Xerces 2.2.0
+
+* Filesets now support a 'file' attribute, allowing a single-file
+  fileset to be constructed without having to specify its parent
+  directory separately.
+
+* <junit> will now return the result of a call to getName instead of
+  "unknown" for Test implementations that don't extend TestCase but have
+  a public String getName() method.
+
+Changes from Ant 1.5 to 1.5.1Beta1
+==================================
+
+Fixed bugs:
+-----------
+* Date/time in CvsChangeLog was in local timezone and 12 hour format leading
+  to a problem when sorting by time. It is now UTC (GMT) and in 24-hour
+  format as per cvs 'specifications'.
+
+* CvsTagDiff now supports ampersand modules or modules that have a different
+  root directory than their name.
+
+* EjbJar threw NPEs for the Websphere element. The property 'websphere.home'
+  was not documented.
+
+* Mail example in the documentation was not correct.
+
+* Checksum was broken in the following scenario:
+  (using verifyproperty OR in a condition) AND using filesets
+  with multiple files.
+
+* The ExpandProperties filter threw NPEs when defined using
+  the <filterreader> format.
+
+* The sh wrapper script didn't work under Cygwin if ANT_HOME wasn't
+  set with a Unix style filename.
+
+* The sh wrapper script could fail if you started Ant from a directory
+  with whitespace in its name.
+
+* ant -diagnostics was not working properly when the task dependency
+  was missing and was just printing the missing dependency.
+
+* If a task got redefined via <taskdef>, it lost its child elements.
+
+* <property>'s classpathref attribute was broken.
+
+* <arg line="''" /> would result in no command line argument, will now
+  be a single empty argument.  Use <arg value="''"/> if you need the
+  quotes literally.
+
+* <replaceregexp> could append a newline character at the end of the
+  file.
+
+Other changes:
+--------------
+
+* Appendix E of Java Development with Ant (Loughran/Hatcher) was
+  contributed to the docs.
+
+* <available> will only print deprecration warnings if it is actually
+  used to change the value of a property.
+
+Changes from Ant 1.5beta3 to Ant 1.5
+====================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* The filesetmanifest attribute added to <jar> after the 1.4.1
+  release has been removed for now.  This change may affect only
+  the 1.5Beta/1.6Alpha users.  An attempt will be made to add this
+  feature back into Ant 1.6.
+
+Fixed bugs:
+-----------
+
+* <zip> and friends would always update existing archive if you set
+  the update attribute to true.
+
+* To support backward compatibility with older versions, <pathconvert>
+  will once again set the property, even if the result is the empty
+  string, unless the new 'setonempty' attribute is set to false|no|off
+  (default is "true").
+
+* The manifest task would crash XmlLogger
+
+Other changes:
+--------------
+
+* added **/.svn and **/.svn/** to the default excludes
+
+Changes from Ant 1.5beta2 to Ant 1.5beta3
+=========================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* <pvcs> default filenameformat has been different from Ant 1.4.1.
+  Now it is different from 1.5beta1 and 1.5beta2.
+
+* <pathconvert> won't set the property if the result is the empty string.
+
+Fixed bugs:
+-----------
+
+* <available> could fail to find files or directories that happen to
+  start with the name of the project's basedir but are not children of
+  the basedir.
+
+* Nested <property>'s inside <ant> can now be overriden by subsequent
+  <ant> and <antcall> tasks.
+
+* <xslt>'s outputtype attribute wouldn't do anything.
+
+* <linecontains> filterreader could swallow lines.
+
+* <sequential> used to configure the tasks (set their attributes)
+  before the first task has been executed.  This means that properties
+  that have been set by nested task seemed to be unset for the other
+  tasks in the same <sequential> element.
+
+* <javac>'s sourcepath setting has been ignored by some compiler
+  implementations.
+
+* <javadoc>'s packagelist attribute didn't work.
+
+* the plain mailer would always use port 25 in <mail>.
+
+* Ant's default logger could swallow empty lines.
+
+* ejbjar's iPlanet nested element now can process multiple descriptors.
+
+* IPlanetEjbc was looking in the wrong place for four iiop files.
+
+* <javac> would pass the -source switch to JDK 1.3's javac, even
+  though it doesn't support it.
+
+Other changes:
+--------------
+
+* <checksum> now uses a buffer (of configurable size).
+
+* The "Trying to override task definition" warning has been degraded
+  to verbose level if the two task definitions only differ in the class
+  loader instance that has loaded the definition.
+
+* Add a jvmargs to the ejbjar's weblogic element to allow additional
+  arguments to be provided to the VM runnign ejbc. Document the
+  jvmdebuglevel attribute which can be used to avoid warnings about
+  interface classess being found on the classpath. Document the new
+  <sysproperty> element which allows JVM properties to be defined.
+  Added an outputdir attribute to allow the destination to be a
+  directory into which the exploded jar is written.
+
+* ejbjar now supports Borland Enterprise Server 5 and Jonas 2.5
+
+Changes from Ant 1.5beta1 to Ant 1.5beta2
+=========================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* Properties will now be expanded in mail message bodies.  This means
+that one $ sign will be stripped if your mail message contains the text
+$$.
+
+* org.apache.tools.ant.taskdefs.Expand no longer extends MatchingTask.
+
+* Available#setFile now again uses a File argument as it did in 1.4,
+this may break environments that have been adapted to the String
+argument version present in 1.5beta1.
+
+Fixed bugs:
+-----------
+* When <move> attempts a rename, it deletes the destination file, if it
+  exists, before renaming the source file.  However, <move> was not
+  checking if the destination file was actually a directory before
+  trying to delete it.
+
+* Make CVS Tasks to work under Cygwin.
+
+* Fix LineContains to handle huge files elegantly without causing
+Stack Overflows.
+
+* if you ask for the "classic" compiler on Java1.4, you get upgraded to
+"modern" because there is no classic compiler any more.
+
+* the <http> condition was viewing 404 'not found' exceptions as success. Now
+it defaults to viewing any response >=400 as an error, and has an errorsBeginAt
+attribute you can use if you want a higher or lower value.
+
+* <get> throws a build exception on an http authorization error, unless you
+have set ignoreerrors to true.
+
+* <wsdltodotnet> was spelt in Wintel case: <WsdlToDotnet>. It is now lower
+case, though the old spelling is retained for anyone who used it.
+
+* Merging of Manifests in jar now works as documented.
+
+* paths that have been separated by colons would be incorrectly parsed
+on NetWare.
+
+* runant.pl now supports NetWare.
+
+* <tempfile> and <setproxy> tasks were in beta1, but not defined by
+default; They now are. <tempfile> fills a property with the name of a
+temporary file; <setproxy> lets you set the JVM's http, ftp and socks proxy
+settings.
+
+* <available classname="foo" ignoresystemclasses="true"> failed for
+JDK 1.1 and 1.2, even if the class could be found on the
+user-specified classpath.
+
+* <property environment=... /> now works on z/OS.
+
+* forked <javac> failed for the wrong reason on JDK 1.1 - Ant would
+use a temporary file to hold the names of the files to compile under
+some conditons, but 1.1 doesn't support this feature.  Ant will no
+longer try this, but you may run into problems with the length of the
+command line now.
+
+* the refid attribute for <property>s nested into <ant> or <param>s
+nested into <antcall> didn't work.
+
+* <replaceregexp> didn't work for nested <fileset>s.
+
+* <javadoc> dropped sourcepath entries if no "interesting" .java
+source files  could be found below them.  This has been backwards
+incompatible and caused problems with custom doclets like xdoclet.
+
+* Using the doclet, docletpath or docletpathref attributes of
+<javadoc> may have caused NullPointerExceptions.
+
+* nested <filesets> of <javadoc> would include too much.
+
+* <dependset> will no longer choke on <targetfileset>s that point to
+non-existing directories.
+
+* <patch> didn't work at all.
+
+* <replace> and <replaceregexp> now fail if the file they are working
+on is locked.
+
+* <javadoc> would pick up the wrong executable in the combination JDK
+1.2  and AIX.
+
+Other changes:
+--------------
+
+* z/OS now gets detected by the os condition.
+
+* <fileset> and <dirset> now have an optional followsymlink attribute
+that can prevent Ant from following symbolic links on some platforms.
+
+* BeanShell is now supported in the <script> task.
+
+* <ejbjar> under Weblogic attempts to use the ejbc20 compiler for 2.0 beans
+  based on the deployment descriptor's DTD reference. Under weblogic 7.00 Beta
+  this ejbc class has been deprecated. To avoid the deprecation warning use
+  ejbcclass="weblogic.ejbc".
+
+* <ejbjar> will add a manifest to the generated jar based on the naming
+  convention in use. This overrides the manifest specified in the
+  <ejbjar> attribute
+
+
+Changes from Ant 1.4.1 to 1.5beta1
+==================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* Important: Single $ signs are no longer silently stripped!
+  Before you panic that we have broken all your build files, we have kept
+  the old "$$" -> "$" behaviour. So only build files which accidentally had
+  a $ sign in a string that was being silently stripped may break.
+  We added this fix to stop newbie confusion; if you want to write a
+  build file which works on ant versions 1.4.1 or earlier, stay with
+  the double $$ sign rule.
+
+* Project.getBuildListeners now returns a clone of the listener
+  list. Changes to the returned list will not affect the listeners
+  currently attached to the Project. It also means that it is safe to
+  iterate over the returned list if listeners are added or removed
+  during the traversal.
+
+* <pvcs> default filenameformat has been different from Ant 1.4.1.
+
+* Some messages that are printed during startup will not be
+  written to the logfile specified via -logfile as they might destroy
+  the format of the file for special BuildLoggers (like XmlLogger).
+
+* The filesetmanifest attribute added to <jar> after the 1.4.1
+  release has been removed for now.  This change may affect only
+  the 1.5Beta/1.6Alpha users.  An attempt will be made to add this
+  feature back into Ant 1.6.
+* Shipped XML parser is now Xerces 2.0.1 along with the XML Parser APIs.
+  XML Parser APIs is a separate jar that contains the necessary
+  JAXP/DOM/SAX classes.
+
+* <telnet> was fixed to expand properties inside nested <read> and
+  <write> elements; before this only happened when you assigned the text
+  to the string attribute. If you had $ signs in the string, they may
+  need escaping.
+
+* the RegexpMatcher interface has been extended to support case
+  insensitive matches and other options - custom implementations of
+  this interface won't work any longer.  We recommend to use the new
+  Regexp interface that also supports substitution instead of the
+  RegexpMatcher interface in the future.
+
+* <gzip> will throw an exception if your src attribute points to a directory.
+
+* Unjar, Unzip and Unwar will throw an exception if the Src attribute
+  represents a directory.  Support for nested filesets is provided
+  instead.
+
+* It is no longer possible to overwrite a property using tasks like
+  <condition>, <exec>, <pathconvert>, or <tstamp>. In some exceptional
+  cases it will generate a warning if you attempt to overwrite an
+  existing property.
+
+* Taskwriters please note: Whenever tasks had any overloaded set* methods,
+  Ant's introspection mechanism would select the last overloaded method
+  provided to it by the Java Runtime.  A modification has now been made such
+  that when the Java Runtime provides a method with a String as its argument,
+  a check is made to see if there is another overloaded method that takes in
+  some other type of argument.  If there is one such method, then the method
+  that takes in String as an argument is not selected by the Introspector.
+
+* The pattern definition **/._* has been included into the Default
+  Excludes list.
+
+* <propertyfile>'s <entry> element was modified to remove "never" as a value
+  as its behavior was undocumented and flakey.
+
+* The -projecthelp flag now only prints out targets that include the
+  'description' attribute, unless the -verbose or -debug flag is included
+  on the Ant command line.
+
+* Ant's testcases now require JUnit 3.7 or above, as they now use the new
+  assertTrue method instead of assert.
+
+* If the 'output' attribute of <ant> is set to a simple filename or a
+  relative path, the file is created relative to ${basedir}, not ${user.dir}.
+
+* The default value for build.compiler is now javac1.x with x
+  depending on the JDK that is running Ant instead of classic/modern.
+
+Fixed bugs:
+-----------
+
+* <available> could fail to find files or directories that happen to
+  start with the name of the project's basedir but are not children of
+  the basedir.
+
+* Nested <property>'s inside <ant> can now be overriden by subsequent
+  <ant> and <antcall> tasks.
+
+* <xslt>'s outputtype attribute wouldn't do anything.
+
+* <linecontains> filterreader could swallow lines.
+
+* <sequential> used to configure the tasks (set their attributes)
+  before the first task has been executed.  This means that properties
+  that have been set by nested task seemed to be unset for the other
+  tasks in the same <sequential> element.
+
+* <javac>'s sourcepath setting has been ignored by some compiler
+  implementations.
+
+* <javadoc>'s packagelist attribute didn't work.
+
+* the plain mailer would always use port 25 in <mail>.
+
+* Ant's default logger could swallow empty lines.
+
+* ejbjar's iPlanet nested element now can process multiple descriptors.
+
+* IPlanetEjbc was looking in the wrong place for four iiop files.
+
+* <javac> would pass the -source switch to JDK 1.3's javac, even
+  though it doesn't support it.
+
+* <zip> and friends would always update existing archive if you set
+  the update attribute to true.
+
+* To support backward compatibility with older versions, <pathconvert>
+  will once again set the property, even if the result is the empty
+  string, unless the new 'setonempty' attribute is set to false|no|off
+  (default is "true").
+
+* The manifest task would crash XmlLogger
+
+* A bug existed that prevented generated log files from being deleted as
+  part of the build process itself.  This has now been fixed.
+
+* Fixed bug where <move> ignored <filterset>s.
+
+* Ant works properly with the combination of Java1.4/WindowsXP.
+
+* Fixed bug where <java> used to sometimes invoke class constructors twice.
+
+* Fixed bug with 4NT shell support.
+
+* Fixed bug where ant would not perform ftp without remotedir being
+  specified even though this was not mandatory.
+
+* Fixed bug where ant would not copy system properties into new Project
+  in ant/antcall tasks when inheritall="false" is set.
+
+* <propertyfile> would not close the original property file.
+
+* <ant> will no longer override a subbuild's basedir with inheritall="true".
+
+* Fixed problem with the built-in <junit> formatters which assumed
+  that only one test could be running at the same time - this is not
+  necessarily true, see junit.extensions.ActiveTestSuite.
+
+* <jar>'s whenEmpty attribute is useless as JARs are never empty, they
+  contain at least a manifest file, therefore it will now print a
+  warning and do nothing.
+
+* <typedef> hasn't been all that useful as it couldn't be used outside
+  of targets (it can now) and nested "unknown" elements have always
+  been considered to be tasks (changed as well).
+
+* <fixcrlf> would fail for files that contained lines longer than 8kB.
+
+* Some junit formatters incorrectly assumed that all testcases would
+  inherit from junit.framework.TestCase.
+
+* <fixcrlf> dropped the first characters from Mac files.
+
+Other changes:
+--------------
+
+* <checksum> now uses a buffer (of configurable size).
+
+* The "Trying to override task definition" warning has been degraded
+  to verbose level if the two task definitions only differ in the class
+  loader instance that has loaded the definition.
+
+* Add a jvmargs to the ejbjar's weblogic element to allow additional
+  arguments to be provided to the VM runnign ejbc. Document the
+  jvmdebuglevel attribute which can be used to avoid warnings about
+  interface classess being found on the classpath. Document the new
+  <sysproperty> element which allows JVM properties to be defined.
+  Added an outputdir attribute to allow the destination to be a
+  directory into which the exploded jar is written.
+
+* ejbjar now supports Borland Enterprise Server 5 and Jonas 2.5
+
+* added **/.svn and **/.svn/** to the default excludes
+* Selector Elements now provide a way to create filesets based on
+  sophisticated selection criteria.
+
+* Gzip and Bzip2 files can now be constructed in the fly when using
+  the tar task without having to create the intermediate tar file on
+  disk.  The Untar task can also untar GZip and BZip2 files on the fly
+  without creating the intermediate tar file.
+
+* New optional type, <classfileset> added.
+
+* <ejbjar> now allows control over which additional classes and interfaces
+  are added to the generated EJB jars. A new attribute "dependency" can be
+  defined which controls what classes are added. The addition of classes now uses
+  the Jakarta-BCEL library rather than reflection, meaning bean classes are
+  no longer loaded into Ant's JVM. The default dependency analyzer is known as
+  the ancestor analyzer. It provides the same behaviour as the 1.4.1 version of
+  <ejbjar>. If the BCEL library is not present, a warning will be issued stating
+  the ancestor analyzer is not available. In this case <ejbjar> will continue
+  to function but will not add super classes to the jar.
+
+* <available> has a new attribute named ignoreSystemClasses.
+
+* New task <cvschangelog/> generates an XML report of changes that occur
+  on CVS repository.
+
+* New filter readers: ClassConstants, ExpandProperties, HeadFilter,
+  LineContains, LineContainsRegExp, PrefixLines, ReplaceTokens,
+  StripJavaComments, StripLineBreaks, StripLineComments, TabsToSpaces,
+  TailFilter.
+
+* <copy>, <loadfile>, <loadproperties>, <move> support FilterChains
+  of FilterReaders.
+
+* New task <loadproperties> to load contents of file as Ant properties,
+  with nested <filterchain> elements.
+
+* New task <loadfile> to load a whole file into a property.
+
+* New task <echoproperties> to list your current properties to the screen
+  or a file.
+
+* New tasks <bzip2> and <bunzip2> to pack and unpack files using the
+  BZip2 alogrithm.
+
+* New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>,
+  <manifest>, <vsscp>, <vssadd>, <vsscreate>, <splash>, <basename>, <dirname>,
+  <concat>, <sourceoffsite>, <jarlib-available>, <jarlib-display>,
+  <jarlib-manifest>, <jarlib-resolve>.
+
+* A new combined <mail> task, which replaces the old <mail> and
+  <mimemail> tasks, has been added.  The <mimemail> task, and
+  old SendEmail and MimeMail classes have been deprecated.
+
+* Mail task allows specification of port number.
+
+* Users can control what <zip> and <jar> must do when duplicate files
+  are found.  A new element <zipgroupfileset> allows for multiple zip
+  files to be merged into the archive.  In addition, <jar> also has
+  another new attribute: filesetmanifest.  The existing manifest
+  attribute of <jar> now also accepts the name of a jar added through
+  a fileset.
+
+* gzip now checks that the zipfile is older than the source file
+  before rebuilding the zipfile.
+
+* TarFileset takes in three new attributes - fullpath, prefix
+  and preserveLeadingSlashes.
+
+* <move> attempts to rename the directory, if everything inside it is
+  included, before performing file-by-file moves.  This attempt will
+  be done only if filtering is off and if mappers are not used.  This
+  is a performance improvement and there is no change otherwise in
+  the funtionality of this task.
+
+* Exec task has extra attribute "resultproperty" to get the return code
+  into a property.
+
+* Exec task prints a message when a timed-out process is killed.
+
+* Added optional attributes - name, arch and version to the <os> task.
+
+* Unjar, Untar, Unwar and Unzip now support patternsets to
+  select files from an archive for extraction.  Filesets may be
+  used to select archived files for unarchival.
+
+* Javac task allows debug levels to be specified.  Debug levels
+  will have an effect only when the modern compiler or the
+  classic compiler (version 1.2 and higher) is used and debugging
+  is enabled.
+
+* Added support for specifying CVS_RSH in the <cvs/> task
+
+* The attributes zipfile, jarfile, warfile and earfile (from the Zip,
+  Jar, War and Ear tasks) have been deprecated and superseded by a
+  new attribute "destfile".
+
+* Added new conditions <isset>, <checksum>, <http>, <socket>, <contains>,
+  <filesmatch>.
+
+* <taskdef> and <typedef> will now emit a warning if a task/type of
+  the given name already exists.
+
+* A new revision of VAJ tasks: The most important new feature
+  is the ability to execute VAJ tasks from the command line by
+  exploiting the Remote Tool Access feature of VAJ.
+
+* Improved support for Novell NetWare.
+
+* Added an optional encoding attribute to <fixcrlf>.
+
+* <apply> has a new attribute relative that allows users to pass the
+  filenames as relative instead of absolute paths on the command line.
+
+* References can now be copied into the child build by <ant> and
+  <antcall> using nested <reference> elements or the new inheritRefs
+  attribute.
+
+* <fail> now supports builds to fail based on conditions via if and
+  unless attributes.
+
+* Ant now comes with two new BuildLogger implementations - one that
+  can send emails containing a log of the build process (MailLogger),
+  and one that colorizes the output based on message levels, using
+  ANSI color code escape sequences (AnsiColorLogger).
+
+* A "package" mapper type has been added to allow package directory
+  names replaced with the dotted form.
+
+* You can now specify environment variables in the <java> and <junit> tasks
+  if the fork attribute has been set to true.
+
+* -propertyfile command-line option has been added to load an entire
+  property file just as -D properties are declared (as user properties).
+  -D properties take precedence over -propertyfile specified ones.
+
+* You can now set an ANT_ARGS environment variable to hold arguments you
+  always want passed to the 'ant' command -- for example, if you always
+  want to use a different logger or the -find flag.
+
+* <tstamp> now supports a new "prefix" attribute to prefix properties set.
+
+* You can now specify the -sourcepath for <javac> explicitly.
+
+* <javac> now supports a new "listfiles" attribute to list the source
+  files it's handing off to the compiler.
+
+* The compiler implementation for <javac> can now be chosen on a task by
+  task basis.  The new "compiler" attribute of <javac> can be used to override
+  the value of the build.compiler property, if set.
+
+* <javac> has a new nested element, <compilerarg>, which allows you
+  to specify additional args for the specific compiler you're using.
+
+* <javac>'s "source" attribute is now enabled for jikes as well.
+
+* <propertyfile>'s <entry> now has a 'unit' attribute to specify the
+  increment/decrement unit on date operations.
+
+* <property> now supports a 'prefix' attribute when loading from a file
+  or resource.
+
+* In Ant 1.4, a feature has been added to the <junit> task that would
+  add ant.jar, optional.jar and junit.jar implicitly to the classpath -
+  this feature can now be disabled by setting the new includeantruntime
+  attribute to false.
+
+* <style> behaves differently from any other directory-based task, as it
+  processes all files that it finds in included directories in
+  addition to the files matched by your patterns.  There is now a new
+  attribute, 'scanincludeddirectories', to suppress this behavior.
+
+* <javadoc> now supports a <tag> nested element to provide the -tag option
+  to the standard Java 1.4 doclet. The element is ignored when not running
+  on Java 1.4.
+
+* <ftp> can now chmod files on a remote server that supports
+  "site chmod", as well as set the umask before transferring files, if
+  the server supports "site umask".
+
+* New <serverdeploy> "optional" task.
+
+* <patternset> now supports nested patternsets.
+
+* Perforce tasks now support a "failonerror" attribute (defaults to "true").
+
+* Open Source application server JOnAS support:
+    EJB hot deploy and deploy with <serverdeploy> and <ejbjar>
+
+* Added new DirSet (<dirset>) datatype.
+
+* <path> now supports nested <dirset> and <filelist> elements.
+
+* <pathconvert> now supports nested <dirset> and <filelist> elements.
+
+* <pathconvert>'s "dirsep" and "pathsep" attributes now accept
+  multi-character values.
+
+* <copy> task now has a 'failonerror' attribute to allow keep-going
+  behaviour when the file to be copied is not found (defaults to "true").
+
+* <uptodate> now has a 'srcfile' attribute to allow specifying a
+  full-path filename.
+
+* <exec>, <sql> and <java> now support append attributes to allow
+  appending the output to an existing file.
+
+* <java> now supports a timeout attribute analog to <exec> - it is
+  highly recommended to only use it together with fork="true".
+
+* <javadoc> now supports a source attribute to enable javadoc to
+  handle assertions present in JDK 1.4 source code.
+
+* <replace> supports a new replacefilterfile attribute that
+  automatically turns all properties of a given file into
+  replacefilters.
+
+* An alias of <xslt> has been added to refer to the <style> task.
+
+* The compiler implementation for <rmic> can now be chosen on a task by
+  task basis.  The new "compiler" attribute of <rmic> can be used to override
+  the value of the build.rmic property, if set.
+
+* <rmic> has a new nested element, <compilerarg>, which allows you
+  to specify additional args for the specific compiler you're using.
+
+* org.apache.tools.ant.XmlLogger now is a BuildLogger, rather than just
+  a BuildListener. It can operate in either mode successfully.
+
+* <junit> has a new attribute "showoutput".  If set to true, output
+  generated by tests will be sent to Ant's logging system as well as
+  to the formatters (instead of sending it to the formatters
+  exclusively).
+
+* Ant has now a pluggable way to prompt users for input, which is used
+  by the new <input> task.  IDE integrators can provide an
+  implementation of the InputHandler interface to decouple Ant's input
+  from the console.  An implementation that gets its input from a file
+  for unattended builds is part of Ant's distribution.
+
+  For more details see docs/manual/inputhandler.html.
+
+* <patch> has a new attribute that selects the directory in which to
+  run the command.
+
+* <javadoc> now supports two new nested elements, <fileset> and <packageset>.
+
+
+Changes from Ant 1.4 to Ant 1.4.1
+===========================================
+
+Fixed bugs:
+-----------
+
+* <ant>'s antfile attribute will now also be considered an absolute path on
+  Windows systems, if it starts with a \ and no drive specifier.
+
+* The fullpath attribute of <zipfileset> has been ignored if you used
+  the src attribute at the same time.
+
+* The manifest file is now always placed as the second entry (after /META-INF)
+  in generated jars. This allows the manifest to be read by JarInputStreams
+
+* Fixed bug in depend task which would fail with a NullPointerException if no
+  dependency cache was specified.
+
+* sql task now handles REM statements correctly so that lines starying with rem
+  but which are not comments are actually processed.
+
+* XMLLogger now uses the task's name rather than the classname
+
+* <mapper>s will now work as expected if the to pattern expands to an
+  absolute pathname.
+
+* <javac> didn't ignore memory settings in non-fork mode
+
+* <cab> didn't split the options attribute into several command line
+  arguments correctly.
+
+Other changes:
+--------------
+
+* New source attribute for <javac> to enable assertion in JDK 1.4
+
+* XmlLogger and <antstructure> now add an encoding declaration to the
+  XML files they generate.
+
+* <fileset> has a new attribute "casesensitive" to make it match
+  filenames in a case insensitive way (if you set it to false) - by
+  default filesets remain case sensitive.
+
+Changes from Ant 1.3 to Ant 1.4
+===========================================
+
+Changes that could break older environments:
+--------------------------------------------
+* JUnitReport now uses the xalan redirect extension for multi-output.
+  With Xalan 1.2.2 it forces the use of bsf.jar in the classpath.
+  (Available in the xalan distribution). It is recommended to switch
+  to Xalan 2.x that do not need it.
+
+* Zip.setWhenempty() has changed its signature.
+
+* <rmic> is now implemented using a factory. This makes extending
+  rmic to use a new compiler a lot easier but may break custom
+  versions of this task that rely on the old implementation.
+
+* several Zip methods have changed their signature as we now use a Zip
+  package of our own that handles Unix permissions for directories.
+  Furthermore <zip> will now use the platform's default character
+  encoding for filenames - this is consistent with the command line
+  ZIP tools, but causes problems if you try to open them from within
+  Java and your filenames contain non US-ASCII characters. Use the new
+  encoding attribute of the task and set it to UTF8 to get the old
+  behavior.
+
+* The <pvcs> task has been moved to a package of its own.
+
+* JUnitResultFormater has two additional methods that must be
+  implemented by custom formatters.
+
+* Ant will no longer use the canonical version of a path internally -
+  this may yield different results on filesystems that support
+  symbolic links.
+
+* The output generated by the xml formatter for <junit> has changed
+  again, it doesn't format the numeric value in the time attribute anymore.
+
+* Pattern matching rules have changes slightly, the pattern foo*
+  doesn't match files contained in a directory named foo - use foo/*
+  instead.
+
+* <fixcrlf> will not remove trailing whitespace at the end of lines anymore.
+
+* The Classloader usage has been changed for the taskdef, property, available
+  and sql tasks so that it delegates to the parent classloader. This may cause
+  ClassNotFoundExceptions to be thrown if a system class attempts to load a
+  class in the taskdef's classpath (typically factory objects).
+
+* Ant now allows multithreading of tasks and the containment of tasks within
+  other tasks. This can break customer listeners which do not expect messages
+  from a task before the previous task has finished.
+
+* Ant now installs its own ouput stream into System.out to route output to the
+  task currently executing on the current thread. This also means that all
+  output is now routed as Ant message events. Customer listeners and loggers
+  should not call System.out at any time. This has always been true but such
+  usage now will cause problems due to possible recursion.
+
+* Invalid manifest files will now cause build failures in the <jar> task.
+
+* Ant Introspection now looks for methods with method names starting with
+  addConfigured. When called these methods are passed an argument after it has
+  been configured from the build file. Custom tasks supporting nested elements
+  starting with the name configured will no longer function.
+
+* The environment variable JAVACMD that can be used to specify the
+  java executable to Ant's wrapper scripts must not contain additional
+  command line parameters any longer - please use the environment
+  variable ANT_OPTS for such parameters now.
+
+* Ant's wrapper scripts now quote the CLASSPATH environment variable, thus
+  supporting classpaths which refer to directories containing spaces. This means
+  that the CLASSPATH environment variable cannot have quotes. Any quotes should
+  be removed. This will not affect the operation of the CLASSPATH environment
+  variable in other contexts.
+
+* A delete task like
+  <delete includeEmptyFilesets="true">
+    <fileset dir="somedir" />
+  </delete>
+  will now remove "somedir" as well, unless there are still files left
+  in it (matched by the default excludes).
+
+* The copy task will now fail if the file to be copied is not found.
+
+* Ant properties defined in properties files now behave the same way as
+  properties defined in the build file. In particular the $ character needs
+  to be escaped in property values by doubling it to $$. So, to define a
+  property with the value $hello, you need to define it in a properties file
+  as
+    test.prop=$$hello
+  This was not the case in Ant 1.3
+
+Other changes:
+--------------
+
+* New tasks: ear, p4counter, record, cvspass, vsscheckin, vsscheckout,
+  typedef, sleep, mimemail, set of tasks for Continuus/Synergy, dependset,
+  condition, maudit, mmetrics, jpcoverage, jpcovreport, jpcovmerge
+
+* Ant now uses JAXP 1.1
+
+* rmic now supports Kaffe's and Weblogic's version of rmic.
+
+* new magic property build.rmic to chose the rmic implementation
+
+* <tar> will now add empty directories as well
+
+* you can now specify a description for <p4change>
+
+* <touch> can now work on <fileset>s
+
+* <uptodate> now supports a value attribute
+
+* <fail> supports nested text
+
+* <fixcrlf> won't override files that are already in the correct
+   format.
+
+* <sql> now supports REM comments as well as // and --
+
+* <jar> now has a nested <metainf> element following the same idea as
+  <war>'s <webinf>.
+
+* <pvcs> can now handle multiple projects.
+
+* <available> now has a "type" attribute you can use in conjunction
+  with the "file" attribute to specify whether the "file" you're
+  looking for is a file or a directory.
+
+* New <junit> formatter named "brief"
+
+* <ejbjar> changes
+  * Add support for Borland Application Server to the <ejbjar> task using
+    a <borland> nested element.
+  * Add support for iPlanet Application Server to the <ejbjar> task. Also
+    includes some iPlanet utility tasks
+  * Add support for JBoss Application Server to the <ejbjar> task.
+  * Add a naming attribute to control the naming scheme that
+    ejbjar uses to name the generated EJB jars.
+  * Weblogic element now sets the compiler class for EJB 2.0 beans
+  * <dtd> elements can be specified at the <ejbjar> level for building generic
+    beans
+  * <dtd> elements can now be URLs
+  * Allow the manifest to be specified for the generated jars
+  * The weblogic element now supprts an attribte noEJBC to skip the processing
+    of the jar by ejbc. The ejbc step will then occur at deployment
+  * weblogic will tell ejbc to use Jikes compiler if build.compiler is set to
+    jikes. It can be restored to the default, javac, operation if desired.
+
+* Allow the <sql> Delimiter to be set in the so that Oracle stored procs may be
+  entered
+
+* <execon> and <apply> can now optionally skip empty filesets.
+
+* <javadoc> has a new useexternalfile attribute that makes it use a
+  temporary file for sourcefile and package names - helps to defeat
+  command line length limitations.
+
+* Data types like <path> can now be defined inside of <target>s
+
+* you can now specify a classpath for <style> - the XSLZ processor
+  will be loaded from this path
+
+* added a force attribute to <style> to support dependencies that the
+  task cannot determine itself (dependency on parameters, not file
+  modification times for example)
+
+* added vmlauncher attribute to exec tasks. This defaults to true. If
+  it is set to false, the VM's ability to launch commands in bypassed
+  and the OS shell, either directly or through the auxillary antRun
+  scripts is used.
+
+* regexp mapper now supports the java.util.regex package of JDK 1.4.
+
+* New filesonly attribute for <zip> and friends to suppress directory
+  entries.
+
+* New update attribute for <zip> and friends - update an existing
+  archive instead of creating a new one.
+
+* <apply> and <execon> have been merged into a single task.
+
+* added vssver.scc to the default excludes
+
+* <available> has a new filepath attribute/nested element that allows
+  you top search for a file in a given path.
+
+* <junit> can now optionally set a property on test failure.
+
+* <taskdef> can now define several tasks at once, reading the
+  name/classname pairs from a property file or resource.
+
+* <unzip/unjar/unwar> and <untar> now have an overwrite attribute that
+  defaults to true.  If set to false, files that are newer than the
+  files in the archive will not be replaced.
+
+* <patternset> and <fileset> now support nested <in/excludesfile>
+  elements - using these you can have more than one in/excludes file
+  per <patternset>.
+
+* Three new supported compilers for javac: kjc for kopi, gcj for the
+  gcc frontend and sj for Symantec's compiler.
+  In addition extJavac or the new fork attribute can be
+  used to run the JDK's javac in a JVM separate from Ant.
+
+* <fixrlf> can now with CR only line-ends and can use an arbitraty
+  between 2 and 80.
+
+* The .NET tasks have been adapted to the beta2 release of the framework.
+
+* <move> will now try to rename() files before copying them byte by
+  byte - only if filtering is of, of course.
+
+* <ant> and <antcall> tasks now support a new attribute inheritAll. When set to
+  false, only user properties are passed through to the target Ant instance.
+  This includes properties set on the command line and properties explicitly
+  passed
+
+* <javadoc> now skips off line links if the package list cannot be found.
+
+* <wlrun> now allows the security policy file to exist outside the weblogic
+  directory.
+
+* <java> task will set the Thread contextClassLoader under JDKs 1.2+ to the
+  classloader for the class being executed.
+
+* Introduce the concept of a TaskContainer - a task or element which can contain
+  Ant Tasks.
+
+* Add new tasks implementing the TaskContainer interface <parallel> and
+  <sequential> which allow parallel execution of tasks to be specified.
+
+* <depend> task will now take into account dependencies on jar files and class
+  files from a given classpath.
+
+* <jar> manifest entries may now be specified in the build file either
+  completely or to be merged with a manifest file.
+
+* <tstamp> task custom formats now support locales.
+
+* Added a listner which will forward events to Log4J. The log4j configuration
+  file should be in the directory from which Ant is run or passed as a system
+  property using a JVM argument.
+
+* Introduced the concept of <filtersets> to allow for more control in which
+  filters get applied in a <copy> or <move> operation.
+
+* Added nowarn attribute to javac and deprecated the Jikes-magic property
+  build.compiler.warnings.
+
+* The <depend> task cache format has changed and all dependency information is
+  now stored in a single file.
+
+Fixed bugs:
+-----------
+
+* Testcases have been made independent of current working directory.
+
+* Input ZIP-Files will be closed when using a <zipfileset>.
+
+* p4 tasks now don't fail if user, port or client have been omitted
+  (and this is acceptable for the context of the command).
+
+* <javah>'s outputfile attribute will be resolved as relative to the
+  projects basedir.
+
+* <antstructure> should create a valid DTD for propertyfile.operation.entry
+  and omit tasks it fails to load.
+
+* won't try to pass a -bootclasspath flag to javac 1.1 anymore
+
+* <style>'s style attribute no handles absolute paths correctly.
+
+* <delete includeemptydirs="true"> now deletes more than just the leaf
+  directories.
+
+* You can now specify a <fileset> for a directory that doesn't exist at
+  declaration time but will created before the fileset gets used for the
+  first time.
+
+* If the quiet attribute has been set, <delete> will handle <fileset>s
+  with non-existing directories gracefully.
+
+* Output written by testcases will now be captured by the <junit> task
+  and passed to the formatters.
+
+* Quote the -group parameter to Javadoc as per the specification
+
+* Initialise classes when loaded through the AntClassLoader - that is, run
+  static initializers
+
+* Implement getResource() and getResources() in AntClassLoader
+
+* Create the <ejbjar> weblogic command line as a set of arguments rather than
+  as a single line. Avoids problems with paths which contain spaces.
+
+* <ejbjar> now fails when the weblogic ejbc compiler reports an error.
+
+* Make the AntClassLoader load resources in the same order as it currently
+  loads classes.
+
+* Handle classpaths with spaces
+
+* Make sure XSLT processors close their output files in <style>.
+
+* perform proper uptodate check in <rmic> when compiling for IIOP.
+
+* <jjtree>'s uptodate test works even if outputdirectory is not the
+  parent dir of target
+
+* <copy> will remove target file (if it exists) before writing to it -
+  this avoids problems with links on filesystems that support them.
+
+* <ftp> now properly recurses remote directories.
+
+* <ftp> closes remote connection when it's done.
+
+* <junit> tries to include all necessary classes for the task itself
+  to the classpath when running in fork mode - doesn't work for JDK 1.1
+
+* <apply> and <execon> do now execute the command only once, if you
+  specify the parallel attribute - instead of once per fileset.
+
+* directory based tasks and fileset could miss some included files in
+  directories that have been excluded
+
+* <fixcrlf> failed for large files.
+
+* <move> removed files you tried to move to themselves.
+
+* <sql> task will not trty to print the result set unless the query succeeded.
+
+* Ant classloader will now ignore paths which are invalid relative to the
+  project base
+
+* <ejbjar> weblogic elements check for jar file changes has been fixed.
+  Previously some changes would not be included.
+
+* properties loaded from properties files are now resolved internally. This
+  removes the spurious warnings about usage of properties which have not been
+  set.
+
+* <jar> task and friends now process the JAR manifest to ensure it is valid.
+
+* The task finished event now includes any exception thrown by the task.
+
+* <java> task now supports a jvmVersion attribute so that if another JVM is
+  being used, Ant can determine which options to use for features such as the
+  VM memory limits
+
+
+Changes from Ant 1.2 to Ant 1.3
+===========================================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* Ant doesn't search for the buildfile anymore, unless you use the new
+  -find argument.
+
+* <perforce> has been replaced by a number of new tasks.
+
+* <javac> is now implemented using a factory. This makes extending
+  javac to use a new compiler a lot easier but may break custom
+  versions of this task that rely on the old implementation.
+
+* The output generated by the xml formatter for <junit> has changed a
+  little, it doesn't append " sec" in the time attribute anymore.
+
+Other changes:
+--------------
+
+* A GUI Frontend: Antidote. This is currently in development. At this
+  time, this is not part of the Ant release, although the source is
+  included if you are interested.
+
+* New tasks: stylebook, propertyfile, depend, antlr, telnet, csc,
+  ilasm, apply, javah, several clearcase tasks, junitreport, sound
+
+* Added output attribute to <java>.
+
+* Added nested zipfileset element to <zip>
+
+* Changed <sql> so that printing is at the task level rather than
+  the statement level.
+
+* javadoc task will pass -d flag to any doclet if the destDir attribute is
+  given. If the doclet does not accept the -d flag then omit the destdir
+  attribute.
+
+* <cab> can work on non-Windows platforms with the help of libcabinet.
+  See http://trill.cis.fordham.edu/~barbacha/cabinet_library/.
+
+* <ftp> now supports passive mode.
+
+* New <mapper> data type that can be used to get influence on the
+  target files for some tasks like <copy> or enable new types of tasks
+  like <apply>.
+
+* <execon> provides more control over the command line now, the names
+  of the source files are no longer required to be at the end of the
+  command.
+
+* Style tasks will now support TraX compliant XSL processors if one is present
+  in your classpath.
+
+* Added a failonerror to the javac task. If set to false, the build will
+  continue even if there are compilation errors.
+
+* Added nested format elements to the tstamp task allowing additional time
+  formats to be defined for arbitrary properties.
+
+* Added classpath attribute and nested classpath element to <property>
+  to make the resource attribute more powerful.
+
+* ${} property expansion will now be performed on the patterns read
+  from files specified as includesfile or excludesfile attributes.
+
+* The <tar> and <untar> tasks now support GNU format for handling paths
+  which are greater than 100 characters in length. In addition the <tar>
+  task now supports nested filesets through which the file permissions
+  may be controlled.
+
+* wlrun, wlstop and ejbjar now support Weblogic 6.0
+
+* The MPasre task has been updated to work with MParse 2.0
+
+* The documentation has been significantly updated.
+
+
+Fixed bugs:
+-----------
+
+* <signjar> doesn't use deprectated methods anymore.
+
+* javadoc's failonerror attribute works again
+
+* javadoc's additionalparam attribute will now be split into separate
+  parameters (on spaces) to allow for more than one parameter.
+
+* Changed <sql> task so that printing result sets works on Oracle
+
+* Changes to ddcreator and ejbc helper to respect the descriptor hierarchy
+  keppgenerated in ejbc can now be turned off
+
+* ejbjar now correctly ignores <ejb-ref> elements in the deployment descriptor.
+  CMP files are included by parsing the weblogic deployment descriptor rather
+  than relying on the naming convention used in ant 1.2
+
+* ejbjar includes super classes and super interfaces into the generated ejb
+  jar files. The <support> nested element allows support classes to be
+  included in the EJB jar. The toplink element should now correctly locate
+  the toplink descriptor.
+
+* <vssget> now correctly deals with spaces in arguments
+
+* <jar> fails early if a given manifest file doesn't exist
+
+* <rmic> doesn't search for the _Skel file anymore when stubversion is
+  set to 1.2.
+
+* <rmic> uses the the same classpath to verify a class can be rmic'd
+  as it passes to the compiler.
+
+* org.apache.tools.mail.MailMessage (and therefore <mail>) can now
+  handle SMTP servers sending multi line responses.
+
+* nested <classpath> elements of <taskdef> now work for <taskdef>s not
+  nested into <target> as well.
+
+* <property> and <available> will search for the resource "foo" instead
+  of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource
+  name foo.
+
+* Handle build files in directories whose name contained a "#" character
+
+* <junit> can now log to files whose name contains a comma as well.
+
+* The AntClassLoader now refers to the loader which loaded it, any
+  requests it does not handle itself. Previously these went to the
+  primordial loader.
+
+Changes from Ant 1.1 to Ant 1.2
+===============================
+
+Changes that could break older environments:
+--------------------------------------------
+
+* Semantics of <property> has changed again in the hope to be more
+intuitive. ${} expansion now happens at runtime and <property> tags
+living inside of targets only take effect if they are visited at
+runtime.
+
+As a side effect of this change, task's attributes get set at runtime
+not at parser time as well, which might change the results of
+<script>s or other custom tasks that reference other tasks by their id
+attribute.
+
+* copying of support files in <javac> has been removed - as well as
+the filtering attribute.
+
+* the <expand> and <keysubst> tasks have been removed.
+
+* the ignore and items attributes of directory based tasks have been removed.
+
+* the command line switches _not_ starting with - have been removed.
+
+* Path and EnumeratedAttribute have been moved from
+org.apache.tools.ant to org.apache.tools.ant.types.
+
+* the class attributes of <available>, <java>, <rmic> and <taskdef>
+have been removed.
+
+* the src attribute of <chmod> has been removed.
+
+* <patch> and <javadoc> have lost some of their attributes.
+
+* <java> and <cvs> have lost some undocumented attributes.
+
+* the Unix antRun script would search for command.sh in the directory
+it changed to and invoke this instead of command if present. This
+behavior has been dropped.
+
+* <ejbjar> task syntax has been changed significantly
+
+* <exec> is no longer implemented by org.apache.tool.ant.taskdefs.Exec.
+Custom tasks that rely on Project.createTask("exec") to return an
+instance of this class are going to fail.
+
+* nested <include> and <exclude> elements expect the value of their
+name attribute to be a single pattern, they don't accept multiple
+patterns anymore. Split them into multiple elements of the same type.
+
+* <delete dir="somedir" /> will now delete the directory itself as
+well as all included files. If you just want to clean out the
+directory and keep the empty one, use a nested fileset.
+
+Other changes:
+--------------
+
+* New tasks: antstructure, cab, execon, fail, ftp, genkey, jlink,
+junit, sql, javacc, jjtree, starteam, war, unwar, uptodate,
+native2ascii, copy, move, mparse.
+
+* copydir, copyfile, deltree and rename are now deprecated. They
+should be replaced with the new copy, delete and move tasks.
+
+* <java> uses a ClassLoader of its own in no-fork mode if a classpath is
+specified.
+
+* <style> will create the necessary target directories and reprocess
+all files if the stylesheet changes.
+
+* New data types fileset and patternset - expected to get a broader use.
+They, as well as PATH like structures, can now be defined on a global
+level and later be referenced by their id attribute.
+
+* You can specify environment variables to <exec>.
+
+* <get> can check whether a remote file is actually newer than a local
+copy before it starts a download (HTTP only).
+
+* Added a -logger option to allow the class which performs logging to be
+specified on the command line.
+
+* Added a -emacs option to tell the logger to leave out taskname adornments
+on log output.
+
+* <chmod> works on all files in parallel and supports multiple filesets.
+
+* <replace> can now use tokens and/or values that cross line boundaries.
+
+* build.compiler supports now jvc as well.
+
+* project specific help can now be obtained with the -projecthelp option.
+
+* Added a -debug option to make -verbose less verbose (and more useful)
+
+* Ant will now search for a file named build.xml in the parent directory
+and above (towards the root of the filesystem) if you didn't specify
+-buildfile and there is no build.xml in the current directory.
+
+* <echo> can now write to a file and accepts nested text.
+
+Fixed bugs:
+-----------
+
+* <chmod> didn't work when used as a directory based task.
+
+* Path, Available, Property didn't resolve relative filenames with
+respect to the Project's basedir.
+
+* Project didn't interpret the basedir attribute correctly in all
+cases.
+
+* Nested <src> in <javac> caused NullPointerException.
+
+* Corrupt Zip- and Jar-files ar now deleted if the task fails.
+
+* many more fixes we've forgotten to document here ...
+
+* The packagelistloc attribute of <javadoc>'s <link> child will be
+  resolved as a file (i.e. it is either absolute or relative to
+  basedir).
Index: win_installer/apache-ant-1.6.5/bin/ant
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/ant	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/ant	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,299 @@
+#! /bin/sh
+
+#   Copyright 2001-2005 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.
+
+# Extract launch and ant arguments, (see details below).
+ant_exec_args=
+no_config=false
+use_jikes_default=false
+ant_exec_debug=false
+show_help=false
+for arg in "$@" ; do
+  if [ "$arg" = "--noconfig" ] ; then
+    no_config=true
+  elif [ "$arg" = "--usejikes" ] ; then
+    use_jikes_default=true
+  elif [ "$arg" = "--execdebug" ] ; then
+    ant_exec_debug=true
+  elif [ my"$arg" = my"--h"  -o my"$arg" = my"--help"  ] ; then
+    show_help=true
+    ant_exec_args="$ant_exec_args -h"
+  else
+    if [  my"$arg" = my"-h"  -o  my"$arg" = my"-help" ] ; then
+      show_help=true
+    fi
+    ant_exec_args="$ant_exec_args \"$arg\""
+  fi
+done
+
+# Source/default ant configuration
+if $no_config ; then
+  rpm_mode=false
+  usejikes=$use_jikes_default
+else
+  # load system-wide ant configuration
+  if [ -f "/etc/ant.conf" ] ; then
+    . /etc/ant.conf
+  fi
+
+  # load user ant configuration
+  if [ -f "$HOME/.ant/ant.conf" ] ; then
+    . $HOME/.ant/ant.conf
+  fi
+  if [ -f "$HOME/.antrc" ] ; then
+    . "$HOME/.antrc"
+  fi
+
+  # provide default configuration values
+  if [ -z "$rpm_mode" ] ; then
+    rpm_mode=false
+  fi
+  if [ -z "$usejikes" ] ; then
+    usejikes=$use_jikes_default
+  fi
+fi
+
+# Setup Java environment in rpm mode
+if $rpm_mode ; then
+  if [ -f /usr/share/java-utils/java-functions ] ; then
+    . /usr/share/java-utils/java-functions
+    set_jvm
+    set_javacmd
+  fi
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  Darwin*) darwin=true
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+           fi
+           ;;
+esac
+
+if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
+  ## resolve links - $0 may be a link to ant's home
+  PRG="$0"
+  progname=`basename "$0"`
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+    else
+    PRG=`dirname "$PRG"`"/$link"
+    fi
+  done
+
+  ANT_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  ANT_HOME=`cd "$ANT_HOME" && pwd`
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$ANT_HOME" ] &&
+    ANT_HOME=`cygpath --unix "$ANT_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# set ANT_LIB location
+ANT_LIB="${ANT_HOME}/lib"
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD=`which java 2> /dev/null `
+    if [ -z "$JAVACMD" ] ; then
+        JAVACMD=java
+    fi
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
+
+# Build local classpath using just the launcher in non-rpm mode or
+# use the Jpackage helper in rpm mode with basic and default jars
+# specified in the ant.conf configuration. Because the launcher is
+# used, libraries linked in ANT_HOME will also be include, but this
+# is discouraged as it is not java-version safe. A user should
+# request optional jars and their dependencies via the OPT_JAR_LIST
+# variable
+if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
+  LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+  # If the user requested to try to add some other jars to the classpath
+  if [ -n "$OPT_JAR_LIST" ] ; then
+    _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
+    if [ -n "$_OPTCLASSPATH" ] ; then 
+      LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
+    fi
+  fi
+
+  # Explicitly add javac path to classpath, assume JAVA_HOME set
+  # properly in rpm mode
+  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+  fi
+  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
+    LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+  fi
+
+  # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
+  # user CLASSPATH first and ant-found jars after.
+  # In that case, the user CLASSPATH will override ant-found jars
+  #
+  # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
+  # with ant-found jars first and user CLASSPATH after
+  if [ -n "$CLASSPATH" ] ; then
+    # merge local and specified classpath 
+    if [ -z "$LOCALCLASSPATH" ] ; then 
+      LOCALCLASSPATH="$CLASSPATH"
+    elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
+      LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
+    else
+      LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
+    fi
+
+    # remove class path from launcher -cp option
+    CLASSPATH=""
+  fi
+else
+  # not using rpm_mode; use launcher to determine classpaths
+  if [ -z "$LOCALCLASSPATH" ] ; then
+      LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+  else
+      LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+  fi
+fi
+
+if [ -n "$JAVA_HOME" ] ; then
+  # OSX hack to make Ant work with jikes
+  if $darwin ; then
+    OSXHACK="${JAVA_HOME}/../Classes"
+    if [ -d "${OSXHACK}" ] ; then
+      for i in "${OSXHACK}"/*.jar
+      do
+        JIKESPATH="$JIKESPATH:$i"
+      done
+    fi
+  fi
+fi
+
+# Allow Jikes support (off by default)
+if $usejikes; then
+  ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+fi
+
+# For Cygwin, switch paths to appropriate format before running java
+# For PATHs convert to unix format first, then to windows format to ensure
+# both formats are supported. Probably this will fail on directories with ;
+# in the name in the path. Let's assume that paths containing ; are more
+# rare than windows style paths on cygwin.
+if $cygwin; then
+  if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
+    format=mixed
+  else
+    format=windows
+  fi
+  ANT_HOME=`cygpath --$format "$ANT_HOME"`
+  ANT_LIB=`cygpath --$format "$ANT_LIB"`
+  JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+  LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+  LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
+  if [ -n "$CLASSPATH" ] ; then
+    CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+    CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
+  fi
+  CYGHOME=`cygpath --$format "$HOME"`
+fi
+
+# Show script help if requested
+if $show_help ; then
+  echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+  echo 'Script Options:'
+  echo '  --help, --h            print this message and ant help'
+  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
+  echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
+  echo '                         configuration files'
+  echo '  --usejikes             enable use of jikes by default, unless'
+  echo '                         set explicitly in configuration files'
+  echo '  --execdebug            print ant exec line generated by this'
+  echo '                         launch script'
+  echo '  '
+fi
+# add a second backslash to variables terminated by a backslash under cygwin
+if $cygwin; then
+  case "$ANT_HOME" in
+    *\\ )
+    ANT_HOME="$ANT_HOME\\"
+    ;;
+  esac
+  case "$CYGHOME" in
+    *\\ )
+    CYGHOME="$CYGHOME\\"
+    ;;
+  esac
+  case "$JIKESPATH" in
+    *\\ )
+    JIKESPATH="$JIKESPATH\\"
+    ;;
+  esac
+  case "$LOCALCLASSPATH" in
+    *\\ )
+    LOCALCLASSPATH="$LOCALCLASSPATH\\"
+    ;;
+  esac
+  case "$CLASSPATH" in
+    *\\ )
+    CLASSPATH="$CLASSPATH\\"
+    ;;
+  esac
+fi
+# Execute ant using eval/exec to preserve spaces in paths,
+# java options, and ant args
+ant_sys_opts=
+if [ -n "$CYGHOME" ]; then
+  if [ -n "$JIKESPATH" ]; then
+    ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
+  else
+    ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
+  fi
+else
+  if [ -n "$JIKESPATH" ]; then
+    ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
+  fi
+fi
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+if $ant_exec_debug ; then
+    echo $ant_exec_command
+fi
+eval $ant_exec_command
Index: win_installer/apache-ant-1.6.5/bin/ant.bat
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/ant.bat	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/ant.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,126 @@
+@echo off
+
+REM  Copyright 2001,2004-2005 The Apache Software Foundation
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_ANT_HOME=%~dp0..
+
+if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
+set DEFAULT_ANT_HOME=
+
+set _USE_CLASSPATH=yes
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+set ANT_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+if ""%1""==""-noclasspath"" goto clearclasspath
+set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+rem here is there is a -noclasspath in the options
+:clearclasspath
+set _USE_CLASSPATH=no
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+:doneStart
+rem find ANT_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
+
+rem check for ant in Program Files
+if not exist "%ProgramFiles%\ant" goto checkSystemDrive
+set ANT_HOME=%ProgramFiles%\ant
+goto checkJava
+
+:checkSystemDrive
+rem check for ant in root directory of system drive
+if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
+set ANT_HOME=%SystemDrive%\ant
+goto checkJava
+
+:checkCDrive
+rem check for ant in C:\ant for Win9X users
+if not exist C:\ant\lib\ant.jar goto noAntHome
+set ANT_HOME=C:\ant
+goto checkJava
+
+:noAntHome
+echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto checkJikes
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+
+:checkJikes
+if not "%JIKESPATH%"=="" goto runAntWithJikes
+
+:runAnt
+if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
+if not "%CLASSPATH%"=="" goto runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithJikes
+if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
+if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
+
+:runAntWithJikesNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+goto end
+
+:runAntWithJikesAndClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%  -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set ANT_CMD_LINE_ARGS=
+
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
+:mainEnd
+if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
+
Index: win_installer/apache-ant-1.6.5/bin/ant.cmd
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/ant.cmd	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/ant.cmd	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,92 @@
+/* 
+    Copyright 2003-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.
+ 
+    Run ant
+*/
+
+'@echo off'
+parse arg mode envarg '::' antarg
+
+if mode\='.' & mode\='..' & mode\='/' then do
+  envarg = mode envarg
+  mode = ''
+end
+
+if antarg = '' then do
+  antarg = envarg
+  envarg = ''
+end
+
+x = setlocal()
+
+env="OS2ENVIRONMENT"
+antenv = _getenv_('antenv')
+if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
+
+if mode = '' then mode = _getenv_('ANT_MODE' '..')
+if mode \= '/' then do
+  runrc = _getenv_('runrc')
+  antrc = _getenv_('antrc' 'antrc.cmd')
+  if mode = '..' then mode = '-r'
+  else mode = ''
+  interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
+end
+
+if _testenv_() = 0 then do
+  say 'Ant environment is not set properly'
+  x = endlocal()
+  exit 16
+end
+
+settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
+
+java = _getenv_('javacmd' 'java')
+opts = value('ANT_OPTS',,env)
+args = value('ANT_ARGS',,env)
+lcp = value('LOCALCLASSPATH',,env)
+cp = value('CLASSPATH',,env)
+if value('ANT_USE_CP',,env) \= '' then do
+  if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
+  lcp = lcp || cp
+  'SET CLASSPATH='
+end
+if lcp\='' then lcp = '-classpath' lcp
+
+cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
+launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
+if launcher = '' then entry = 'org.apache.tools.ant.Main'
+else entry = 'org.apache.tools.ant.launch.Launcher'
+java opts lcp entry settings args antarg
+
+x = endlocal()
+
+return rc
+
+_testenv_: procedure expose env ANT_HOME JAVA_HOME
+ANT_HOME = value('ANT_HOME',,env)
+if ANT_HOME = '' then return 0
+JAVA_HOME = value('JAVA_HOME',,env)
+if JAVA_HOME = '' then return 0
+cp = translate(value('CLASSPATH',,env))
+if pos(translate(ANT_HOME), cp) = 0 then return 0
+if pos(translate(JAVA_HOME), cp) = 0 then return 0
+return 1
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
Index: win_installer/apache-ant-1.6.5/bin/antRun
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/antRun	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/antRun	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+#
+#  Copyright  2001-2002,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.
+# 
+#
+
+# Args: DIR command
+cd "$1"
+CMD="$2"
+shift
+shift
+
+exec "$CMD" "$@"
Index: win_installer/apache-ant-1.6.5/bin/antRun.bat
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/antRun.bat	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/antRun.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,47 @@
+@echo off
+
+REM
+REM Copyright  2001-2002,2004-2005 The Apache Software Foundation
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM
+REM
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+if ""%1""=="""" goto runCommand
+
+rem Change drive and directory to %1
+if "%OS%"=="Windows_NT" cd /d ""%1""
+if not "%OS%"=="Windows_NT" cd ""%1""
+shift
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of agruments (up to the command line limit, anyway).
+set ANT_RUN_CMD=%1
+if ""%1""=="""" goto runCommand
+shift
+:loop
+if ""%1""=="""" goto runCommand
+set ANT_RUN_CMD=%ANT_RUN_CMD% %1
+shift
+goto loop
+
+:runCommand
+rem echo %ANT_RUN_CMD%
+%ANT_RUN_CMD%
+
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
Index: win_installer/apache-ant-1.6.5/bin/antRun.pl
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/antRun.pl	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/antRun.pl	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+#
+# Copyright 2001,2003-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.
+#
+#######################################################################
+#
+# antRun.pl
+#
+# wrapper script for invoking commands on a platform with Perl installed
+# this is akin to antRun.bat, and antRun the SH script 
+#
+# created:         2001-10-18
+# author:          Jeff Tulley jtulley@novell.com 
+#######################################################################
+#be fussy about variables
+use strict;
+
+#turn warnings on during dev; generates a few spurious uninitialised var access warnings
+#use warnings;
+
+#and set $debug to 1 to turn on trace info (currently unused)
+my $debug=1;
+
+#######################################################################
+# change drive and directory to "%1"
+my $ANT_RUN_CMD = @ARGV[0];
+
+# assign current run command to "%2"
+chdir (@ARGV[0]) || die "Can't cd to $ARGV[0]: $!\n";
+if ($^O eq "NetWare") {
+    # There is a bug in Perl 5 on NetWare, where chdir does not
+    # do anything.  On NetWare, the following path-prefixed form should 
+    # always work. (afaict)
+    $ANT_RUN_CMD .= "/".@ARGV[1];
+}
+else {
+    $ANT_RUN_CMD = @ARGV[1];
+}
+
+# dispose of the first two arguments, leaving only the command's args.
+shift;
+shift;
+
+# run the command
+my $returnValue = system $ANT_RUN_CMD, @ARGV;
+if ($returnValue eq 0) {
+    exit 0;
+}
+else {
+    # only 0 and 1 are widely recognized as exit values
+    # so change the exit value to 1
+    exit 1;
+}
Index: win_installer/apache-ant-1.6.5/bin/antenv.cmd
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/antenv.cmd	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/antenv.cmd	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,99 @@
+/* 
+    Copyright 2003-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.
+
+    Ant environment
+*/
+
+'@echo off'
+call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
+call SysLoadFuncs
+
+/* Prepare the parameters for later use */
+parse arg argv
+mode = ''
+args = ''
+opts = ''
+cp = ''
+lcp = ''
+
+do i = 1 to words(argv)
+  param = word(argv, i)
+  select
+    when param='-lcp' then mode = 'l'
+    when param='-cp' | param='-classpath' then mode = 'c'
+    when abbrev('-opts', param, 4) then mode = 'o'
+    when abbrev('-args', param, 4) then mode = 'a'
+  otherwise
+    select
+      when mode = 'a' then args = space(args param, 1)
+      when mode = 'c' then cp = space(cp param, 1)
+      when mode = 'l' then lcp = space(lcp param, 1)
+      when mode = 'o' then opts = space(opts param, 1)
+    otherwise
+      say 'Option' param 'ignored'
+    end
+  end
+end
+
+env="OS2ENVIRONMENT"
+antconf = _getenv_('antconf' 'antconf.cmd')
+runrc = _getenv_('runrc')
+interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
+ANT_HOME = value('ANT_HOME',,env)
+JAVA_HOME = value('JAVA_HOME',,env)
+classpath = value('CLASSPATH',,env)
+classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+
+classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
+'SET CLASSPATH=' || classpath
+
+/* Setting classpathes, options and arguments */
+envset = _getenv_('envset')
+if cp\=''   then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
+if lcp\=''  then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
+if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
+if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
+
+exit 0
+
+addpath: procedure
+parse arg path elem
+if elem = '' then do
+  if path\='' & right(path, 1)\=';' then path = path || ';'
+  return path
+end
+if substr(path, length(path)) = ';' then glue = ''
+else glue = ';'
+if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
+return path
+
+prepend: procedure
+parse arg path elem
+if elem = '' then do
+  if path\='' & right(path, 1)\=';' then path = path || ';'
+  return path
+end
+if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
+return path
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
Index: win_installer/apache-ant-1.6.5/bin/complete-ant-cmd.pl
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/complete-ant-cmd.pl	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/complete-ant-cmd.pl	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,113 @@
+#!/usr/bin/perl
+#
+# Copyright 2001,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.
+#
+# A script to allow Bash or Z-Shell to complete an Ant command-line.  
+#
+# To install for Bash 2.0 or better, add the following to ~/.bashrc:
+# 
+#     $ complete -C complete-ant-cmd ant build.sh
+#
+# To install for Z-Shell 2.5 or better, add the following to ~/.zshrc:
+#
+#     function ant_complete () {
+#         local args_line args
+#         read -l args_line
+#         set -A args $args_line
+#         set -A reply $(COMP_LINE=$args_line complete-ant-cmd ${args[1]} $1)
+#     }
+#     compctl -K ant_complete ant build.sh
+#     
+# @author Mike Williams <mikew@cortexebusiness.com.au>
+
+my $cmdLine = $ENV{'COMP_LINE'};
+my $antCmd = $ARGV[0];
+my $word = $ARGV[1];
+
+my @completions;
+if ($word =~ /^-/) {
+    list( restrict( $word, getArguments() ));
+} elsif ($cmdLine =~ /-(f|buildfile)\s+\S*$/) {
+    list( getBuildFiles($word) );
+} else {
+    list( restrict( $word, getTargets() ));
+}
+
+exit(0);
+
+sub list {
+    for (@_) {
+        print "$_\n";
+    }
+}
+
+sub restrict {
+    my ($word, @completions) = @_;
+    grep( /^\Q$word\E/, @completions );
+}
+
+sub getArguments {
+    qw(-buildfile -debug -emacs -f -find -help -listener -logfile 
+       -logger -projecthelp -quiet -verbose -version); 
+}
+
+
+sub getBuildFiles {
+    my ($word) = @_;
+    grep( /\.xml$/, glob( "$word*" ));
+}
+
+sub getTargets {
+
+    # Look for build-file
+    my $buildFile = 'build.xml';
+    if ($cmdLine =~ /-(f|buildfile)\s+(\S+)/) {
+        $buildFile = $2;
+    }
+    return () unless (-f $buildFile);
+
+    # Run "ant -projecthelp" to list targets.  Keep a cache of results in a
+    # cache-file.
+    my $cacheFile = $buildFile;
+    $cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|;
+    if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
+        open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n";
+        open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return(); 
+        my %targets;
+        while( <HELP> ) {
+            if (/^\s+(\S+)/) {
+                $targets{$1}++;
+            }
+        }
+        my @targets = sort keys %targets;
+        for (@targets) { print CACHE "$_\n"; }
+        return @targets;
+    }
+    
+    # Read the target-cache
+    open( CACHE, $cacheFile ) || die "can\'t read $cacheFile: $!\n";
+    my @targets;
+    while (<CACHE>) {
+        chop;
+        s/\r$//;  # for Cygwin
+        push( @targets, $_ );
+    }
+    close( CACHE );
+    @targets;
+
+}
+
+
+
Index: win_installer/apache-ant-1.6.5/bin/envset.cmd
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/envset.cmd	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/envset.cmd	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,130 @@
+/*
+
+    Copyright 2003-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.
+
+SET environment variables
+First optional parameter:
+   ;     parameters are considered parts of a path variable, semicolons are
+         appended to each element if not already present
+   -D    parameters are properties for Java or Makefile etc., -D will be
+         prepended and the parameters will be separated by a space
+   =D    the same as above but equal sign is not required
+   ,     parameters should be comma separated in the environment variable
+   -     parameters should be separated by the next parameter
+   Other values mean that the first parameter is missing and the environment
+   variable will be set to the space separated parameters
+
+Second parameter: name of the environment variable
+
+Next parameters: values
+; implies that the equal sign is considered a part of the parameter and is
+not interpreted
+
+-D requires parameters in the form name=value. If the equal sign is not found,
+the parameters are changed to name=expanded_name
+
+Other options have optional equal sign. If it is found, only the part after
+the equal sign will be oprionally expanded.
+
+If the parameter is the minus sign, the next parameter will not be expanded.
+If the parameter is a single dot, it will be replaced with the value of the
+environment variable as it existed before envset was invoked.
+
+For other parameters the batch looks for the environment variable with the
+same name (in uppercase). If it is found, it forms the expanded_name. If
+the environment variable with such a name does not exist, the expanded_name
+will hold the parameter name without case conversion.
+*/
+
+parse arg mode envar args
+
+equal = 0
+sep = ' '
+
+/* Parse command line parameters */
+select
+  when mode='-' then do
+    sep = envar
+    parse var args envar args
+  end
+  when mode=';' then do
+    sep = ''
+    equal = -1
+  end
+  when mode='-D' then equal = 1
+  when mode='=D' then mode = '-D'
+  when mode=',' then sep = ','
+otherwise
+  args = envar args
+  envar = mode
+  mode = ''
+end
+
+env = 'OS2ENVIRONMENT'
+envar = translate(envar)
+orig = value(envar,,env)
+newval = ''
+expand = 1
+
+/* for each parameter... */
+do i = 1 to words(args)
+  if expand > 0 & word(args, i) = '-' then expand = 0
+  else call addval word(args, i)
+end
+
+/* Optionally enclose path variable by quotes */
+if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
+
+/* Set the new value, 'SET' cannot be used since it does not allow '=' */
+x = value(envar, newval, env)
+exit 0
+
+addval: procedure expose sep equal orig expand newval mode env
+parse arg var
+
+if var = '.' then expvar = orig
+else do
+  if equal >= 0 then do
+    parse var var name '=' val
+    if val = '' then var = name
+    else var = val
+  end
+  if expand = 0 then expvar = var
+  else expvar = value(translate(var),,env)
+  if expvar = '' then expvar = var
+  if equal >= 0 then do
+    if val = '' then do
+      parse var expvar key '=' val
+      if val <> '' then name = key
+      else do
+        if equal > 0 then val = key
+        else name = key
+      end
+    end
+    else val = expvar
+    if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
+    if val = '' then expvar = name
+    else expvar = name || '=' || val
+  end
+  if mode = '-D' then expvar = '-D' || expvar
+  if mode = ';' then do
+    if right(expvar, 1) <> ';' then expvar = expvar || ';'
+  end
+end
+
+if newval = '' then newval = expvar
+else newval = newval || sep || expvar
+expand = 1
+return
Index: win_installer/apache-ant-1.6.5/bin/lcp.bat
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/lcp.bat	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/lcp.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,30 @@
+REM
+REM Copyright  2001-2004 The Apache Software Foundation
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM
+REM
+
+set _CLASSPATHCOMPONENT=%1
+if ""%1""=="""" goto gotAllArgs
+shift
+
+:argCheck
+if ""%1""=="""" goto gotAllArgs
+set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
+shift
+goto argCheck
+
+:gotAllArgs
+set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+
Index: win_installer/apache-ant-1.6.5/bin/runant.pl
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/runant.pl	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/runant.pl	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,152 @@
+#!/usr/bin/perl
+#
+# Copyright 2000-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.
+#
+#######################################################################
+#
+# runant.pl
+#
+# wrapper script for invoking ant in a platform with Perl installed
+# this may include cgi-bin invocation, which is considered somewhat daft.
+# (slo: that should be a separate file which can be derived from this
+# and returns the XML formatted output)
+#
+# the code is not totally portable due to classpath and directory splitting
+# issues. oops. (NB, use File::Spec::Functions  will help and the code is
+# structured for the catfile() call, but because of perl version funnies
+# the code is not included. 
+#
+# created:         2000-8-24
+# author:          Steve Loughran steve_l@sourceforge.net
+#######################################################################
+#
+# Assumptions:
+#
+# - the "java" executable/script is on the command path
+# - ANT_HOME has been set
+# - target platform uses ":" as classpath separator or perl indicates it is dos/win32
+# - target platform uses "/" as directory separator.
+
+#be fussy about variables
+use strict;
+
+#platform specifics (disabled)
+#use File::Spec::Functions;
+
+#turn warnings on during dev; generates a few spurious uninitialised var access warnings
+#use warnings;
+
+#and set $debug to 1 to turn on trace info
+my $debug=1;
+
+#######################################################################
+#
+# check to make sure environment is setup
+#
+
+my $HOME = $ENV{ANT_HOME};
+if ($HOME eq "")
+        {
+    die "\n\nANT_HOME *MUST* be set!\n\n";
+        }
+
+my $JAVACMD = $ENV{JAVACMD};
+$JAVACMD = "java" if $JAVACMD eq "";
+
+my $onnetware = 0;
+if ($^O eq "NetWare")
+{
+  $onnetware = 1;
+}
+
+my $oncygwin = ($^O eq "cygwin");
+
+#ISSUE: what java wants to split up classpath varies from platform to platform 
+#and perl is not too hot at hinting which box it is on.
+#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
+my $s=":";
+if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") ||
+   ($onnetware == 1))
+        {
+        $s=";";
+        }
+
+#build up standard classpath
+my $localpath = "$HOME/lib/ant-launcher.jar";
+#set JVM options and Ant arguments, if any
+my @ANT_OPTS=split(" ", $ENV{ANT_OPTS});
+my @ANT_ARGS=split(" ", $ENV{ANT_ARGS});
+
+#jikes
+if($ENV{JIKESPATH} ne "")
+        {
+        push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
+        }
+
+#construct arguments to java
+my @ARGS;
+push @ARGS, @ANT_OPTS;
+
+my $CYGHOME = "";
+
+my $classpath=$ENV{CLASSPATH};
+if ($oncygwin == 1) {
+  $localpath = `cygpath --path --windows $localpath`;
+  chomp ($localpath);
+  if (! $classpath eq "")
+  {
+    $classpath = `cygpath --path --windows "$classpath"`;
+    chomp ($classpath);
+  }
+  $HOME = `cygpath --path --windows $HOME`;
+  chomp ($HOME);
+  $CYGHOME = `cygpath --path --windows $ENV{HOME}`;
+  chomp ($CYGHOME);
+}
+push @ARGS, "-classpath", "$localpath";
+push @ARGS, "-Dant.home=$HOME";
+if ( ! $CYGHOME eq "" )
+{
+  push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\""
+}
+push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS;
+push @ARGS, @ARGV;
+if (! $classpath eq "")
+{
+  if ($onnetware == 1)
+  {
+    # make classpath literally $CLASSPATH
+    # this is to avoid pushing us over the 512 character limit
+    # even skip the ; - that is already in $localpath
+    push @ARGS, "-lib", "\$CLASSPATH";
+  }
+  else
+  {
+    push @ARGS, "-lib", "$classpath";
+  }
+}
+print "\n $JAVACMD @ARGS\n\n" if ($debug);
+
+my $returnValue = system $JAVACMD, @ARGS;
+if ($returnValue eq 0)
+        {
+        exit 0;
+        }
+else
+        {
+        # only 0 and 1 are widely recognized as exit values
+        # so change the exit value to 1
+        exit 1;
+        }
Index: win_installer/apache-ant-1.6.5/bin/runant.py
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/runant.py	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/runant.py	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,100 @@
+#!/usr/bin/python
+# Copyright 2001,2003-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.
+#
+
+"""
+
+ runant.py
+
+    This script is a translation of the runant.pl written by Steve Loughran.
+    It runs ant with/out arguments, it should be quite portable (thanks to
+    the python os library)
+    This script has been tested with Python2.0/Win2K
+
+ created:         2001-04-11
+ author:          Pierre Dittgen pierre.dittgen@criltelecom.com
+
+ Assumptions:
+
+ - the "java" executable/script is on the command path
+"""
+import os, os.path, string, sys
+
+# Change it to 1 to get extra debug information
+debug = 0
+
+#######################################################################
+
+# If ANT_HOME is not set default to script's parent directory
+if os.environ.has_key('ANT_HOME'):
+    ANT_HOME = os.environ['ANT_HOME']
+else:
+    ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+
+# set ANT_LIB location
+ANT_LIB = os.path.join(ANT_HOME, 'lib')
+
+# set JAVACMD (check variables JAVACMD and JAVA_HOME)
+JAVACMD = None
+if not os.environ.has_key('JAVACMD'):
+    if os.environ.has_key('JAVA_HOME'):
+        if not os.path.exists(os.environ['JAVA_HOME']):
+            print "Warning: JAVA_HOME is not defined correctly."
+        else:
+            JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
+    else:
+        print "Warning: JAVA_HOME not set."
+else:
+    JAVACMD = os.environ['JAVACMD']
+if not JAVACMD:
+    JAVACMD = 'java'
+
+launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
+if not os.path.exists(launcher_jar):
+    print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \
+        ANT_LIB
+
+# Build up standard classpath (LOCALCLASSPATH)
+LOCALCLASSPATH = launcher_jar
+if os.environ.has_key('LOCALCLASSPATH'):
+    LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
+
+ANT_OPTS = ""
+if os.environ.has_key('ANT_OPTS'):
+    ANT_OPTS = os.environ['ANT_OPTS']
+
+OPTS = ""
+if os.environ.has_key('JIKESPATH'):
+    OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
+
+ANT_ARGS = ""
+if os.environ.has_key('ANT_ARGS'):
+    ANT_ARGS = os.environ['ANT_ARGS']
+
+CLASSPATH = ""
+if os.environ.has_key('CLASSPATH'):
+    CLASSPATH = os.environ['CLASSPATH']
+
+# Builds the commandline
+cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
+    'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
+     % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
+        CLASSPATH, string.join(sys.argv[1:], ' '))
+
+if debug:
+    print '\n%s\n\n' % (cmdline)
+
+# Run the biniou!
+os.system(cmdline)
Index: win_installer/apache-ant-1.6.5/bin/runrc.cmd
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/bin/runrc.cmd	(revision 0)
+++ win_installer/apache-ant-1.6.5/bin/runrc.cmd	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,59 @@
+/* 
+    Copyright 2003-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.
+
+    Run RC file, name is in the first arg, second arg is either PATH
+    ENV  or -r or nothing 
+*/
+
+parse arg name path rest
+
+if name = '' then do
+  say 'RC file name is missing'
+  exit 1
+end
+
+if rest \= '' then do
+  say 'Too many parameters'
+  exit 1
+end
+
+call runit name path
+exit 0
+
+runit: procedure
+parse arg name path dir
+
+if path \= '' & path \= '-r' then do
+  dir = value(translate(path),,'OS2ENVIRONMENT')
+  if dir = '' then return
+  dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
+end
+
+if dir = '' then dir = directory()
+
+if path = '-r' then do /* recursive call */
+  subdir = filespec('path', dir)
+  if subdir \= '\' then do
+    subdir = left(subdir, length(subdir)-1)
+    call runit name path filespec('drive', dir) || subdir
+  end
+end
+
+/* Look for the file and run it */
+if right(dir, 1) \= '\' then dir = dir || '\'
+rcfile = stream(dir || name, 'c', 'query exists')
+if rcfile \= '' then interpret 'call "' || rcfile || '"'
+
+return
Index: win_installer/apache-ant-1.6.5/lib/ant-antlr.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-apache-bcel.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-apache-bsf.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-apache-log4j.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-apache-oro.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-apache-regexp.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-apache-resolver.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-commons-logging.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-commons-net.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-icontract.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-jai.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-javamail.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-jdepend.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-jmf.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-jsch.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-junit.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-launcher.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-netrexx.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-nodeps.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-starteam.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-stylebook.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-swing.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-trax.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-vaj.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-weblogic.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-xalan1.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant-xslp.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/lib/ant.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/apache-ant-1.6.5/welcome.html
===================================================================
diff -u
--- win_installer/apache-ant-1.6.5/welcome.html	(revision 0)
+++ win_installer/apache-ant-1.6.5/welcome.html	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,352 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
+	<TITLE>Welcome to Apache Ant 1.6</TITLE>
+</HEAD>
+<BODY LANG="en-US" BGCOLOR="#ffffff" DIR="LTR">
+<H1>Welcome to Apache Ant 1.6</H1>
+<P><BR><BR>
+</P>
+<H2>Your life just got better. 
+</H2>
+<P>Not in big ways. Your social life isn't going to be helped, though
+with any luck you may now have more time for one. Nor is it going to
+take less time to write your Java code -although we note that running
+<A HREF="http://xdoclet.sf.net/" TARGET="other">XDoclet</A> under Ant
+lets you avoid writing so much code. Nor is a new release of Ant
+likely to provide a fundamental kick-start to the currently somewhat
+subdued technology and software industries. 
+</P>
+<P>No, Ant1.6 will not fundamentally change your life. But if you do
+have to get software out on time -"roughly what you asked for,
+roughly when you asked", then Ant1.6 provides lots of little
+improvements over the existing version. 
+</P>
+<P>Before we look at those details, lets look at the world of The
+Automated Build.</P>
+<P>Firstly, we'd like to thank everyone for all those awards that
+have been flowing in. The JavaWorld Editors' Choice Award for "Most
+Useful Java Community-Developed Technology", The Java
+Developer's Journal "Editors Choice Award", and Java Pro
+Reader's Choice award for "Most Valuable Java Deployment
+Technology." Wow. That's a lot of awards. Aardman Animations
+keep all their Wallace and Gromit -related oscars in a cabinet in
+their tea room. If the Apache organization had a tea room, those Ant
+awards would be forcing all the other (excellent) Apache products to
+fight hard for their cabinet space. 
+</P>
+<P>All those awards come for a reason: everyone, at least everyone
+working on any project of moderate complexity, needs to control their
+build process. Ant is one of the best ways to do it in Java, and,
+over the past four years, it has moved from a tool used simply to
+build Tomcat cross-platform, to a tool used across many open source
+projects, and now to a tool used by almost all Java projects. Indeed,
+pretty much the only competitor in the Java space is a sibling
+project under the Apache banner, <A HREF="http://maven.apache.org/" TARGET="other">Maven</A>.
+One of the obvious signs of Ant's success is that all the popular
+IDEs, from the Open Source -Emacs JDE, Eclipse, NetBeans and jEdit -
+to the commercial: IntelliJ IDEA, Borland JBuilder- all ship with
+built in Ant support. This lets you use your favourite IDE for what
+it is good at: editing text, creating Java source, refactoring
+existing code, debugging and the like, and you can turn to Ant for
+co-ordinating the build-test-deploy/deliver process. That Ant based
+process can be triggered from keystrokes in the IDE, command line
+invocations for those so inclined, and in automated scheduled builds
+so the machines can keep an eye on the engineers. Another sign is how
+Ant is helping the Java aisle of bookstores fight back against
+attempts by books about Macromedia Flash to take over all the space
+-there are now seven or eight books on the subject, with more on the
+way. Germany and Korea have their own native language books too,
+which shows how global the tool is -in use and in development terms. 
+</P>
+<P>The other metric of success is the pre-announcement hints from our
+distant software colleagues in Redmond, Microsoft, of a new build
+tool, "MSBuild", which "might be the single most
+important feature innovation in our pipeline", according to one
+MS developer. That is surely the greatest metric of success: XML
+based build tools are now viewed as so essential to the modern build
+process, that Microsoft has to come up with a competitor to Ant to
+win Java developers over to .NET. Let's hope they discover we like
+ubiquitous JUnit testing too, and refactoring IDEs that create and
+run the tests for us. 
+</P>
+<P>Success comes at a price, of course. One price is all those
+support calls. We try and stay on top of the bug reports, but one
+thing we cannot do is fix inconsistencies or things that seem like
+defects if they stand a significant chance of breaking existing
+builds. Its sad, but there are lots of little minor faults with Ant
+that we don't dare fix because, well, things might break. For
+example, why don't if= and unless= clauses also support
+<code>if="${property}"</code> clauses? Alternatively, why isn't it an
+error to use a property that isn't defined. Everyone that has ever
+seen directories called ${build.dir} popping up the source tree will
+understand why that behaviour is not always what you want. Well, we
+could fix these things, but we won't, because backwards compatibility
+is sacred. 
+</P>
+<P>That is the other price of success: all those users who have
+existing build files they want to work. And all those IDEs that host
+Ant, and who want an easy upgrade to a new version. This means we
+have lost a lot of the flexibility we used to have in the early days
+of the project, when different versions of Ant could have completely
+different property evaluation algorithms and nobody would bat an
+eyelid. Now, even the most obscure bug fix ends up generating 'you
+broke my build complaints'. 
+</P>
+<P>This explains why there will not be the 'incompatible upgrade'
+version of Ant, Ant2.0, that has long been discussed on our web site.
+</P>
+<H2>Where is Ant2.0?</H2>
+<P>For years we have been discussing Ant2.0, the complete rewrite
+version that would be cleaner and faster, and slightly incompatible
+with Ant1.x. It would be the opportunity to take the lessons from the
+1.x line, and support them cleanly. We even got as far as having
+multiple implementations of new Ant engines in the CVS repository,
+especially Mutant and Myrmidion. But we always seemed to have a hard
+time making progress -everyone was too busy using and firefighting
+Ant1.x that nobody got time to work on the 2.x codebase. Which is a
+shame, as all the proposals had interesting ideas.</P>
+<P>After Ant1.5 shipped, the future of Ant effectively resolved into
+one of evolution rather than revolution. There will be no Ant2.0 with
+a complete new engine underneath. There will be no need to run XSL
+transforms over existing build files to move them to the Ant2.0
+world. Instead Ant1.x is getting better underneath the build file
+-improving its internal design while retaining five-nines backwards
+compatibility with existing build files. 
+</P>
+<P>And that is what we have been up to.</P>
+<P>Under the hood, Ant1.6 contains some of the most major reworkings
+of the core Ant system yet seen. We haven't finished yet, and are
+holding back some of the more visible developments so we can see what
+works before their release in a product forces us to maintain them.
+But the underlying parts of Ant are now set up for the next stage in
+development. 
+</P>
+<P>Whether we call the next version of Ant 1.7 or 2.0 is something we
+have yet to decide. Maybe we should call it 3.0 just to surprise
+people.</P>
+<H2>What has changed</H2>
+<P>Look at the <A HREF="WHATSNEW" TARGET="other">WHATSNEW</A>
+document to get a full list of changes. Here are some of the core
+conceptual differences.</P>
+<H3>No more Java1.1</H3>
+<P>We got fed up of jumping through reflection hoops to do everything
+from weak references to setting file timestamps. After consultation
+with the Ant user mail list, Ant1.6 only runs on Java1.2 or later. It
+can still cross compile to Java1.1 if that is what you have to do. We
+haven't completely purged all 1.1 references in the docs, or 1.1
+support from the source, but that will come over time.</P>
+<H3>New classloader use.</H3>
+<P>This is going to make people nervous. If there is one thing Java
+developers have learned over time, only the very naive, the very
+brave, or the very competent do things with classloaders. We will let
+the Ant users decide what category to put us in, but before everyone
+panics, Costin, of Tomcat fame, did a lot of the work here. You don't
+write application servers without understanding classloaders inside
+and out. 
+</P>
+<P>The impact of these changes will trickle out over Ant versions. In
+1.6, the key features are 
+</P>
+<OL>
+	<LI><P>We have got rid of the bit in the batch file/shell script
+	that built up a really big classpath environment variable from
+	everything in ANT_HOME/lib. Now that is done in a launcher class
+	that does the work then calls tools.ant.Main as before.</P>
+	<LI><P>You can add new library directories to that classloader with
+	the -lib option on the command line. This option is interpreted by
+	the launcher class, so will not work with IDEs and other apps that
+	use the inner entry point.</P>
+	<LI><P>We have broken up optional.jar into many-many jar files, such
+	as ant-commons-logging.jar, ant-xalan2.jar, etc etc, and a
+	nodeps.jar for optional stuff without any dependencies. This creates
+	a lot of jar files.</P>
+	<LI><P>You can now &lt;taskdef&gt; existing tasks -like &lt;junit&gt;-
+	by including the specific ant jar <I>and</I> the dependent libraries
+	(i.e. junit.jar) in the declaration. This solves the problem of
+	ANT_HOME/lib needing to contain every jar possibly needed by every
+	user/project. You still have to declare the tasks one by one,
+	something we will fix in Ant1.7</P>
+</OL>
+<H3>Adapters</H3>
+<P>These are Java classes that <I>adapt</I>&gt; arbitrary Java
+classes into ant tasks or types. There has always been some of this
+stuff inside Ant, but now you can &lt;taskdef&gt; a task by naming
+not just the implementation class, but the adapter class. An adapter
+is essentially a meta task implementation -something that can be used
+to create new tasks dynamically. Which, when you consider that the
+core of Ant is fundamentally an XML to java mapping system and a
+simple workflow engine, may let you do very unusual things with Ant. 
+</P>
+<H3>Antlib: Ant libraries</H3>
+<P>This is something we will expand in future. Till now you could
+declare tasks and types with &lt;taskdef&gt; and &lt;typedef&gt;. If
+they were in a jar, you could write a properties file and name the
+resource path of the file in the jar. If you wanted to have both
+tasks and types, you had name a shared classloader. If you wanted to
+add more things -such as conditions or mappers, you were out of luck.</P>
+<P>Antlibs are Ant Libraries, JAR files containing the code to extend
+Ant, and an XML description file to describe how Ant is extended.
+Before anyone panics at 'yet another XML descriptor syntax' to learn:
+you may already know the syntax. We call it "Ant build files".
+Actually it is a subset: it can only contain those task declarations
+that are derived from org.apache.tools.ant.taskdefs.AntlibDefinition.
+That includes &lt;taskdef&gt; and &lt;typedef&gt;, and <I>any other
+task you choose to derive. </I>We are experimenting with scripting
+and some kind of task predefinition declarations in antlibs. With the
+latter, you will be able to write a predefined task -such as a
+&lt;javac&gt; derivative with the compiler options set, and then use
+it any of your build files. This is all too experimental to get into
+Ant1.6 -expect it in the successor. For now, start using antlibs and
+use the &lt;taskdef&gt; task to load them into your projects.</P>
+<H3>XML Namespace aware</H3>
+<P>Ant finally adopts XML namespaces. This is to address build file
+scalability; antlibs can be imported into their own namespaces, and
+so you can avoid namespace clashes with other libraries. If you do
+not know what namespaces are, do not worry -they are not compulsory.</P>
+
+<h3>All tasks can go in at the toplevel</h3>
+<p>
+ 
+Prior to Ant1.6, only three tasks were allowed outside 
+targets : &lt;taskdef&gt;,&lt;typedef&gt; and &lt;property&gt;.
+Ant 1.6 puts an end to this distinction; anything can go in at the top
+level. This is partly because there were many more tasks that merited the 
+option based on the original rationale of "global initialization tasks":
+&lt;import&gt; and &lt;antlib&gt; were the new additions, but existing
+tasks like &lt;condition&gt;, &lt;available&gt;, &lt;xmlproperties&gt; 
+and &lt;loadproperties&gt; had equal rights. 
+</p>
+<p>
+Rather that expand the set slightly, now all tasks are allowed outside
+targets. This gives external tasks the same rights as built in code,
+eliminates sporadic bug reports, and annoying error messages. It gives
+users the ability to write build files without any targets at all; the
+top-level declarations are processed in sequence. 
+</p>
+
+On a style note, we strongly advocate using this feature carefully. It
+is best if zero-side-effect, initialization-only tasks get put into the
+top level. Remember also that all top level statements are processed in
+order, before any targets are executed. Even tasks at the end of the
+file will get executed before targets declared above them. 
+
+<H2>New Tasks</H2>
+<P>As usual, the task base is growing and expanding. These days the
+ant core is resisting adopting many of the highly worthy donations of
+tasks from people, because they make maintenance and firefighting
+worse. Our current stance is that except in special circumstances,
+Ant tasks to support third party open source projects, should live
+with the projects themselves. This keeps them in sync with the
+libraries they integrate with, avoids GPL/Apache licensing issues,
+and reduces the Ant team's support workload, letting them focus on
+the core. The antlib mechanism is intended to make it easier for
+people to load tasks from libraries for this very reason.</P>
+<P>That said, we are pleased to introduce many new tasks. Of
+particular interest may be the SSH tasks, which let one deploy code
+to remote servers securely. Now you really can do live updates with
+Ant -if the operations team will let you. The other one that is quite
+interesting is &lt;subant&gt;. This is an extension of the &lt;ant&gt;
+task, to take an entire fileset of directories and run their build
+files. This is incredibly useful in very large projects. This does
+not mean that we are advocating the many-build-file development
+pattern, but in a sufficiently complex project it happens anyway.
+&lt;subant&gt; keeps things manageable.</P>
+<H2>What else</H2>
+<P>So, what is new in Ant1.6? Lots of stuff. You will have to look at
+the <A HREF="WHATSNEW">whatsnew</A> file to see, but here are some
+key points. 
+</P>
+<OL>
+	<LI><P STYLE="margin-bottom: 0in">Bug fixes. We know, some things
+	were broken in 1.5. In ant1.6 we have moved the bugs, fixing the
+	ones we could, and no doubt adding different ones. Hopefully the
+	total bug count has decreased. 
+	</P>
+	<LI><P STYLE="margin-bottom: 0in">New platforms: Open VMS and HP's
+	NonStop Kernel (Tandem) OS. OpenVMS is very different from the rest;
+	Read the &lt;exec&gt; task documentation carefully. 
+	</P>
+	<LI><P STYLE="margin-bottom: 0in">Spawning. &lt;java&gt; and &lt;exec&gt;
+	started applications can outlive Ant if you set spawn=true. Note
+	that the moment you do so, Ant cannot bind to their input or output,
+	for obvious reasons. 
+	</P>
+	<LI><P>Synchronisation with Java versions (heh, thought by moving
+	javah's entry point that you could hide from us? Think again).</P>
+	<LI><P>Synchronization with third party libraries. Of special note:
+	we have moved to the Apache commons-net.jar, the successor to
+	NetComponents for telnet and FTP as well as Apache BSF, the
+	successor to IBM BSF, for script.</P>
+</OL>
+<P>There are many more enhancements, so we hope you will find your
+build projects easier. We have, as usual, jumped through hoops to
+keep existing builds working. If your build file stops working, and
+it isn't something listed on the 'changes that may break your build'
+part of the WHATSNEW file, or something we know about on bugzilla,
+please don't hesitate to file a new bug report, preferably one with a
+replicable test and a patch to fix the problem. Please, please,
+please, do a search on bugzilla first. You do not want to be the
+seventy-third person to complain that Ant1.6 doesn't do something
+that it should. 
+</P>
+<P>Thanks, 
+</P>
+<P>The Ant development team. 
+</P>
+<H3>Acknowledgements</H3>
+<UL>
+	<LI><P>Many thanks for Antoine to being the build manager for this
+	release! 
+	</P>
+	<LI><P>Thank you to everyone who supplies the components we use in
+	Ant, particularly JUnit, commons-logging, log4J, bcel, ORO, Xerces, and Xalan. 
+	</P>
+	<LI><P>Everyone who has supplied bug reports, especially those with
+	patches and tests.</P>
+	<LI><P>IDE projects who incorporate Ant into their products. Not
+	only does this help Ant's success, you find lots of interesting
+	integration defects. Special mention to the Eclipse team for fixing
+	our memory leaks :)</P>
+</UL>
+<H3>Call to Action</H3>
+
+<P>
+
+It is an interesting time for Java. .NET is a serious challenger, and
+will get better. A core strength of Java over .NET is its community. It
+is the community that gave the world leading edge development tools and
+other core components: Ant, JUnit, XDoclet, hsqldb, Hibernate, Struts,
+etc. These things weren't created by JCP committees, or built according
+to the strategic vision of a Fortune 100 company. They were written by
+Java developers, for Java developers, usually to meet their own tactical
+goals.
+
+</P>
+
+<P>If Java is to survive -and we think it ought to- everyone who can
+needs to become active members of that community. It could be helping
+with Ant, but it could just as easily be helping with any other open
+source Java project, be hosted by Apache, FSF, Sourceforge or someone
+else, be it server-side, client-side or mobile-side. It could be an
+existing project, or it could be your own idea as to how things could
+be better. The key is: things will only be better if you put in the
+time to make it so. 
+</P>
+<H3>Call to Inaction</H3>
+<P>A special message to whoever it is in charge of commands in
+tools.jar: stop moving your entry points! In Ant1.5 we had to deal
+with the 'classic' javac entry point going away in Java1.4.0,
+seemingly coming back later. In Java 1.4.2, the javah entry point
+moved. The traditional command line invocation mechanism has been
+replaced by hosted invocation -Ant, Maven, IDEs, etc, and moving
+entry points around breaks these host applications. Even if we get a
+bug fix out in Ant a few weeks after the Java release, it takes
+months for this to trickle down to end users, especially via IDEs and
+other distributions. For example, Sun's own Java Web Services
+Developer Pack ships with Ant1.5.1, and so cannot run &lt;javah&gt;
+on a 1.4.2 installation. 
+</P>
+</BODY>
+</HTML>
\ No newline at end of file
Index: win_installer/build.xml
===================================================================
diff -u
--- win_installer/build.xml	(revision 0)
+++ win_installer/build.xml	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="LAMS-Win_Installer-Build" basedir=".">
+	
+	<property file="../lams_build/common.properties" />
+
+	<target name="mk-build-dir" description="Create build dir.">
+		<mkdir dir="build" />
+	</target>
+	
+	<target name="dump-db" depends="mk-build-dir" description="Dump full LAMS database contents.">
+	    <exec dir="" executable="C:\Program Files\MySQL\MySQL Server 5.0\bin\mysqldump.exe" 
+	     output="build/dump.sql">
+	      <arg line="-u${db.username}" />
+	      <arg line="--password=${db.password}" />
+	      <arg line="${db.name}" />
+	    </exec>
+	</target>
+	
+	<target name="compile-java" depends="mk-build-dir" description="Compile custom java class">
+		<javac srcdir="src" destdir="build" />
+	</target>
+	
+</project>
\ No newline at end of file
Index: win_installer/graphics/header.bmp
===================================================================
diff -u
Binary files differ
Index: win_installer/graphics/lams2.ico
===================================================================
diff -u
Binary files differ
Index: win_installer/license.txt
===================================================================
diff -u
--- win_installer/license.txt	(revision 0)
+++ win_installer/license.txt	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1 @@
+TODO
\ No newline at end of file
Index: win_installer/src/LAMSInstallModern.nsi
===================================================================
diff -u
--- win_installer/src/LAMSInstallModern.nsi	(revision 0)
+++ win_installer/src/LAMSInstallModern.nsi	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,2148 @@
+;; Coded by C.K. Nimmagadda
+;; Modified by Ernie Ghiglione (ErnieG@melcoe.mq.edu.au)
+;; For LAMS Server Version 1.0.2
+;; Copyright 2005 (c) LAMS International
+;; http://www.lamsinternational.com/
+
+;; Installer Version 0.21
+;; Installer Status: BETA3
+
+;; TODO
+;  More user input validation
+;  Better windows set environment (currently assuming the installer will only run once)
+;  Indentation/style
+;  Filewrites/file grouping
+;  breaking up functions
+
+;---------------------
+;Include Modern UI
+
+  !include "MUI.nsh"
+
+;--------------------------------
+!include "LogicLib.nsh"
+;!macro BIMAGE IMAGE PARMS
+;	Push $0
+;	GetTempFileName $0
+;	File /oname=$0 "${IMAGE}"
+;	SetBrandingImage ${PARMS} $0
+;	Delete $0
+;	Pop $0
+;!macroend
+
+;--------------------------------
+; Add branding image to the installer (an image placeholder on the side).
+; It is not enough to just add the placeholder, we must set the image too...
+; We will later set the image in every pre-page function.
+; We can also set just one persistent image in .onGUIInit
+;AddBrandingImage left 200
+
+;--------------------------------
+;General
+!define VERSION "1.0.2"
+!define BUILD "20060424"
+
+Name "LAMS Server Version ${VERSION}"
+Caption "LAMS Server v${VERSION} Install"
+OutFile "LAMS-Installer-v${VERSION}-build${BUILD}.exe"
+InstallDir "c:\lams\"
+;InstallDir "$PROGRAMFILES\LAMS\Server"
+InstallDirRegKey HKLM "Software\LAMS\Server" ""
+LicenseForceSelection radiobuttons "I Agree" "I Do Not Agree" 
+CheckBitmap "..\..\Contrib\Graphics\Checks\classic-cross.bmp"
+
+BrandingText "LAMS International Free Installer"
+LicenseText ""
+LicenseData "..\..\LAMS\license.txt"
+SetDateSave on
+SetDatablockOptimize on
+CRCCheck on
+SilentInstall normal
+;BGGradient 000000 800000 FFFFFF
+;InstallColors FF8080 000030 
+XPStyle on
+;;LogSet on
+;--------------------------------
+
+!ifndef NOINSTTYPES ; only if not defined
+  InstType "LAMS only"
+  ;InstType /NOCUSTOM
+  ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+AutoCloseWindow true
+ShowInstDetails hide
+
+!include "Sections.nsh"
+#!define SECTION_ON 0x80000000
+#!define SECTION_OFF 0x7FFFFFFF
+
+;;; Not as efficient as using bit flags - change in the next version
+!define BASIC 0
+!define ADVANCED 1
+;;!define NSIS_CONFIG_LOG "install.log"
+;--------------------------------
+;Interface Settings
+
+;  !define MUI_ABORTWARNING
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP  "..\..\LAMS\header.bmp"
+!define MUI_HEADERIMAGE_RIGHT
+
+!define MUI_COMPONENTSPAGE_NODESC ;No value
+
+
+;!insertmacro MUI_DEFAULT MUI_ICON "..\..\LAMS\logo2.ico"
+
+
+!define MUI_ICON "..\..\LAMS\lams2.ico"
+!define MUI_UNICON "..\..\LAMS\lams2.ico"
+
+;  !insertmacro MUI_DEFAULT MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
+;  !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+;  !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE_RIGHT "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
+;  !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_SMALLDESC "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
+;  !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_NODESC "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+
+;  !insertmacro MUI_DEFAULT MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+;  !insertmacro MUI_DEFAULT MUI_LICENSEPAGE_BGCOLOR "/windows"
+  !insertmacro MUI_DEFAULT MUI_LICENSEPAGE_BGCOLOR "FFFFFF"
+;  !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_COLORS "/windows"
+;  !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_PROGRESSBAR "smooth"
+;  !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF"
+;  !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
+;  !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
+;  !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
+;  !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
+
+ ;--------------------------------
+;Pages
+
+  !define MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT "I agree"
+  !define MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE "I do not agree"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; License for installer
+;
+;
+
+  !define MUI_LICENSEPAGE_TEXT_TOP "Scroll down to see the rest of the agreement."
+  !define MUI_PAGE_HEADER_TEXT "LAMS Installer License Agreement"
+  !define MUI_PAGE_HEADER_SUBTEXT  "Please review the LAMS Installer license terms before continuing the installation."
+  !insertmacro MUI_PAGE_LICENSE "..\..\LAMS\disclaimer.txt"
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; License for server
+;
+;
+
+  !define MUI_LICENSEPAGE_TEXT_TOP "Scroll down to see the rest of the agreement."
+  !define MUI_PAGE_HEADER_TEXT "LAMS Server License Agreement"
+  !define MUI_PAGE_HEADER_SUBTEXT  "Please review the LAMS Server license terms before continuing the installation."
+  !insertmacro MUI_PAGE_LICENSE "..\..\LAMS\license.txt"
+  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE "CheckINSTDIR" 
+  !insertmacro MUI_PAGE_DIRECTORY  
+
+  Page custom SelectLevel LeaveSelectLevel
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Components options
+;
+;
+  !define MUI_COMPONENTSPAGE_TEXT_TOP "The default option is a full installation. For additional customisation select a different installation sequence select or deselect individual components. Click Next to continue."
+  !define MUI_COMPONENTSPAGE_TEXT_COMPLIST "Individual installation components, tests or functions:"
+  !define MUI_COMPONENTSPAGE_TEXT_INSTTYPE "Select installation sequence:"
+  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE "LeaveComponentPage" 
+  !insertmacro MUI_PAGE_COMPONENTS
+
+  Page custom GeneralSettings LeaveGeneralSettings
+  Page custom MySQLPage LeaveCustomPageB
+  Page custom CustomPageA LeaveCustomPageA
+#  Page custom FinalSettings
+
+  !insertmacro MUI_PAGE_INSTFILES    
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Finish page setup
+;
+;
+
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_TEXT "Access LAMS Login page on your browser window."
+!define MUI_FINISHPAGE_RUN_FUNCTION "OpenLamsConsole"
+!define MUI_FINISHPAGE_TEXT "The LAMS Server has been successfully installed on your computer."
+
+
+#!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\lams.html"   ;; ARE YOU SURE THIS WORKS????
+#!define MUI_FINISHPAGE_SHOWREADME_TEXT "Display Online LAMS Manual"
+#!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+
+!define MUI_FINISHPAGE_LINK "Purchase LAMS support and contribute to the LAMS project"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.lamsinternational.com/"
+!insertmacro MUI_PAGE_FINISH 
+  
+
+
+
+;--------------------------------
+;Languages
+ 
+  !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+;Reserve Files
+  
+  ;These files should be inserted before other files in the data block
+  ;Keep these lines before any File command
+  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
+  
+  ReserveFile "lams-parameters.ini"
+  ReserveFile "mysql-parameters.ini"
+  ReserveFile "server-parameters.ini"
+  ReserveFile "quick-parameters.ini"
+  ReserveFile "install-select.ini"
+  ReserveFile "quick-parameters.ini"
+  ReserveFile "final-settings.ini"
+  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+;--------------------------------
+;Variables
+
+  Var InstallType
+  Var JDKFlag
+  Var MysqlFlag
+  Var MysqlSetup
+  Var MysqlPassword
+  Var TestFlag
+  Var JAVA_HOME
+  Var MYSQL_HOME
+  Var RETURN_VARIABLE
+  Var EXEC_RETURN_STATUS
+  Var EXEC_RETURN_ERROR  
+  Var FILE_HANDLE
+  Var NEW_FILE_HANDLE
+  Var Copied
+;--------------------------------
+;Installer Sections
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+
+  ;Extract InstallOptions INI files
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "install-select.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "server-parameters.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams-parameters.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "mysql-parameters.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "quick-parameters.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "final-settings.ini"
+
+  File /oname=$PLUGINSDIR\splash.bmp "..\..\LAMS\logo.bmp"
+  advsplash::show 1500 600 400 0x04025C $PLUGINSDIR\splash
+  Pop $0
+
+  ;; JDKFlag & MYSQLFlag = 1 - The installers will not be run
+
+  StrCpy $JDKFlag 1
+  StrCpy $MysqlFlag 1
+  StrCpy $InstallType ${BASIC}
+  StrCpy $MysqlSetup 100
+  StrCpy $MysqlPassword ""
+  StrCpy $JAVA_HOME ""
+  StrCpy $MYSQL_HOME ""
+  StrCpy $Copied 0
+
+  ;; Here we check that JAVA 1.4.2 is installed.	
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.4" "JavaHome" 
+
+  ${If} $2 == ""
+      MessageBox MB_OK|MB_ICONSTOP  'Installation cannot continue as JAVA JDK 1.4.2 is not installed. Please download and install J2SE v 1.4.2_x SDK from http://java.sun.com/j2se/1.4.2/download.html'
+      Abort -2       
+  ${EndIf}
+
+  ; sets JAVA_HOME and adds it to the system as an environment variable 
+  StrCpy $JAVA_HOME "$2"
+
+  ;; Checks that either MySQL 4.1 or 5.0 is installed.	
+  ;ReadRegStr $2 HKLM "SOFTWARE\MySQL AB\MySQL Server 4.1" "Version" 
+  ;ReadRegStr $3 HKLM "SOFTWARE\MySQL AB\MySQL Server 5.0" "Version" 
+
+;  ${If} $2 == "" 
+;  ${AndIf} $3 == ""
+;          MessageBox MB_OK|MB_ICONSTOP  'Installation cannot continue as MySQL Server is not installed. Please download and install MySQL 4.1.x from http://mysql.com'
+;          Abort -2
+;  ${EndIf}
+
+
+
+FunctionEnd
+
+LangString TEXT_IO_TITLE ${LANG_ENGLISH} "LAMS Install Tool 0.1"
+LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Installing LAMS Server ${VERSION}"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Prints a report of the settings chosen
+
+Function FinalSettings
+  SetOutPath "$INSTDIR"
+;   MessageBox MB_OK "$MYSQL_HOME"
+  WriteINIStr  "$PLUGINSDIR\final-settings.ini" "Field 1" "Text" ""
+  !insertmacro MUI_HEADER_TEXT "Configured Settings" "Check the configured settings."
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "final-settings.ini"
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Selects the Installation Type
+
+Function FindExistingLAMS
+   SetOutPath "$INSTDIR"
+   StrCpy $1 ""
+   ReadRegStr $1 HKLM SOFTWARE\LAMS\Server "install_status"
+;; DEBUG
+
+   ${If} $1 == "successful"
+        goto existing
+   ${ElseIf} $1 == "completed"
+        goto existing
+   ${Else}
+        goto end
+   ${EndIf}
+
+   existing:
+
+           ReadRegStr $1 HKLM SOFTWARE\LAMS\Server "install_dir"
+           StrCpy $2 "$1\start-lams.exe"
+           IfFileExists $2 present end
+           present:
+           MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "The LAMS Server may already be installed at $1.$\nContinuing without uninstalling or backing up could overwrite parts of the existing LAMS installation." IDCANCEL quitit
+           ReadRegStr $1 HKLM "SYSTEM\ControlSet001\Services\LAMS" "DisplayName"
+           ${If} $1 != ""
+                 MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "The existing LAMS service will be removed." IDCANCEL quitit
+           ${EndIf}
+           goto end
+   quitit:
+           Quit
+   end:
+FunctionEnd
+
+;Function .onInstFailed
+;        ${If} Copied = 1
+;                Delete "$INSTDIR\*.*"
+;                Quit
+;        ${EndIf}
+;FunctionEnd
+        
+
+Function SelectLevel
+
+   call FindExistingLams
+   SetOutPath "$INSTDIR"
+      File /a "..\..\LAMS\newbie2.bmp"
+      File /a "..\..\LAMS\advanced3.bmp"
+      File /a "..\..\LAMS\basic-text.bmp"
+      File /a "..\..\LAMS\advanced-text.bmp"
+      File /a "..\..\LAMS\LocalPortScanner.class"
+      File /a "..\..\LAMS\ValidateOrgId.class"
+      File /a "..\..\LAMS\ValidateOrgIdCheckSum.class"
+      
+      File /a "..\..\LAMS\manual.html"
+      File /r "..\..\LAMS\openlams_files"
+;      File /a "..\..\LAMS\advancedguide.ppt"
+;      File /a "..\..\LAMS\basicguide.ppt"
+      File /a "..\..\LAMS\advancedguide.pdf"
+      File /a "..\..\LAMS\basicguide.pdf"
+      File /a "..\..\LAMS\teachersguide.pdf"
+      File /a "..\..\LAMS\learnersguide.pdf"
+ ;     File /r "..\..\LAMS\installer"
+      File /r "..\..\LAMS\sc.exe"
+      SetOutPath $TEMP
+      File /a "..\..\LAMS\LocalPortScanner.class"
+      SetOutPath $INSTDIR
+
+      WriteINIStr  "$PLUGINSDIR\server-parameters.ini" "Field 15" "State" "file:///$INSTDIR\manual.html#orgkey"
+      WriteINIStr  "$PLUGINSDIR\server-parameters.ini" "Field 16" "State" "file:///$INSTDIR\manual.html#serverip"
+      WriteINIStr  "$PLUGINSDIR\server-parameters.ini" "Field 17" "State" "file:///$INSTDIR\manual.html#email"
+      WriteINIStr  "$PLUGINSDIR\server-parameters.ini" "Field 18" "State" "file:///$INSTDIR\manual.html#isonline"
+      WriteINIStr  "$PLUGINSDIR\server-parameters.ini" "Field 19" "State" "file:///$INSTDIR\manual.html#os"
+      WriteINIStr  "$PLUGINSDIR\server-parameters.ini" "Field 20" "State" "file:///$INSTDIR\manual.html#smtp"
+
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 21" "State" "file:///$INSTDIR\manual.html#jboss"
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 22" "State" "file:///$INSTDIR\manual.html#uploads"
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 20" "State" "file:///$INSTDIR\manual.html#adminlogin"
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 19" "State" "file:///$INSTDIR\manual.html#adminpassword"
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 18" "State" "file:///$INSTDIR\manual.html#tomcat"
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 17" "State" "file:///$INSTDIR\manual.html#chat"
+      WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 16" "State" "file:///$INSTDIR\manual.html#jdk"
+
+      WriteINIStr  "$PLUGINSDIR\mysql-parameters.ini" "Field 14" "State" "file:///$INSTDIR\manual.html#mysqlhome"
+      WriteINIStr  "$PLUGINSDIR\mysql-parameters.ini" "Field 15" "State" "file:///$INSTDIR\manual.html#mysqldb"
+      WriteINIStr  "$PLUGINSDIR\mysql-parameters.ini" "Field 16" "State" "file:///$INSTDIR\manual.html#mysqluser"
+      WriteINIStr  "$PLUGINSDIR\mysql-parameters.ini" "Field 17" "State" "file:///$INSTDIR\manual.html#mysqlrootpasswd"
+      WriteINIStr  "$PLUGINSDIR\mysql-parameters.ini" "Field 18" "State" "file:///$INSTDIR\manual.html#mysqluserpasswd"
+      WriteINIStr  "$PLUGINSDIR\mysql-parameters.ini" "Field 19" "State" "file:///$INSTDIR\manual.html#mysqlhost"
+
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 18" "State" "file:///$INSTDIR\manual.html#basicorgkey"
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 19" "State" "file:///$INSTDIR\manual.html#basicisonline"
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 20" "State" "file:///$INSTDIR\manual.html#basicemail"
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 21" "State" "file:///$INSTDIR\manual.html#basicsmtp"
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 22" "State" "file:///$INSTDIR\manual.html#basicmysqlrootpasswd"
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 24" "State" "file:///$INSTDIR\manual.html#basicadminlogin"
+      WriteINIStr  "$PLUGINSDIR\quick-parameters.ini" "Field 25" "State" "file:///$INSTDIR\manual.html#basicadminpassword"
+
+      WriteINIStr  "$PLUGINSDIR\install-select.ini" "Field 7" "State" "file:///$INSTDIR\manual.html#guides"
+      WriteINIStr  "$PLUGINSDIR\install-select.ini" "Field 10" "State" "file:///$INSTDIR\manual.html#guides"
+ 
+      WriteINIStr  "$PLUGINSDIR\install-select.ini" "Field 1" "Text" "$INSTDIR\newbie2.bmp"
+      WriteINIStr  "$PLUGINSDIR\install-select.ini" "Field 3" "Text" "$INSTDIR\advanced3.bmp"
+      WriteINIStr  "$PLUGINSDIR\install-select.ini" "Field 5" "Text" "$INSTDIR\basic-text.bmp"
+      WriteINIStr  "$PLUGINSDIR\install-select.ini" "Field 8" "Text" "$INSTDIR\advanced-text.bmp"
+
+      !insertmacro MUI_HEADER_TEXT "Setting Up LAMS" "Installing and Configuring the LAMS Server"
+      !insertmacro MUI_INSTALLOPTIONS_DISPLAY "install-select.ini"
+      ReadINIStr $InstallType "$PLUGINSDIR\install-select.ini" "Field 4" "State"
+
+
+FunctionEnd
+
+Function LeaveSelectLevel
+FunctionEnd
+
+Function LeaveComponentPage
+        SetOutPath "$INSTDIR"
+  ${If} $InstallType = ${BASIC}
+;        !insertmacro MUI_HEADER_TEXT "Interactive Package Install" "Installing 3rd Party packages - JDK 1.4.2"
+       	call RunJavaInstaller
+ 
+;        !insertmacro MUI_HEADER_TEXT "Interactive Package Install" "Installing 3rd Party packages - MySQL 4.1.11"
+       	call RunMysqlInstaller
+   ${Else} 
+        call MiniJDKPage
+        call RunMysqlInstaller
+        ; nothing yet
+  ${Endif}
+;   MessageBox MB_OK "Install type $InstallType"
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Advanced install only
+;
+; Enter system settings
+
+Function GeneralSettings
+  SetOutPath "$INSTDIR"
+  Push $INSTDIR
+  call FixPath
+  Pop  $INSTDIR
+  ${If} $InstallType = ${ADVANCED}
+      	!insertmacro MUI_HEADER_TEXT "General System Settings" "Provide details about the Windows server."
+        ;CallInstDll $INSTDIR\ip.dll get_ip
+        ;Pop $R0   - not needed if using getnextip       
+        ;Call GetNextIp
+        
+        ;gets first IP address off the stack
+        ;Pop $R0
+        
+  	!insertmacro MUI_INSTALLOPTIONS_DISPLAY "server-parameters.ini"
+
+        ; do some pre-form filling
+        WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 3" "State" "$INSTDIR\jboss"
+        WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 5" "State" "$INSTDIR\lamsdata"
+        ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.4" "JavaHome" 
+        WriteINIStr  "$PLUGINSDIR\lams-parameters.ini" "Field 15" "State" "$2"
+  ${Else}
+ 		; Page not activated if basic installation option chosen
+  ${Endif}
+
+FunctionEnd
+
+Function LeaveGeneralSettings
+        SetOutPath "$INSTDIR"
+        call CheckOrgId
+FunctionEnd
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Selects the Installation Type
+
+Function CustomPageA
+   SetOutPath "$INSTDIR"
+  !insertmacro MUI_HEADER_TEXT "Setting Up LAMS" "Installing and Configuring the LAMS Server"
+
+  ${If} $InstallType = ${BASIC}
+        !insertmacro MUI_INSTALLOPTIONS_DISPLAY "quick-parameters.ini"
+  ${Else}
+        !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams-parameters.ini"
+        ;ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 15" "State"
+        ;StrCpy $JAVA_HOME $R3
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 3" "State"
+        StrCpy $1 "The JBoss directory specified '$R3' has a space in it. Please select a directory without a space!"
+        Push $1
+        Push $R3
+        call CheckForSpaces
+        
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 5" "State" 
+        StrCpy $1 "The LAMS Data directory specified '$R3' has a space in it. Please select a directory without a space!"
+        Push $1
+        Push $R3
+        call CheckForSpaces                                     
+  ${Endif}
+FunctionEnd
+
+
+Function LeaveCustomPageA
+  SetOutPath "$INSTDIR"
+  ${If} $InstallType = ${BASIC}
+        ; ReadINIStr $MysqlSetup "$PLUGINSDIR\quick-parameters.ini" "Field 26" "State"
+        StrCpy $MysqlSetup 1
+
+        ReadINIStr $MysqlPassword  "$PLUGINSDIR\quick-parameters.ini" "Field 13" "State"
+        call CheckOrgId
+        call CheckLAMSLogin
+        call CheckLAMSPassword      
+  ${Else}
+        ; nothing yet
+  ${Endif}
+  call RunTests
+FunctionEnd
+
+Function CheckOrgId
+  SetOutPath "$INSTDIR"
+  ${If} $InstallType = ${BASIC}
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 2" "State" 
+        ReadINIStr $R4 "$PLUGINSDIR\quick-parameters.ini" "Field 5" "State" 
+  ${Else}
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 4" "State" 
+        ReadINIStr $R4 "$PLUGINSDIR\server-parameters.ini" "Field 3" "State"
+  ${EndIf}      
+
+        ${If} $R3 = 1
+;                nsExec::ExecToStack '$JAVA_HOME\bin\java ValidateOrgId $R4'
+
+                nsExec::ExecToStack '$JAVA_HOME\bin\java ValidateOrgIdCheckSum $R4'
+                Pop $EXEC_RETURN_STATUS
+                Pop $EXEC_RETURN_ERROR 
+                ;MessageBox MB_OK "got here: $R4 $EXEC_RETURN_ERROR"
+                ${If} $EXEC_RETURN_STATUS = 0
+                        ;;
+
+                ${ElseIf} $EXEC_RETURN_STATUS = 2
+                        MessageBox MB_OK "Invalid Organisation Key. Please check your key or retrieve your valid organisation key.$\nTo continue without a valid organisation key, please deselect the option 'This will be an Online Server'"
+                        Abort
+                ${Else}
+                        MessageBox MB_OK "Unable to verify your Organisation Key.$\nTo continue without a valid organisation key, please deselect the option 'This will be an Online Server'"
+                        Abort
+                ${EndIf}
+        ${EndIf}
+
+
+
+FunctionEnd
+
+;; Only runs for the basic install
+
+Function CheckLAMSLogin
+        SetOutPath "$INSTDIR"
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 15" "State"
+        ${If} $R3 == "admin"      
+
+                goto quitit                
+        ${ElseIf} $R3 == "author"      
+                goto quitit
+        ${ElseIf} $R3 == "teacher"      
+                goto quitit
+        ${ElseIf} $R3 == "learner"
+                goto quitit
+        ${Else}      
+                goto end
+        ${EndIf}
+        quitit:
+                MessageBox MB_OK|MB_ICONSTOP "The username 'admin' is reserved by the system. Pick an alternative name!"
+                Abort
+        end:
+        StrCpy $1 "The username '$R3' has a space in it. Please select a login name without a space!"
+        Push $1
+        Push $R3
+        call CheckForSpaces
+FunctionEnd
+
+Function CheckLAMSPassword
+        SetOutPath "$INSTDIR"
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 17" "State"
+        StrCpy $1 "The password '$R3' has a space in it. Please select a password without a space!"
+        Push $1
+        Push $R3
+        call CheckForSpaces
+FunctionEnd
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Advanced install only
+;
+; The mysql page
+
+Function MySQLPage
+   SetOutPath "$INSTDIR"
+  ${If} $InstallType = ${ADVANCED}
+        ; Advanced Installation only
+
+    call FindMySQLInstallation
+
+	${If} $MYSQL_HOME == ""
+		WriteINIStr "$PLUGINSDIR\mysql-parameters.ini" "Field 3" "State" "c:\mysql\"
+	${Else}
+		WriteINIStr "$PLUGINSDIR\mysql-parameters.ini" "Field 3" "State" $MYSQL_HOME
+	${Endif}
+
+       !insertmacro MUI_HEADER_TEXT "MySQL Integration" "Configuring LAMS to the use the MySQL database."
+       !insertmacro MUI_INSTALLOPTIONS_DISPLAY "mysql-parameters.ini"
+  ${Else}
+	redundant: 
+		; Page not activated if basic installation option chosen
+  ${Endif}
+
+FunctionEnd
+
+Function LeaveCustomPageB
+  call LeaveMysqlPage
+FunctionEnd
+
+Function FixPath
+        SetOutPath "$INSTDIR"
+        Pop $1
+        StrCpy $0 ""
+        StrCpy $0 $1 1 -1
+        ${If} $0 == "\"
+                StrCpy $0 $1 -1
+        ${Else}
+                StrCpy $0 $1
+        ${EndIf}
+        Push $0
+FunctionEnd
+
+Function LeaveMysqlPage
+        SetOutPath "$INSTDIR"
+        ReadINIStr $MYSQL_HOME "$PLUGINSDIR\mysql-parameters.ini" "Field 3" "State"
+        
+        ; We now assume MySQL has been setup by the user.
+        ; ReadINIStr $MysqlSetup  "$PLUGINSDIR\mysql-parameters.ini" "Field 21" "State"
+        StrCpy $MysqlSetup 1  
+
+        ReadINIStr $MysqlPassword  "$PLUGINSDIR\mysql-parameters.ini" "Field 9" "State"
+        Push $MYSQL_HOME
+        Call FixPath
+        Pop $R3
+        IfFileExists $R3 present notpresent
+      
+        notpresent:
+              	MessageBox MB_OK|MB_ICONSTOP "Invalid MySQL Home specified (check if $R3 exists)!"
+                Abort
+        present:
+		; changed from mysqld-nt.exe to mysqld.exe for compatibility with easyphp/xamp, etc.
+                StrCpy $R3 "$MYSQL_HOME\bin\mysqld.exe"
+              	IfFileExists "$MYSQL_HOME\bin\mysqld.exe" done notpresent
+        done:
+
+
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Advanced install only
+;
+; The JDK page - enters only when JDK needs to be installed - needs to be relocated
+
+Function FindJDKInstallation
+        SetOutPath "$INSTDIR"
+        StrCpy $2 0
+	ClearErrors
+	;ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion" 
+	ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.4" "JavaHome" 
+	ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "MicroVersion"
+	IfErrors 0 setlocation
+
+        ;; if errors again then looking at the enviornment variable
+;     	ReadEnvStr $2 "JAVA_HOME"      
+        ${If} $JAVA_HOME != ""
+                StrCpy $2 "$2\"
+        ${EndIf}
+        
+        ;; sets as blank (by default) if no environment variable either
+        setlocation:
+                StrCpy $JAVA_HOME $2         
+FunctionEnd
+
+
+Function MiniJDKPage
+        SetOutPath "$INSTDIR"
+       	call RunJavaInstaller       	
+        call FindJDKInstallation
+
+  	ReadEnvStr $R0 "JAVA_HOME"
+	${If} $R0 == ""
+	  	WriteINIStr "$PLUGINSDIR\lams-parameters.ini" "Field 15" "State" "aasa"
+        ${Else}
+		WriteINIStr "$PLUGINSDIR\lams-parameters.ini" "Field 15" "State" $R0
+    ${Endif}
+        done:
+FunctionEnd
+
+Function LeaveJDKPage
+        SetOutPath "$INSTDIR"
+        ReadINIStr $JAVA_HOME "$PLUGINSDIR\lams-parameters.ini" "Field 15" "State"
+        IfFileExists $JAVA_HOME present notpresent
+       
+        notpresent:
+              	MessageBox MB_OK|MB_ICONSTOP "Invalid Java Home specified (check if $JAVA_HOME\bin\javac.exe exists)!"
+                Abort
+        present:
+              	IfFileExists "$JAVA_HOME\bin\javac.exe" done notpresent
+        done:
+
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;  Advanced install only
+;
+; Installing JDK and Mysql - potentially based on whether or not they are selected
+
+Function "RunJavaInstaller"
+        SetOutPath "$INSTDIR"
+
+        call FindJDKInstallation
+        ${If} $JDKFlag = 0
+        
+                
+              ;;;; JDK Installer no longer run
+              MessageBox MB_OK "Please down and installer J2SDK 1.4.2.x before continuing the installation."
+              
+              ;!insertmacro MUI_HEADER_TEXT "Interactive Package Install" "Installing 3rd Party packages - JDK 1.4.x"
+              ;  MessageBox MB_OK|MB_ICONQUESTION "Launching the JDK installer may take a few seconds.$\nSelect Not to restart your computer after JDK has been installed."
+              ; StrCpy $JDKFlag 2
+	      ; ${If} $JAVA_HOME != ""
+	       ;      MessageBox MB_YESNO|MB_ICONINFORMATION "Java may already be installed at $JAVA_HOME. Continue (recommended)?" IDNO continuefurther ; skipped if file doesn't exist
+	       ;${Endif}
+               ;
+               ; SetOutPath $TEMP
+               ; File /a "..\..\bundled\jdk-installer.exe"
+               ;
+               ; sleep 1000
+               ;   ;SearchPath $1 jdk-installer.exe
+               ;   ;MessageBox MB_OK "$INSTDIR\jdk-installer.exe=$1"
+               ; ExecWait '"$TEMP\jdk-installer.exe"'
+               ;
+               ; nsExec::ExecToStack '$JAVA_HOME\bin\javac --version'
+               ; Pop $EXEC_RETURN_STATUS
+               ; Pop $EXEC_RETURN_ERROR 
+               ;
+               ; MessageBox MB_OK|MB_ICONEXCLAMATION "Windows may present an alert message when first using Java!$\nPlease select to unblock Java/Javac for the install to complete successfully."
+               ; nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 3306'
+               ; Pop $EXEC_RETURN_STATUS
+               ; Pop $EXEC_RETURN_ERROR
+               ; call FindJDKInstallation
+               ; continuefurther:
+               ;         bringtofront
+        ${EndIf}
+        SetOutPath $INSTDIR
+FunctionEnd
+
+;Function FindMySQLService
+;          SetOutPath "$TEMP"
+;
+;          nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 3306'
+;          Pop $EXEC_RETURN_STATUS
+;          Pop $EXEC_RETURN_ERROR
+;          ;MessageBox MB_OK|MB_ICONEXCLAMATION "Status: $EXEC_RETURN_STATUS cmd:$JAVA_HOME\bin\java LocalPortScanner 3306"
+;
+;          ${If} $EXEC_RETURN_STATUS = 1
+;                ${If} $InstallType = ${ADVANCED}
+;                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+;                ${EndIf}
+;          ${ElseIf} $EXEC_RETURN_STATUS = 0
+;                ;;
+;          ${Else}      
+;                MessageBox MB_OK|MB_ICONSTOP "Error launching MySQL installer: MySQL is already running! Uninstall MySQL or use the existing MySQL server for LAMS!$\n$\nDe-select 'Launch MySQL Installer' to continue."
+;                ${If} $InstallType = ${ADVANCED}
+;                        Abort -2
+;                ${EndIf}
+;                Abort
+;          ;; Mysql is running
+;          ${EndIf}
+;
+;	      ${If} $MYSQL_HOME != ""
+;               StrCpy $1 "$MYSQL_HOME\bin\mysqladmin.exe"
+;               IfFileExists "$1" intactdatabase
+;	                    MessageBox MB_YESNO|MB_ICONQUESTION "Detected an exising MySQL installation at $MYSQL_HOME. Continue?" IDNO quitit
+;	                    goto continue
+;               intactdatabase:
+;	                    MessageBox MB_YESNO|MB_ICONQUESTION "Detected an exising MySQL installation at $MYSQL_HOME. Abort MySQL installation (recommended)?" IDYES quitit
+;               continue:
+;                   StrCpy $1 "$MYSQL_HOME\bin\mysqladmin.exe"
+;               StrCpy $EXEC_RETURN_STATUS 2
+;               StrCpy $EXEC_RETURN_ERROR "Existing MySQL!"
+;	      ${Endif}
+;
+;         ReadRegStr $1 HKLM "SYSTEM\ControlSet001\Services\MySQL" "DisplayName"
+;          ${If} $1 != ""
+;                goto foundservice
+;          ${Else}
+;                goto olddatabase
+;          ${EndIf}
+;          
+;          foundservice:
+;                  MessageBox MB_YESNO|MB_ICONEXCLAMATION "Found an existing (but not running) MySQL service component in Windows.$\nThis service component must be removed for the MySQL installation to continue!$\nClick Yes to remove and continue, No to abort and fix manually!" IDNO olddatabase
+;                  SetOutPath "$TEMP"
+;                  File /r "..\..\LAMS\removemysql"
+;                  nsExec::ExecToStack '$TEMP\removemysql\bin\UninstallMySQLService.bat'
+;                  Pop $EXEC_RETURN_STATUS
+;                  Pop $EXEC_RETURN_ERROR
+;                  ${If} $EXEC_RETURN_STATUS != 0
+;                         MessageBox MB_OK|MB_ICONEXCLAMATION "Removing the service may have failed!"
+;                  ${EndIf}
+;          olddatabase:
+;                  StrCpy $0 "C:\Program Files\MYSQL\MySQL Server 4.1"
+;                  StrCpy $1 "C:\Program Files\MYSQL\MySQL Server 4.1\data\mysql\db.frm"
+;                  IfFileExists "$1" yesdatabase nodatabase
+;
+;          yesdatabase:
+;                        MessageBox MB_YESNO|MB_ICONEXCLAMATION "A dormant MySQL database at $0\data may interfere with the MySQL installation.$\nThis directory needs to be moved for the MySQL installation to complete successfully!$\nClick Yes to rename this directory to $0\data-backup.lams, or click No to leave directory unchanged!" IDNO end
+;                        File /a "..\..\LAMS\move.bat"
+;                        nsExec::ExecToStack '"$TEMP\move.bat" "$0\data" "$0\data-backup.lams"'
+;                        Pop $EXEC_RETURN_STATUS
+;                        Pop $EXEC_RETURN_ERROR
+;                        ${If} $EXEC_RETURN_STATUS != 0
+;                               MessageBox MB_OK|MB_ICONEXCLAMATION "Please move the existing database at $0\data before continuing."
+;                        ${EndIf}                
+;                  goto end
+;         nodatabase:
+;                  goto end
+;         
+;          quitit:
+;                  StrCpy $1 "Existing MySQL!"
+;                  Push $1        
+;                  StrCpy $1 1
+;                  Push $1 
+;                  goto done
+;          end:          
+;                  StrCpy $1 "No error"
+;                  Push $1        
+;                  StrCpy $1 0
+;                  Push $1 
+;          done:                 
+;                  SetOutPath "$INSTDIR"
+;FunctionEnd
+
+Function FindMySQLInstallation
+        SetOutPath "$INSTDIR"
+        StrCpy $1 0
+        
+        ClearErrors
+        ReadRegStr $1 HKLM "SOFTWARE\MYSQL AB\MySQL Server 4.1" "Location"
+        IfErrors 0 setlocation
+
+        ;; if errors then trying again else "setlocation"
+      	ClearErrors
+        ReadRegStr $1 HKLM "SOFTWARE\MYSQL AB\MySQL Server 5.0" "Location"
+	IfErrors 0 setlocation
+
+        ;; if errors again then looking at the enviornment variable
+
+;;       	ReadEnvStr $1 "MYSQL_HOME"
+       
+        ;; sets as blank if no environment variable either
+        setlocation:
+                Push $1
+                call FixPath
+                Pop $1
+                StrCpy $MYSQL_HOME $1
+;                MessageBox MB_OK "fixpath mysql home $MYSQL_HOME" 
+
+; Check if Mysql Service is installer
+
+               
+FunctionEnd
+
+Function "RunMysqlInstaller"
+   SetOutPath "$INSTDIR"
+  call FindMySQLInstallation
+  ${If} $MysqlFlag = 0
+        ; MySQL No longer installed
+        
+        MessageBox MB_OK "Please install MySQL before continuing with the LAMS installation."
+       ;!insertmacro MUI_HEADER_TEXT "Interactive Package Install" "Installing 3rd Party packages - MySQL 4.1.11"
+       ; ;; No intact MySQL found - try to look for poorly uninstalled bits
+       ; call FindMySQLService
+       ; pop $EXEC_RETURN_STATUS
+       ; pop $EXEC_RETURN_ERROR
+       ;
+       ; ${If} $EXEC_RETURN_STATUS != 0
+       ;         goto skipinstall
+       ; ${EndIf}
+       ;
+       ; MessageBox MB_OK "Launching the MySQL Installer - this may take a few seconds!$\nPlease select and write down a password for MySQL configuration. This password will need to be entered again later."
+       ; SetOutPath $TEMP
+       ; StrCpy $MysqlFlag 2
+       ; File /a "..\..\bundled\mysql-setup.exe"
+;  SearchPath $1 mysql-setup.exe
+;  MessageBox MB_OK "setup=$1"
+       ; nsExec::ExecToStack '$TEMP\mysql-setup.exe'
+        ;Pop $EXEC_RETURN_STATUS
+        ;Pop $EXEC_RETURN_ERROR
+        ;SetOutPath $INSTDIR        
+        ;sleep 4000
+        ;MessageBox MB_OK|MB_ICONINFORMATION "Press OK to continue after the MySQL installation process has been completed."
+  ;skipinstall:  
+        ;call FindMySQLInstallation
+        ; done
+  ${EndIf}
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;--------------------------------
+;Descriptions
+
+  ;Language strings
+
+  ;Language strings
+  LangString DESC_SecDummy ${LANG_ENGLISH} "LAMS Server ${VERSION}"
+
+  ;Assign language strings to sections
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Section "" ; empty string makes it hidden, so would starting with -
+
+SetDetailsPrint textonly
+DetailPrint "Status: Extracting packaged files to start the installation."
+SetDetailsPrint listonly
+;LogSet on
+
+;  ;LogSet on
+
+  ; write registry stuff
+  DetailPrint "Writing to registry"
+  WriteRegStr HKLM SOFTWARE\LAMS\Server "install_dir" "$INSTDIR"
+  WriteRegStr HKLM SOFTWARE\LAMS\Server "install_version" "${VERSION}"
+  WriteRegStr HKLM SOFTWARE\LAMS\Server "install_build" "${BUILD}"
+  WriteRegStr HKLM SOFTWARE\LAMS\Server "install_status" "started"
+  WriteRegStr HKLM SOFTWARE\LAMS\Server "service" "lams"
+
+  ; write uninstall strings
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LAMS Server" "DisplayName" "LAMS Server (remove only) - MySQL & JDK must be removed separately"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LAMS Server" "UninstallString" '"$INSTDIR\uninstall-lams.exe"'
+
+  SetOutPath $INSTDIR
+  File /r "..\..\LAMS\apache-ant"
+  File /r "..\..\LAMS\wrapper"
+  File /r "..\..\LAMS\lams-package"
+  File /r "..\..\LAMS\jboss"
+  File /a "..\..\LAMS\CallOS.class"
+  File /a "..\..\LAMS\move.bat"
+  File /a "..\..\LAMS\sed.exe"
+  File /a "..\..\LAMS\setenv.exe"
+  File /a "..\..\LAMS\cat.exe"
+  File /a "..\..\LAMS\openlams.html"
+  File /a "..\..\LAMS\showlams.html"
+  File /a "..\..\LAMS\startlams.html"
+  File /a "..\..\LAMS\manual.html"
+  File /r "..\..\LAMS\openlams_files"
+  ;File /r "..\..\LAMS\manual_files"
+  File /a "..\..\LAMS\loading.png"
+  File /a "..\..\LAMS\setenv.exe"
+  File /a "..\..\LAMS\runh.exe"
+  File /a "..\..\LAMS\start-lams.bat"
+  File /a "..\..\LAMS\stop-lams.bat"
+  File /a "..\..\LAMS\start-lams.exe"
+  File /a "..\..\LAMS\stop-lams.exe"
+  File /a "..\..\LAMS\update-lams.exe"
+  File /a "..\..\LAMS\LocalPortScanner.class"
+  ;File /a "..\..\LAMS\my.ini.chg"
+  File /a "..\..\LAMS\my.ini"
+  SetOutPath $TEMP
+  File /a "..\..\LAMS\LocalPortScanner.class"
+  SetOutPath $INSTDIR
+  WriteUninstaller "uninstall-lams.exe"
+
+  ;; now we add JAVA_HOME as a environment variable
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.4" "JavaHome"
+  nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m JAVA_HOME "$2"'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+
+  ;; Add LAMS install directory to classpath
+  ReadEnvStr $R0 "CLASSPATH"
+  StrCpy $R0 "$R0;$INSTDIR"
+  System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i(CLASSPATH, $R0).r0'
+SectionEnd
+
+Section "Verify JDK Settings" JDKIDX
+SetDetailsPrint listonly
+;LogSet on
+SectionIn RO
+
+
+;AddSize 55000
+
+${If} $JDKFlag = 2
+;;; Adding JAVA_HOME
+
+ReadEnvStr $R0 "PATH"
+
+System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i(PATH, "$R0\bin;$R0").r0'
+nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m JAVA_HOME "$JAVA_HOME"'
+Pop $EXEC_RETURN_STATUS
+Pop $EXEC_RETURN_ERROR
+
+nsExec::ExecToStack '  "$INSTDIR\setenv.exe" -m PATH "$JAVA_HOME\bin;$R0"'
+Pop $EXEC_RETURN_STATUS
+Pop $EXEC_RETURN_ERROR
+System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i(PATH, "$R0\bin;$R0").r0'
+
+${EndIf}
+
+SectionEnd
+
+Section "Verify MySQL Settings" MYSQLIDX
+SetDetailsPrint textonly
+DetailPrint "Status: Configuring the LAMS server to work your with MySQL installation."
+SetDetailsPrint listonly
+;LogSet on
+SectionIn RO
+;AddSize 30000 
+
+
+
+${If} $MysqlSetup != 1
+
+        ReadEnvStr $R0 "PATH"
+
+        ;System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i(MYSQL_HOME, $R3).r0'
+        DetailPrint '"$INSTDIR\setenv.exe" -m MYSQL_HOME "$MYSQL_HOME"'
+        nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m MYSQL_HOME "$MYSQL_HOME"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        DetailPrint '"$INSTDIR\setenv.exe" -m PATH "$MYSQL_HOME\bin;$R0"'
+        ;System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i(PATH, "$R0\bin;$R0").r0'
+        nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m PATH "$MYSQL_HOME\bin;$R0"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        ;handle string
+        ClearErrors
+        FileOpen $4 "$INSTDIR\mysql-config.bat" w
+        IfErrors done
+        FileWrite $4 '"$INSTDIR\setenv.exe" -m PATH "$MYSQL_HOME\bin;$R0"'
+        FileWriteByte $4 "13"
+        FileWriteByte $4 "10"
+        FileWrite $4 'set MYSQL_HOME=$MYSQL_HOME'
+        FileWriteByte $4 "13"
+        FileWriteByte $4 "10"
+        FileWrite $4 '"$INSTDIR\setenv.exe" -m PATH=$MYSQL_HOME\bin;$R0'
+        FileWriteByte $4 "13"
+        FileWriteByte $4 "10"
+        FileWrite $4 'set PATH=$MYSQL_HOME\bin;%PATH%'
+        FileWriteByte $4 "13"
+        FileWriteByte $4 "10"
+
+
+        FileWrite $4 'cd "$MYSQL_HOME\bin"'
+        FileWriteByte $4 "13"
+        FileWriteByte $4 "10"
+        FileWrite $4 ''
+        FileWriteByte $4 "13"
+        FileWriteByte $4 "10"
+
+;${If} MysqlSetup != 1
+;
+;        FileWrite $4 'call "$MYSQL_HOME\bin\mysqld-nt.exe" --remove'
+;        FileWriteByte $4 "13"
+;       FileWriteByte $4 "10"
+;       FileWrite $4 'call "$MYSQL_HOME\bin\mysqld-nt.exe" --install'
+;        FileWriteByte $4 "13"
+;        FileWriteByte $4 "10"
+;        FileWrite $4 'call sc start mysql'
+;        FileWriteByte $4 "13"
+;        FileWriteByte $4 "10"
+;${EndIf}
+
+        FileClose $4
+        sleep 1000
+
+
+        DetailPrint '"$INSTDIR\mysql-config.bat"'
+        nsExec::ExecToStack '"$INSTDIR\mysql-config.bat"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+        sleep 3000
+${Endif}
+
+        FileOpen $FILE_HANDLE "$MYSQL_HOME\my.ini" a
+        FileSeek $FILE_HANDLE -1 END
+        FileWriteByte $FILE_HANDLE "13"
+        FileWriteByte $FILE_HANDLE "10"
+        FileWrite $FILE_HANDLE 'transaction-isolation = READ-COMMITTED'
+        FileWriteByte $FILE_HANDLE "13"
+        FileWriteByte $FILE_HANDLE "10"
+        FileClose $FILE_HANDLE
+
+
+;;;;; Mysql Config stuff
+
+        ${If} InstallType = ${BASIC}
+                ReadINIStr $R7 "$PLUGINSDIR\quick-parameters.ini" "Field 13" "State"
+        ${ElseIf} InstallType = ${ADVANCED}
+                ReadINIStr $R7 "$PLUGINSDIR\mysql-parameters.ini" "Field 9" "State"        
+        ${EndIf}      
+
+        ${If} MysqlSetup != 1
+                nsExec::ExecToStack  '"$MYSQL_HOME\bin\mysqladmin.exe" -u root reload'
+                Pop $EXEC_RETURN_STATUS
+                Pop $EXEC_RETURN_ERROR
+
+                nsExec::ExecToStack  '"$MYSQL_HOME\bin\mysqladmin.exe" -u root flush-privileges password "$R7"'
+                Pop $EXEC_RETURN_STATUS
+                Pop $EXEC_RETURN_ERROR
+
+        ${Else}
+                nsExec::ExecToStack  '"$MYSQL_HOME\bin\mysqladmin.exe" -u root reload -p$R7'
+                Pop $EXEC_RETURN_STATUS
+                Pop $EXEC_RETURN_ERROR
+
+        ${EndIf}
+
+
+
+;
+;MessageBox MB_OK " $R3"
+
+done:
+  BringToFront
+SectionEnd
+
+SubSection "Pre-Requisite Tests" 
+
+Section "Testing Java " 
+SetDetailsPrint listonly
+;LogSet on
+  BeginTestSection:
+  SectionIn RO
+
+SectionEnd
+
+Function FailedTest
+SetOutPath "$INSTDIR"
+SetDetailsPrint listonly
+;LogSet on
+  MessageBox MB_YESNO|MB_ICONSTOP "One or more tests failed! Click 'Yes' to continue if the reported problem has been resolved or click 'No' to abort and re-configure." IDNO end
+  goto continue
+  end:
+  Abort
+  continue:
+FunctionEnd
+
+Function RunTests
+SetDetailsPrint textonly
+DetailPrint "Status: Testing your 3rd party packages."
+SetDetailsPrint listonly
+;LogSet on
+  ;WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Policies\Explorer" NORUN 1  
+
+  SetOutPath "$TEMP"
+  nsExec::ExecToStack ' $JAVA_HOME\bin\java -version'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  ;MessageBox MB_OK|MB_ICONSTOP "$JAVA_HOME"
+
+  ${If} $EXEC_RETURN_STATUS = 1
+  MessageBox MB_OK|MB_ICONSTOP "JRE (java) appears not to be working as expected!"
+  call FailedTest
+  ${EndIf}
+
+  nsExec::ExecToStack '$JAVA_HOME\bin\javac -version'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  ${If} $EXEC_RETURN_STATUS = 1
+        MessageBox MB_OK|MB_ICONSTOP "JDK (javac) appears not to be working as expected!"
+        call FailedTest
+  ${EndIf}
+
+  sleep 1000
+  ;MessageBox MB_OK " hmm1 = $1 $INSTDIR\LocalPortScanner"
+  ${If} $InstallType = ${BASIC}
+        call FindMySQLInstallation
+        nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 1099 1098 4444 4445 8009 8083 8080 8090 8092 8093 9800'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+  ${Else}
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 11" "State"
+        ReadINIStr $R4 "$PLUGINSDIR\lams-parameters.ini" "Field 13" "State"
+
+        nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 1099 1098 4444 4445 8009 8083 8090 8092 8093 $R3 $R4'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+  ${EndIf}
+
+  ${If} $EXEC_RETURN_STATUS = 1
+        ${If} InstallType = ${ADVANCED}
+                MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+        ${EndIf}
+  ${ElseIf} $EXEC_RETURN_STATUS = 2
+          MessageBox MB_OK|MB_ICONSTOP "Not all JBoss-tomcat server mandatory ports are open. $\n$EXEC_RETURN_ERROR"
+          call FailedTest
+  ${ElseIf} $EXEC_RETURN_STATUS = 0
+	;;
+  ${Else}
+          MessageBox MB_OK|MB_ICONSTOP "Not all JBoss-tomcat server mandatory ports are open. $\n$EXEC_RETURN_ERROR"
+          call FailedTest
+  ${EndIf}
+
+
+  ${If} $MysqlSetup = 1
+        nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 3306'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        ${If} $EXEC_RETURN_STATUS = 1
+                ${If} InstallType = ${ADVANCED}
+                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+                        call FailedTest
+                ${EndIf}
+
+        ${ElseIf} $EXEC_RETURN_STATUS = 2
+	;; Mysql is running
+        ${ElseIf} $EXEC_RETURN_STATUS = 0
+                MessageBox MB_OK|MB_ICONSTOP "Checking port 3306: MySQL is not running! Check that the MySQL install process is completed and MySQL is running!"
+                call FailedTest
+        ${Else}
+                ${If} InstallType = ${ADVANCED}
+                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+                ${EndIf}
+        ${EndIf}
+
+          ;MessageBox MB_OK|MB_ICONEXCLAMATION "Query: $MYSQL_HOME\bin\mysqladmin -u root -p$MysqlPassword"
+          nsExec::ExecToStack '"$MYSQL_HOME\bin\mysqladmin.exe" -u root status -p$MysqlPassword'
+          Pop $EXEC_RETURN_STATUS
+          Pop $EXEC_RETURN_ERROR
+          ${If} $EXEC_RETURN_STATUS != 0
+                  MessageBox MB_OK|MB_ICONEXCLAMATION "Please set your current and correct password if MySQL has already been configured!"
+                  Abort
+          ${EndIf}
+   ${Else}
+
+          nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 3306'
+          Pop $EXEC_RETURN_STATUS
+          Pop $EXEC_RETURN_ERROR
+
+        ${If} $EXEC_RETURN_STATUS = 1
+                ${If} InstallType = ${ADVANCED}
+                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+                ${EndIf}
+        ${ElseIf} $EXEC_RETURN_STATUS = 2
+                  MessageBox MB_OK|MB_ICONSTOP "MySQL is already running!$\nPlease select the 'Already configured MySQL server option' and set your existing password if MySQL has already been configured!"
+                  call FailedTest
+	;; Mysql is running
+        ${ElseIf} $EXEC_RETURN_STATUS = 0
+        ${Else}
+                ${If} InstallType = ${ADVANCED}
+                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+                ${EndIf}
+        ${EndIf}
+
+          nsExec::ExecToStack '"$MYSQL_HOME\bin\mysqld-nt.exe" --install'
+          Pop $EXEC_RETURN_STATUS
+          Pop $EXEC_RETURN_ERROR
+          ;MessageBox MB_OK|MB_ICONEXCLAMATION "$MYSQL_HOME\bin\mysqld-nt.exe --install"
+
+          nsExec::ExecToStack '$INSTDIR\move.bat "$INSTDIR\my.ini" "$MYSQL_HOME\my.ini"'
+          Pop $EXEC_RETURN_STATUS
+          Pop $EXEC_RETURN_ERROR
+          ;MessageBox MB_OK|MB_ICONEXCLAMATION "$MYSQL_HOME\bin\mysqld-nt.exe --install"
+
+          
+          sleep 250
+          nsExec::ExecToStack '"$INSTDIR\sc.exe" start mysql'
+          Pop $EXEC_RETURN_STATUS
+
+          Pop $EXEC_RETURN_ERROR
+          ;MessageBox MB_OK|MB_ICONEXCLAMATION "sc start mysql"
+          
+          sleep 250
+          nsExec::ExecToStack '$JAVA_HOME\bin\java LocalPortScanner 3306'
+          Pop $EXEC_RETURN_STATUS
+          Pop $EXEC_RETURN_ERROR
+
+        ${If} $EXEC_RETURN_STATUS = 1
+                ${If} InstallType = ${ADVANCED}
+                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+                ${EndIf}
+        ${ElseIf} $EXEC_RETURN_STATUS = 2
+	;; Mysql is running
+        ${ElseIf} $EXEC_RETURN_STATUS = 0
+                MessageBox MB_OK|MB_ICONSTOP "Checking port 3306: MySQL is not running! Check that the MySQL install process is completed and MySQL is running!"
+                call FailedTest
+        ${Else}
+                ${If} InstallType = ${ADVANCED}
+                        MessageBox MB_OK|MB_ICONEXCLAMATION "Port scanning test encountered a problem! Continuing anyway..."
+                ${EndIf}
+        ${EndIf}
+
+          ;MessageBox MB_OK|MB_ICONEXCLAMATION "Query: $MYSQL_HOME\bin\mysqladmin -u root status"
+          nsExec::ExecToStack '"$MYSQL_HOME\bin\mysqladmin.exe" -u root status'
+          Pop $EXEC_RETURN_STATUS
+          Pop $EXEC_RETURN_ERROR
+          ${If} $EXEC_RETURN_STATUS != 0
+                  MessageBox MB_OK|MB_ICONEXCLAMATION "MySQL may have already been configured or is not running as expected!$\nPlease select the 'Already configured MySQL server option' and set your existing password if MySQL has already been configured!"
+                  Abort
+          ${EndIf}
+;; DEBUG
+;          ${If} $EXEC_RETURN_STATUS != 0
+;                MessageBox MB_OK|MB_ICONEXCLAMATION "The entered MySQL root password may be incorrect!$\nMySQL Reported Error: $EXEC_RETURN_ERROR!"
+;                Abort
+;          ${EndIf}
+
+  ${Endif}        
+  BringToFront
+FunctionEnd
+
+Section "Checking Mandatory Ports" 
+
+  SectionIn RO
+
+SectionEnd
+
+
+Section "Testing Mysql"
+
+  SectionIn RO
+SectionEnd
+
+SubSectionEnd
+
+
+SubSection /e "LAMS Server Install"
+
+Section "Install JBoss"
+  SectionIn RO
+
+SectionEnd
+
+Section "Install Java Service Wrapper"
+  SectionIn RO
+
+SectionEnd
+
+Section "Install LAMS"
+SectionIn RO
+AddSize 55000
+        ${If} $InstallType = ${BASIC}
+                call BasicInstallLAMS
+        ${Else}
+                call AdvancedInstallLAMS
+        ${EndIf}
+
+SectionEnd
+
+SubSectionEnd
+
+Function "BasicInstallLAMS"
+        SetOutPath "$INSTDIR"
+        SetDetailsPrint textonly
+        DetailPrint "Status: Configuring the pre-installation settings of the LAMS server."
+        SetDetailsPrint listonly
+        ;LogSet on
+        ;handle string
+
+        ClearErrors
+        FileOpen $5 "$INSTDIR\lams-package\ant\basic.properties" a
+        FileSeek $5 0 SET
+        IfErrors error
+
+        ReadRegStr $1 HKLM "SYSTEM\ControlSet001\Services\MySQL" "DisplayName"
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m MYSQL_SERVICE_NAME "$1"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+	FileWrite $5 'MYSQL_CONNECTOR_JAR_FILE=mysql-connector-java-3.1.10-bin.jar$\r$\n'
+        FileWrite $5 'MYSQL_SERVICE_NAME=$1$\r$\n'
+        
+        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        ; Adding LAMS_JBOSS_HOME to JBOSS_HOME - overwrites current setting!!!!!!!!!
+        ; Also adding to path
+
+        FileWrite $5 'LAMS_COMMUNITY_ONLINE=false$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "lams_community_online" "false"
+
+        Push $INSTDIR
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $5 'LAMS_JBOSS_HOME_WINDOWS=$R3/jboss$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "jboss_home" "$INSTDIR\jboss"
+                                                          
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m JBOSS_HOME "$INSTDIR\jboss"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+        
+        ReadEnvStr $R0 "PATH"
+
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m PATH "$R3\bin;$R0"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        SetOutPath $INSTDIR
+        File /r "..\..\LAMS\jboss"
+
+        Push $INSTDIR
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $5 'LAMS_HOME_WINDOWS=$R3/lamsdata$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "lams_upload_directory" "$INSTDIR\lamsdata"
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 15" "State"
+        FileWrite $5 'LAMS_ADMIN_USER=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "admin_user" "$R3"
+        
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 17" "State"
+        FileWrite $5 'LAMS_ADMIN_PASSWORD=$R3$\r$\n'
+        
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 13" "State"
+        FileWrite $5 'LAMS_DB_ROOT_PASSWORD=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_key" "$R3"
+                
+        FileWrite $5 'LAMS_DB_PASSWORD=$R3$\r$\n'
+        
+        FileWrite $5 'LAMS_DB_NAME=lamsone$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_dbname" "lamsone"
+
+        FileWrite $5 'LAMS_DB_USER=lams$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_user" "lams"
+                                                                  
+        FileWrite $5 'LAMS_MYSQL_HOST=localhost$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_host" "localhost"
+
+        FileWrite $5 'LAMS_JBOSS_HOST=localhost$\r$\n'
+
+        FileWrite $5 'LAMS_TOMCAT_PORT=8080$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "tomcat_port" "8080"
+
+        FileWrite $5 'LAMS_CHAT_PORT=9800$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "chat_port" "9800"
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 9" "State"
+        FileWrite $5 'LAMS_ADMIN_EMAIL_ADDRESS=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 11" "State"
+        FileWrite $5 'LAMS_SMTP_SERVER=$R3$\r$\n'
+
+        FileClose $5
+        sleep 250        
+
+        ClearErrors
+        FileOpen $4 "$INSTDIR\lams-config.bat" w
+
+        IfErrors error
+        FileWrite $4 'cd "$INSTDIR\lams-package\ant" $\r$\n'
+
+        ; Find that MYSQL Service!!!
+
+        ReadRegStr $1 HKLM "SYSTEM\ControlSet001\Services\MySQL" "DisplayName"
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m MYSQL_SERVICE_NAME "$1"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+ 
+        FileWrite $4 '"$INSTDIR\setenv.exe" -m MYSQL_SERVICE_NAME "$1"$\r$\n'
+	;FileWrite $4 '"$INSTDIR\setenv.exe" -m JAVA_HOME "$JAVA_HOME"$\r$\n'
+        
+        FileWrite $4 'set MYSQL_SERVICE_NAME=$1$\r$\n'
+        
+        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        ; Adding LAMS_JBOSS_HOME to JBOSS_HOME - overwrites current setting!!!!!!!!!
+        ; Also adding to path
+
+        FileWrite $4 'set LAMS_COMMUNITY_ONLINE=false$\r$\n'
+
+        Push $INSTDIR
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $4 'set LAMS_JBOSS_HOME_WINDOWS=$R3/jboss$\r$\n'
+                                                          
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m JBOSS_HOME "$INSTDIR\jboss"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+        
+        ReadEnvStr $R0 "PATH"
+
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m PATH "$R3\bin;$R0"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        SetOutPath $INSTDIR
+        File /r "..\..\LAMS\jboss"
+
+        Push $INSTDIR
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $4 'set LAMS_HOME_WINDOWS=$R3/lamsdata$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 15" "State"
+        FileWrite $4 'set LAMS_ADMIN_USER=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 17" "State"
+        FileWrite $4 'set LAMS_ADMIN_PASSWORD=$R3$\r$\n'
+        
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 13" "State"
+        FileWrite $4 'set LAMS_DB_ROOT_PASSWORD=$R3$\r$\n'
+        
+        FileWrite $4 'set LAMS_DB_PASSWORD=$R3$\r$\n'
+         
+        FileWrite $4 'set LAMS_DB_NAME=lamsone$\r$\n'
+
+        FileWrite $4 'set LAMS_DB_USER=lams$\r$\n'
+                                                                  
+        FileWrite $4 'set LAMS_MYSQL_HOST=localhost$\r$\n'
+
+        FileWrite $4 'set LAMS_JBOSS_HOST=localhost$\r$\n'
+
+        FileWrite $4 'set LAMS_TOMCAT_PORT=8080$\r$\n'
+
+        FileWrite $4 'set LAMS_CHAT_PORT=9800$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 9" "State"
+        FileWrite $4 'set LAMS_ADMIN_EMAIL_ADDRESS=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\quick-parameters.ini" "Field 11" "State"
+        FileWrite $4 'set LAMS_SMTP_SERVER=$R3$\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\apache-ant\bin\ant.bat" prepare-db >> "$INSTDIR\lams-config.log" 2>&1 $\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\apache-ant\bin\ant.bat" install >> "$INSTDIR\lams-config.log" 2>&1 $\r$\n'
+
+        ;;;;;;;;;;;
+        ; Adding Java Service Wrapper
+        
+        ;; Basic install users cant change jboss home"
+        
+        StrCpy $R3 "$INSTDIR\jboss"
+
+        FileWrite $4 'copy "$INSTDIR\wrapper\bin\wrapper.exe" "$R3\bin\wrapper.exe"$\r$\n'
+
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\bin\App.bat.in" "$R3\bin\JBoss.bat"$\r$\n'
+
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\bin\InstallApp-NT.bat.in" "$R3\bin\InstallLams.bat"$\r$\n'
+        
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\bin\UnInstallApp-NT.bat.in" "$R3\bin\UnInstallLams.bat"$\r$\n'
+
+        FileWrite $4 'copy "$INSTDIR\wrapper\lib\wrapper.dll" "$R3\lib\wrapper.dll"$\r$\n'
+      
+        FileWrite $4 'copy "$INSTDIR\wrapper\lib\wrapper.jar" "$R3\lib\wrapper.jar"$\r$\n'
+        
+        FileWrite $4 'mkdir $R3\conf$\r$\n'
+
+        
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\conf\wrapper.conf.in" "$R3\conf\wrapper.conf"$\r$\n'
+
+        FileWrite $4 'cd $R3\bin$\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\sc.exe" delete lams$\r$\n'
+
+        FileWrite $4 'call InstallLams.bat >> lams-config.log 2>&1$\r$\n'
+
+        FileWrite $4 '"$INSTDIR\sc.exe" start lams >> lams-config.log 2>&1$\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\cat.exe" "$INSTDIR\openlams.html" | "$INSTDIR\sed.exe" -e "s/LAMS_HOST_XYZ_PORT/LOCALHOST:8080/g" > $INSTDIR\newlams.html"$\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\cat.exe" "$INSTDIR\showlams.html" | "$INSTDIR\sed.exe" -e "s/LAMS_HOST_XYZ_PORT/LOCALHOST:8080/g" > $INSTDIR\menulams.html"$\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\cat.exe" "$INSTDIR\startlams.html" | "$INSTDIR\sed.exe" -e "s/LAMS_HOST_XYZ_PORT/LOCALHOST:8080/g" > $INSTDIR\servicelams.html"$\r$\n'
+
+
+        FileWrite $4 'REM Add -d and run again for debugging'
+
+        FileClose $4
+        sleep 250
+
+        SetDetailsPrint textonly
+        DetailPrint "Status: Configuring JBoss and installing the LAMS binary packages."
+        SetDetailsPrint listonly
+        ;LogSet on
+
+        nsExec::ExecToStack '$INSTDIR\lams-config.bat'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+        SetDetailsPrint textonly
+        DetailPrint "Status: Installing the LAMS Windows service to work in Manual mode."
+        sleep 5000  ; Lets wait a little while LAMS starts
+        DetailPrint "Status: For 24/7 production servers please change your LAMS Windows service to Automatic."
+        sleep 5000  ; Lets wait a little while LAMS starts
+        SetDetailsPrint listonly
+        ;LogSet on
+
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "install_status" "successful"
+        call InstallStartMenu
+        goto done
+        error:
+                MessageBox MB_OK "Error: Cannot open the LAMS configuration script file. Installation has failed!"
+                Quit
+        done:   
+                BringToFront
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Advanced Install
+
+
+Function "AdvancedInstallLAMS"
+        SetOutPath "$INSTDIR"
+        SetDetailsPrint textonly
+        DetailPrint "Status: Configuring the pre-installation settings of the LAMS server."
+        SetDetailsPrint listonly
+        ;LogSet on
+        ;handle string
+
+        ClearErrors
+        FileOpen $5 "$INSTDIR\lams-package\ant\basic.properties" a
+        FileSeek $5 0 SET
+        IfErrors error
+        FileWrite $5 '"$INSTDIR\setenv.exe" -m MYSQL_SERVICE_NAME "$1"$\r$\n'
+
+        FileWrite $5 'MYSQL_SERVICE_NAME=$1$\r$\n'
+ 
+        FileWrite $5 'LAMS_COMMUNITY_ONLINE=false$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "lams_community_online" "$R3"
+
+        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        ; Adding LAMS_JBOSS_HOME to JBOSS_HOME - overwrites current setting!!!!!!!!!
+        ; Also adding to path
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 3" "State"
+        ; fix the path if needed
+        Push $R3
+        call FixPath
+        Pop $R3
+
+        ; fiddle with the path just for LAMS
+        Push $R3
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $5 'LAMS_JBOSS_HOME_WINDOWS=$R3$\r$\n'
+                                                                        
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 5" "State"
+        Push $R3
+        call FixPath
+        Pop $R3
+
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "lams_upload_directory" "$R3"
+        Push $R3
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $5 'LAMS_HOME_WINDOWS=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 7" "State"
+        FileWrite $5 'LAMS_ADMIN_USER=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "admin_user" "$R3"
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 9" "State"
+        FileWrite $5 'LAMS_ADMIN_PASSWORD=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 9" "State"
+        FileWrite $5 'LAMS_DB_ROOT_PASSWORD=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_key" "$R3"        
+	
+	FileWrite $5 'MYSQL_CONNECTOR_JAR_FILE=mysql-connector-java-3.1.10-bin.jar$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 5" "State"
+        FileWrite $5 'LAMS_DB_NAME=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_dbname" "$R3"
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 7" "State"
+        FileWrite $5 'LAMS_DB_USER=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_user" "$R3"
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 11" "State"
+        FileWrite $5 'LAMS_DB_PASSWORD=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 13" "State"
+        FileWrite $5 'LAMS_MYSQL_HOST=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "mysql_host" "$R3"
+
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 8" "State"
+        FileWrite $5 'LAMS_JBOSS_HOST=$R3$\r$\n'
+        StrCpy $R5 $R3
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 11" "State"
+        FileWrite $5 'LAMS_TOMCAT_PORT=$R3$\r$\n'
+        StrCpy $R6 $R3
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "tomcat_port" "$R3"
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 13" "State"
+        FileWrite $5 'LAMS_CHAT_PORT=$R3$\r$\n'
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "chat_port" "$R3"
+
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 12" "State"
+        FileWrite $5 'LAMS_EMAIL_ADDRESS=$R3$\r$\n'
+
+        ; XXX
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 14" "State"
+        FileWrite $5 'LAMS_SMTP_SERVER=$R3$\r$\n'     
+
+        FileClose $5
+        sleep 250
+
+        ClearErrors
+        FileOpen $4 "$INSTDIR\lams-config.bat" w
+        IfErrors error
+        FileWrite $4 'cd "$INSTDIR\lams-package\ant" $\r$\n'
+
+        ; Find that MYSQL Service!!!
+
+        ReadRegStr $1 HKLM "SYSTEM\ControlSet001\Services\MySQL" "DisplayName"
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m MYSQL_SERVICE_NAME "$1"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        FileWrite $4 '"$INSTDIR\setenv.exe" -m MYSQL_SERVICE_NAME "$1"$\r$\n'
+	;FileWrite $4 '"$INSTDIR\setenv.exe" -m JAVA_HOME "$JAVA_HOME"$\r$\n'
+
+        FileWrite $4 'set MYSQL_SERVICE_NAME=$1$\r$\n'
+ 
+        FileWrite $4 'set LAMS_COMMUNITY_ONLINE=false$\r$\n'
+
+        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+        ; Adding LAMS_JBOSS_HOME to JBOSS_HOME - overwrites current setting!!!!!!!!!
+        ; Also adding to path
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 3" "State"
+        ; fix the path if needed
+        Push $R3
+        call FixPath
+        Pop $R3
+
+        ${If} $R3 != "$INSTDIR\jboss"
+                ;MessageBox MB_OK '"$INSTDIR\move.bat "$INSTDIR\jboss" "$R3"'
+                DetailPrint '"$INSTDIR\move.bat" "$INSTDIR\jboss" "$R3"'
+                nsExec::ExecToStack '"$INSTDIR\move.bat" "$INSTDIR\jboss" "$R3"'
+                Pop $EXEC_RETURN_STATUS
+                Pop $EXEC_RETURN_ERROR
+                DetailPrint '$EXEC_RETURN_ERROR'
+                ;MessageBox MB_OK 'Status: $EXEC_RETURN_STATUS'
+        ${EndIf}
+
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "jboss_home" "$R3"
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m JBOSS_HOME "$R3"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+        ReadEnvStr $R0 "PATH"
+
+        ; fiddle with the path just for LAMS
+        Push $R3
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $4 'set LAMS_JBOSS_HOME_WINDOWS=$R3$\r$\n'                                                                        
+
+        nsExec::ExecToStack '"$INSTDIR\setenv" -m PATH "$R3\bin;$R0"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        SetOutPath $INSTDIR
+        File /r "..\..\LAMS\jboss"
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 5" "State"
+        Push $R3
+        call FixPath
+        Pop $R3
+
+        Push $R3
+        Call ConvertBStoFS
+        Pop $R3
+        FileWrite $4 'set LAMS_HOME_WINDOWS=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 7" "State"
+        FileWrite $4 'set LAMS_ADMIN_USER=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 9" "State"
+        FileWrite $4 'set LAMS_ADMIN_PASSWORD=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 9" "State"
+        FileWrite $4 'set LAMS_DB_ROOT_PASSWORD=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 5" "State"
+        FileWrite $4 'set LAMS_DB_NAME=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 7" "State"
+        FileWrite $4 'set LAMS_DB_USER=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 11" "State"
+        FileWrite $4 'set LAMS_DB_PASSWORD=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\mysql-parameters.ini" "Field 13" "State"
+        FileWrite $4 'set LAMS_MYSQL_HOST=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 8" "State"
+        FileWrite $4 'set LAMS_JBOSS_HOST=$R3$\r$\n'
+        StrCpy $R5 $R3
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 11" "State"
+        FileWrite $4 'set LAMS_TOMCAT_PORT=$R3$\r$\n'
+        StrCpy $R6 $R3
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 13" "State"
+        FileWrite $4 'set LAMS_CHAT_PORT=$R3$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 15" "State"
+
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 12" "State"
+        FileWrite $4 'set LAMS_EMAIL_ADDRESS=$R3$\r$\n'
+
+        ; XXX
+        ReadINIStr $R3 "$PLUGINSDIR\server-parameters.ini" "Field 14" "State"
+        FileWrite $4 'set LAMS_SMTP_SERVER=$R3$\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\apache-ant\bin\ant.bat" prepare-db >> "$INSTDIR\lams-config.log" 2>&1 $\r$\n'
+
+        FileWrite $4 'call "$INSTDIR\apache-ant\bin\ant.bat" install >> "$INSTDIR\lams-config.log" 2>&1 $\r$\n'
+
+
+        ;;;;;;;;;;;
+        ; Adding Java Service Wrapper
+
+
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 3" "State"
+
+        FileWrite $4 'copy "$INSTDIR\wrapper\bin\wrapper.exe" "$R3\bin\wrapper.exe"$\r$\n'
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\bin\App.bat.in" "$R3\bin\JBoss.bat"$\r$\n'
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\bin\InstallApp-NT.bat.in" "$R3\bin\InstallLams.bat"$\r$\n'
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\bin\UnInstallApp-NT.bat.in" "$R3\bin\UnInstallLams.bat"$\r$\n'
+        FileWrite $4 'copy "$INSTDIR\wrapper\lib\wrapper.dll" "$R3\lib\wrapper.dll"$\r$\n'
+        FileWrite $4 'copy "$INSTDIR\wrapper\lib\wrapper.jar" "$R3\lib\wrapper.jar"$\r$\n'
+        FileWrite $4 'mkdir $R3\conf$\r$\n'
+        FileWrite $4 'copy "$INSTDIR\wrapper\src\conf\wrapper.conf.in" "$R3\conf\wrapper.conf"$\r$\n'
+        FileWrite $4 'cd $R3\bin$\r$\n'
+        FileWrite $4 'REM call UnInstallLams.bat$\r$\n'
+        FileWrite $4 'call InstallLams.bat >> lams-config.log 2>&1$\r$\n'
+        FileWrite $4 '"$INSTDIR\sc.exe" start lams >> lams-config.log 2>&1$\r$\n'
+
+        ReadINIStr $R3 "$PLUGINSDIR\lams-parameters.ini" "Field 11" "State"
+        FileWrite $4 'call "$INSTDIR\cat.exe" "$INSTDIR\openlams.html" | "$INSTDIR\sed.exe" -e "s/LAMS_HOST_XYZ_PORT/LOCALHOST:$R3/g" > $INSTDIR\newlams.html"$\r$\n'
+        FileWrite $4 'call "$INSTDIR\cat.exe" "$INSTDIR\showlams.html" | "$INSTDIR\sed.exe" -e "s/LAMS_HOST_XYZ_PORT/LOCALHOST:$R3/g" > $INSTDIR\menulams.html"$\r$\n'
+        FileWrite $4 'call "$INSTDIR\cat.exe" "$INSTDIR\startlams.html" | "$INSTDIR\sed.exe" -e "s/LAMS_HOST_XYZ_PORT/LOCALHOST:$R3/g" > $INSTDIR\servicelams.html"$\r$\n'
+        FileWrite $4 'REM Add -d and run again for debugging'
+        FileClose $4
+        sleep 250
+
+        SetDetailsPrint textonly
+        DetailPrint "Status: Configuring JBoss and installing the LAMS binary packages."
+        SetDetailsPrint listonly
+
+        nsExec::ExecToStack '$INSTDIR\lams-config.bat'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+
+        SetDetailsPrint textonly
+        DetailPrint "Status: Installing the LAMS Windows service to work in Manual mode."
+        sleep 5000  ; Lets wait a little while LAMS starts
+        DetailPrint "Status: For 24/7 production servers please change your LAMS Windows service to Automatic."
+        sleep 5000  ; Lets wait a little while LAMS starts
+        SetDetailsPrint listonly 
+
+
+        WriteRegStr HKLM SOFTWARE\LAMS\Server "install_status" "successful"
+        call InstallStartMenu
+	goto done
+
+        error:
+                MessageBox MB_OK "Error: Cannot open the LAMS configuration script file. Installation has failed!"
+                Quit
+        done:
+                BringToFront
+
+
+FunctionEnd
+
+;--------------------------------
+
+Function "OpenLAMSConsole"
+SetOutPath "$INSTDIR"
+SetDetailsPrint listonly
+;LogSet on
+;MessageBox MB_OK "Opening the LAMS Login Console in your browser window!"
+;ExecShell "open" '"$INSTDIR"'
+ExecShell "open" '"$INSTDIR\newlams.html"'
+BringToFront
+
+FunctionEnd
+
+Function "InstallStartMenu"
+  SetOutPath "$INSTDIR"
+  SetDetailsPrint listonly
+  ;LogSet on
+  CreateDirectory "$SMPROGRAMS\LAMS"
+  SetOutPath $INSTDIR ; for working directory
+  ; this one will use notepad's icon, start it minimized, and give it a hotkey (of Ctrl+Shift+Q)
+  Delete "$SMPROGRAMS\LAMS\Uninstall LAMS.lnk"
+  Delete "$SMPROGRAMS\LAMS\Stop LAMS Server.lnk"
+  Delete "$SMPROGRAMS\LAMS\Start LAMS Server.lnk"
+  Delete "$SMPROGRAMS\LAMS\Update LAMS Server.lnk"
+  Delete "$SMPROGRAMS\LAMS\LAMS Server Login Page.lnk"
+  CreateShortCut "$SMPROGRAMS\LAMS\LAMS Server Login Page.lnk" "$INSTDIR\menulams.html" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+  CreateShortCut "$SMPROGRAMS\LAMS\Start LAMS Server.lnk" "$INSTDIR\start-lams.exe" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+  CreateShortCut "$SMPROGRAMS\LAMS\Stop LAMS Server.lnk" "$INSTDIR\stop-lams.exe" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+  CreateShortCut "$SMPROGRAMS\LAMS\Update LAMS Server.lnk" "$INSTDIR\update-lams.exe" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+  CreateShortCut "$SMPROGRAMS\LAMS\Uninstall LAMS.lnk" "$INSTDIR\uninstall-lams.exe" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+  CreateShortCut "$DESKTOP\Start LAMS Server.lnk" "$INSTDIR\start-lams.exe" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+  CreateShortCut "$DESKTOP\LAMS Server Login Page.lnk" "$INSTDIR\menulams.html" "..\..\LAMS\lams2.ico"; use defaults for parameters, icon, etc.
+FunctionEnd
+
+
+;--------------------------------
+
+; Uninstaller
+
+UninstallText "The LAMS Server will be uninstalled. Click next to continue."
+;UninstallIcon "..\..\LAMS\logo.ico"
+
+Section "Uninstall"
+
+  nsExec::ExecToStack '"$INSTDIR\sc.exe" stop lams'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  ;MessageBox MB_OK "Removing JBoss at $1"
+  ReadRegStr $1 HKLM SOFTWARE\LAMS\Server "jboss_home"
+
+  nsExec::ExecToStack '"$1\bin\UnInstallLams.bat"'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  ${If} $1 != ""
+        Delete "$1\*.*"
+        RMDir /r "$1"
+  ${EndIf}
+
+  ;; gets ride of all the environment variables that we set
+
+  nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m JAVA_HOME -delete'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m MYSQL_SERVICE_NAME -delete'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  nsExec::ExecToStack '"$INSTDIR\setenv.exe" -m JBOSS_HOME -delete'
+  Pop $EXEC_RETURN_STATUS
+  Pop $EXEC_RETURN_ERROR
+
+  ReadRegStr $1 HKLM SOFTWARE\LAMS\Server "lams_upload_directory"
+  ;MessageBox MB_OK "Removing LAMS uploads at $1"
+  ${If} $1 != ""
+        DetailPrint "Moving the lams upload directory $1 to $TEMP\$1"
+        sleep 250
+        nsExec::ExecToStack '"$INSTDIR\move.bat" "$1" "$TEMP\$1"'
+        Pop $EXEC_RETURN_STATUS
+        Pop $EXEC_RETURN_ERROR
+        DetailPrint '$EXEC_RETURN_ERROR'
+  ${EndIf}
+  
+  Delete "$INSTDIR\apache-ant"
+  Delete "$INSTDIR\wrapper"
+  Delete "$INSTDIR\lams-package"
+  Delete "$INSTDIR\LocalPortScanner.class"
+  Delete "$INSTDIR\CallOS.class"
+  Delete "$INSTDIR\sed.exe"
+  Delete "$INSTDIR\setenv.exe"
+  Delete "$INSTDIR\cat.exe"
+  Delete "$INSTDIR\openlams.html"
+  Delete "$INSTDIR\openlams_files"
+  Delete "$INSTDIR\*.*"
+  Delete "$SMPROGRAMS\LAMS\Uninstall LAMS.lnk"
+  Delete "$SMPROGRAMS\LAMS\Stop LAMS Server.lnk"
+  Delete "$SMPROGRAMS\LAMS\Start LAMS Server.lnk"
+  Delete "$SMPROGRAMS\LAMS\Update LAMS Server.lnk"
+  Delete "$SMPROGRAMS\LAMS\LAMS Server Login Page.lnk"
+  Delete "$DESKTOP\LAMS Server Login Page.lnk"
+  Delete "$SMPROGRAMS\LAMS\*Server*.lnk"
+  Delete "$DESKTOP\Start LAMS Server.lnk"
+;;  Delete "$SMPROGRAMS\LAMS"
+  RMDir /r "$INSTDIR"
+
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LAMS Server"
+  DeleteRegKey HKLM "SOFTWARE\LAMS\Server"
+  WriteRegStr HKLM SOFTWARE\LAMS\Server "install_status" "uninstalled"
+
+;DeleteRegKey HKLM "SOFTWARE\LAMS"
+;; This needs to be fixed?
+
+
+SectionEnd
+
+Function CheckINSTDIR
+        SetOutPath "$INSTDIR"
+        StrCpy $1 "Error: The selected installaton directory has a space/s.$\nPlease remove all spaces."
+        Push $1
+        Push $INSTDIR
+        call CheckForSpaces
+FunctionEnd        
+
+
+Function CheckForSpaces
+ Pop $0
+ Pop $1
+ Push $R1
+ Push $R2
+ Push $R3
+ Push $R4
+ StrCpy $R1 -1
+ StrCpy $R3 0
+ loop:
+   StrCpy $R2 $0 1 $R1
+   IntOp $R1 $R1 - 1
+   StrCmp $R2 "" done
+   StrCmp $R2 " " found
+   StrCpy $R4 "$R2$R4"
+ Goto loop
+ found:
+   IntOp $R3 $R3 + 1
+ Goto loop
+ done:
+   StrCmp $R3 0 +3
+   MessageBox MB_OK|MB_ICONEXCLAMATION "$1"
+   Abort
+ Pop $R4
+ Pop $R3
+ Pop $R2
+ Pop $R1
+FunctionEnd
+
+Function GetNextIp
+  Exch $0
+  Push $1
+  Push $2
+  Strcpy $2 0             ; Counter
+  Loop:
+    IntOp $2 $2 + 1
+    StrCpy $1 $0 1 $2
+    StrCmp $1 '' ExitLoop
+    StrCmp $1 ';' '' Loop
+    StrCpy $1 $0 $2       ; IP-address
+    IntOp $2 $2 + 1
+    StrCpy $0 $0 '' $2    ; Remaining string
+  ExitLoop:
+  Pop $2
+  Push $0
+  Exch $2
+  Pop $0
+  Exch $1
+FunctionEnd
+
+Function ConvertBStoFS
+ Exch $R0 ;input string
+ Push $R1
+ Push $R2
+ StrCpy $R1 0
+loop:
+  IntOp $R1 $R1 - 1
+  StrCpy $R2 $R0 1 $R1
+  StrCmp $R2 "" done
+ StrCmp $R2 "\" 0 loop
+  StrCpy $R2 $R0 $R1 ;part before
+   Push $R1
+  IntOp $R1 $R1 + 1
+  StrCpy $R1 $R0 "" $R1 ;part after
+ StrCpy $R0 "$R2/$R1"
+   Pop $R1
+  IntOp $R1 $R1 - 1
+Goto loop
+done:
+   Pop $R2
+   Pop $R1
+   Exch $R0 ;output string
+FunctionEnd
+
+
+Function .onSelChange
+
+
+;;;;;;;;;;;;;;;;;;;;
+;; Commented out the selection change code as MYSQL and JDK no longer run in the code
+
+;  SectionGetText ${JDKIDX} $0
+;  SectionGetFlags ${JDKIDX} $1
+;  !insertmacro SectionFlagIsSet ${JDKIDX} ${SF_SELECTED} "" e
+;  ${If} $JDKFlag = 2
+;        goto e2
+;  ${EndIf}
+;        StrCpy $JDKFlag 0
+;        SectionSetText ${JDKIDX} "Launch JDK Installer"
+;
+;  goto e2
+;  e:
+;  StrCpy $JDKFlag 1
+;  SectionSetText ${JDKIDX} "Skip JDK Installer"
+;  e2:
+;  
+;  SectionGetText ${MYSQLIDX} $0
+;  SectionGetFlags ${MYSQLIDX} $1
+;  ${If} $MysqlFlag = 2
+;        goto e4
+;  ${EndIf}
+; !insertmacro SectionFlagIsSet ${MYSQLIDX} ${SF_SELECTED} "" e3
+; StrCpy $MysqlFlag 0
+;  SectionSetText ${MYSQLIDX} "Launch MySQL Installer"
+;  goto e4
+;  e3:
+;  StrCpy $MysqlFlag 1
+;  SectionSetText ${MYSQLIDX} "Skip MySQL Installer"
+;  e4:
+
+FunctionEnd
+
+ ; GetParent
+ ; input, top of stack  (e.g. C:\Program Files\Poop)
+ ; output, top of stack (replaces, with e.g. C:\Program Files)
+ ; modifies no other variables.
+ ;
+ ; Usage:
+ ;   Push "C:\Program Files\Directory\Whatever"
+ ;   Call GetParent
+ ;   Pop $R0
+ ;   ; at this point $R0 will equal "C:\Program Files\Directory"
+
+ Function GetParent
+ 
+   Exch $R0
+   Push $R1
+   Push $R2
+   Push $R3
+   
+   StrCpy $R1 0
+   StrLen $R2 $R0
+   
+   loop:
+     IntOp $R1 $R1 + 1
+     IntCmp $R1 $R2 get 0 get
+     StrCpy $R3 $R0 1 -$R1
+     StrCmp $R3 "\" get
+     Goto loop
+   
+   get:
+     StrCpy $R0 $R0 -$R1
+     
+     Pop $R3
+     Pop $R2
+     Pop $R1
+     Exch $R0
+     
+ FunctionEnd
Index: win_installer/src/LocalPortScanner.java
===================================================================
diff -u
--- win_installer/src/LocalPortScanner.java	(revision 0)
+++ win_installer/src/LocalPortScanner.java	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,38 @@
+/* 
+**	Scans the local computer ports
+**	
+**	Coded by C.K Nimmagadda
+**	Copyright 2005 (c) LAMS International
+**	
+*/
+
+import java.net.*;
+import java.io.*;
+ 
+public class LocalPortScanner {
+ 
+  public static void main(String[] args) {
+
+	int current = 0;
+      for (int i = 0; i < args.length; i++) {
+      try {
+        ServerSocket server = new ServerSocket(Integer.parseInt(args[i]));
+      }
+      catch (IOException e) {
+        if (current < 2)
+	{
+		System.out.print("Warning: There is a server already on port " + args[i] + " ");
+	}
+	else
+	{
+		System.out.print(args[i] + " ");
+	}
+        current = current+2;
+      }
+      }
+	System.out.println(".");
+	System.exit(current);
+
+  }
+
+}
Index: win_installer/src/build.xml
===================================================================
diff -u
--- win_installer/src/build.xml	(revision 0)
+++ win_installer/src/build.xml	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="configure-lams" basedir=".">
+	
+	<property file="installer.properties" />
+
+	<target name="configure-deploy">
+		<copy overwrite="yes" todir="${LAMS_CONF}">
+			<fileset dir="${TEMP}">
+				<include name="lams.xml" />
+			</fileset>
+			<filterset>
+				<filter token="URL" value="${URL}" />
+				<filter token="INSTDIR" value="${INSTDIR}" />
+				<filter token="TEMPDIR" value="${TEMPDIR}" />
+				<filter token="DUMPDIR" value="${DUMPDIR}" />
+				<filter token="EARDIR" value="${EARDIR}" />
+				<filter token="REPOSITORYDIR" value="${REPOSITORYDIR}" />
+				<filter token="LOCALE" value="${LOCALE}" />
+				<filter token="LOCALE_DIRECTION" value="${LOCALE_DIRECTION}" />
+				<filter token="WILDFIRE_DOMAIN" value="${WILDFIRE_DOMAIN}" />
+				<filter token="WILDFIRE_CONFERENCE" value="${WILDFIRE_CONFERENCE}" />
+				<filter token="WILDFIRE_USER" value="${WILDFIRE_USER}" />
+				<filter token="WILDFIRE_PASS" value="${WILDFIRE_PASS}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${DEPLOYDIR}">
+			<fileset dir="${TEMP}">
+				<include name="mysql-ds.xml" />
+			</fileset>
+			<filterset>
+				<filter token="DB_NAME" value="${DB_NAME}" />
+				<filter token="DB_USER" value="${DB_USER}" />
+				<filter token="DB_PASS" value="${DB_PASS}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${TOMCATDIR}">
+			<fileset dir="${TEMP}">
+				<include name="server.xml" />
+			</fileset>
+			<filterset>
+				<filter token="LAMS_PORT" value="${LAMS_PORT}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${BINDIR}">
+			<fileset dir="${TEMP}">
+				<include name="run.bat" />
+			</fileset>
+			<filterset>
+				<filter token="JAVA_HOME" value="${JDK_DIR}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${INSTDIR}">
+			<fileset dir="${TEMP}">
+				<include name="wrapper.conf" />
+			</fileset>
+			<filterset>
+				<filter token="JAVA_HOME" value="${JDK_DIR_UNIX_SLASH}" />
+			</filterset>
+		</copy>
+	</target>
+	
+	<target name="import-db">
+		<sql driver="com.mysql.jdbc.Driver" 
+			classpath="${EARDIR}/mysql-connector-java-3.1.12-bin.jar" 
+			url="jdbc:mysql://localhost/${DB_NAME}?characterEncoding=UTF-8" 
+			userid="${DB_USER}" 
+			password="${DB_PASS}">
+			<transaction src="${TEMP}/dump.sql" />
+		</sql>
+	</target>
+	
+</project>
\ No newline at end of file
Index: win_installer/src/installer.nsi
===================================================================
diff -u
--- win_installer/src/installer.nsi	(revision 0)
+++ win_installer/src/installer.nsi	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,825 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+
+/*
+ * TODO: uninstaller option to keep database/lams.xml/repository
+ *
+ *
+ */
+
+# includes
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+
+# constants
+!define VERSION "2.0 RC1"
+!define SOURCE_JBOSS_HOME "D:\jboss-4.0.2"  ; location of jboss and lamsconf where lams was built
+!define SOURCE_LAMS_CONF "C:\lamsconf"
+!define REG_HEAD "Software\LAMS Foundation\LAMSv2"
+
+# installer variables
+!define MUI_ICON "..\graphics\lams2.ico"
+!define MUI_UNICON "..\graphics\lams2.ico"
+Name "LAMS ${VERSION}"
+;BrandingText "LAMS Foundation"
+OutFile "..\build\LAMS-${VERSION}.exe"
+InstallDir "C:\lams"
+InstallDirRegKey HKLM "${REG_HEAD}" ""
+
+# set installer header image
+;!define MUI_HEADERIMAGE
+;!define MUI_HEADERIMAGE_BITMAP "..\graphics\header.bmp"
+;!define MUI_HEADERIMAGE_RIGHT ; will switch to left side when using a RTL language
+
+# set warning when cancelling install
+!define MUI_ABORTWARNING
+
+# set welcome page
+!define MUI_WELCOMEPAGE_TITLE "LAMS ${VERSION} Installer"
+
+# set components page type
+;!define MUI_COMPONENTSPAGE_NODESC
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+# set instfiles page to wait when done
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+# installer screen progression
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "..\license.txt"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+Page custom PreMySQLConfig PostMySQLConfig
+Page custom PreLAMSConfig PostLAMSConfig
+Page custom PreWildfireConfig PostWildfireConfig
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+# uninstaller screens
+!insertmacro MUI_UNPAGE_WELCOME
+UninstPage custom un.PreUninstall un.PostUninstall
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+
+# supported translations
+  !insertmacro MUI_LANGUAGE "English" # first language is the default language
+  !insertmacro MUI_LANGUAGE "French"
+  !insertmacro MUI_LANGUAGE "German"
+  !insertmacro MUI_LANGUAGE "Spanish"
+  !insertmacro MUI_LANGUAGE "SimpChinese"
+  !insertmacro MUI_LANGUAGE "Korean"
+  !insertmacro MUI_LANGUAGE "Italian"
+  !insertmacro MUI_LANGUAGE "Dutch"
+  !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro MUI_LANGUAGE "Norwegian"
+  !insertmacro MUI_LANGUAGE "NorwegianNynorsk"  
+  !insertmacro MUI_LANGUAGE "Portuguese"
+  !insertmacro MUI_LANGUAGE "PortugueseBR"
+  !insertmacro MUI_LANGUAGE "Greek"
+  !insertmacro MUI_LANGUAGE "Russian"
+  !insertmacro MUI_LANGUAGE "Polish"
+  !insertmacro MUI_LANGUAGE "Bulgarian"  
+  !insertmacro MUI_LANGUAGE "Thai"
+  !insertmacro MUI_LANGUAGE "Arabic"
+/*
+  !insertmacro MUI_LANGUAGE "TradChinese"
+  !insertmacro MUI_LANGUAGE "Japanese"
+  !insertmacro MUI_LANGUAGE "Swedish"
+  !insertmacro MUI_LANGUAGE "Finnish"
+  !insertmacro MUI_LANGUAGE "Ukrainian"
+  !insertmacro MUI_LANGUAGE "Czech"
+  !insertmacro MUI_LANGUAGE "Slovak"
+  !insertmacro MUI_LANGUAGE "Croatian"
+  !insertmacro MUI_LANGUAGE "Hungarian"
+  !insertmacro MUI_LANGUAGE "Romanian"
+  !insertmacro MUI_LANGUAGE "Latvian"
+  !insertmacro MUI_LANGUAGE "Macedonian"
+  !insertmacro MUI_LANGUAGE "Estonian"
+  !insertmacro MUI_LANGUAGE "Turkish"
+  !insertmacro MUI_LANGUAGE "Lithuanian"
+  !insertmacro MUI_LANGUAGE "Catalan"
+  !insertmacro MUI_LANGUAGE "Slovenian"
+  !insertmacro MUI_LANGUAGE "Serbian"
+  !insertmacro MUI_LANGUAGE "SerbianLatin"
+  !insertmacro MUI_LANGUAGE "Farsi"
+  !insertmacro MUI_LANGUAGE "Hebrew"
+  !insertmacro MUI_LANGUAGE "Indonesian"
+  !insertmacro MUI_LANGUAGE "Mongolian"
+  !insertmacro MUI_LANGUAGE "Luxembourgish"
+  !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Breton"
+  !insertmacro MUI_LANGUAGE "Belarusian"
+  !insertmacro MUI_LANGUAGE "Icelandic"
+  !insertmacro MUI_LANGUAGE "Malay"
+  !insertmacro MUI_LANGUAGE "Bosnian"
+  !insertmacro MUI_LANGUAGE "Kurdish"
+  !insertmacro MUI_LANGUAGE "Irish"
+*/
+
+
+# reserve files
+#
+ReserveFile "lams.ini"
+ReserveFile "mysql.ini"
+ReserveFile "wildfire.ini"
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+
+# variables
+#
+Var MYSQL_DIR
+Var MYSQL_ROOT_PASS
+Var DB_NAME
+Var DB_USER
+Var DB_PASS
+Var JDK_DIR
+Var LAMS_DOMAIN
+Var LAMS_PORT
+Var LAMS_LOCALE
+Var LAMS_REPOSITORY
+Var LAMS_CONF
+Var WILDFIRE_DOMAIN
+Var WILDFIRE_USER
+Var WILDFIRE_PASS
+
+
+# functions
+#
+
+# http://nsis.sourceforge.net/Another_String_Replace_%28and_Slash/BackSlash_Converter%29
+#
+; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
+; Push "\"
+; Call StrSlash
+; Pop $R0
+; ;Now $R0 contains 'c:/this/and/that/filename.htm'
+Function StrSlash
+  Exch $R3 ; $R3 = needle ("\" or "/")
+  Exch
+  Exch $R1 ; $R1 = String to replacement in (haystack)
+  Push $R2 ; Replaced haystack
+  Push $R4 ; $R4 = not $R3 ("/" or "\")
+  Push $R6
+  Push $R7 ; Scratch reg
+  StrCpy $R2 ""
+  StrLen $R6 $R1
+  StrCpy $R4 "\"
+  StrCmp $R3 "/" loop
+  StrCpy $R4 "/"  
+loop:
+  StrCpy $R7 $R1 1
+  StrCpy $R1 $R1 $R6 1
+  StrCmp $R7 $R3 found
+  StrCpy $R2 "$R2$R7"
+  StrCmp $R1 "" done loop
+found:
+  StrCpy $R2 "$R2$R4"
+  StrCmp $R1 "" done loop
+done:
+  StrCpy $R3 $R2
+  Pop $R7
+  Pop $R6
+  Pop $R4
+  Pop $R2
+  Pop $R1
+  Exch $R3
+FunctionEnd
+
+
+# http://nsis.sourceforge.net/StrStr
+#
+!define StrStr "!insertmacro StrStr"
+ 
+!macro StrStr ResultVar String SubString
+  Push `${String}`
+  Push `${SubString}`
+  Call StrStr
+  Pop `${ResultVar}`
+!macroend
+ 
+Function StrStr
+/*After this point:
+  ------------------------------------------
+  $R0 = SubString (input)
+  $R1 = String (input)
+  $R2 = SubStringLen (temp)
+  $R3 = StrLen (temp)
+  $R4 = StartCharPos (temp)
+  $R5 = TempStr (temp)*/
+ 
+  ;Get input from user
+  Exch $R0
+  Exch
+  Exch $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+ 
+  ;Get "String" and "SubString" length
+  StrLen $R2 $R0
+  StrLen $R3 $R1
+  ;Start "StartCharPos" counter
+  StrCpy $R4 0
+ 
+  ;Loop until "SubString" is found or "String" reaches its end
+  ${Do}
+    ;Remove everything before and after the searched part ("TempStr")
+    StrCpy $R5 $R1 $R2 $R4
+ 
+    ;Compare "TempStr" with "SubString"
+    ${IfThen} $R5 == $R0 ${|} ${ExitDo} ${|}
+    ;If not "SubString", this could be "String"'s end
+    ${IfThen} $R4 >= $R3 ${|} ${ExitDo} ${|}
+    ;If not, continue the loop
+    IntOp $R4 $R4 + 1
+  ${Loop}
+ 
+/*After this point:
+  ------------------------------------------
+  $R0 = ResultVar (output)*/
+ 
+  ;Remove part before "SubString" on "String" (if there has one)
+  StrCpy $R0 $R1 `` $R4
+ 
+  ;Return output to user
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+
+Function .onInit
+    # select language
+    !insertmacro MUI_LANGDLL_DISPLAY
+    
+    # extract custom page display config
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "mysql.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "wildfire.ini"
+FunctionEnd
+
+
+Function CheckJava
+    # check for JDK
+    ReadRegStr $JDK_DIR HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.5" "JavaHome"
+    ;MessageBox MB_OK|MB_ICONSTOP "$JDK_DIR"
+    ${If} $JDK_DIR == ""
+        MessageBox MB_OK|MB_ICONSTOP "Could not find a Java JDK 1.5 installation.  Please ensure you have JDK 1.5 installed."
+    ${EndIf}
+FunctionEnd
+
+
+Function CheckMySQL    
+    # check for MySQL
+    ReadRegStr $MYSQL_DIR HKLM "SOFTWARE\MySQL AB\MySQL Server 5.0" "Location"
+    ${If} $MYSQL_DIR == ""
+        ReadRegStr $MYSQL_DIR HKLM "SOFTWARE\MySQL AB\MySQL Server 5.1" "Location"
+        ${If} $MYSQL_DIR == ""
+            MessageBox MB_OK|MB_ICONSTOP "Could not find a MySQL installation.  Please ensure you have MySQL 5.0 or 5.1 installed."
+        ${EndIf}
+    ${EndIf}
+FunctionEnd
+
+
+Function PreMySQLConfig
+    Call CheckMySQL
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "mysql.ini" "Field 3" "State" "$MYSQL_DIR"
+    !insertmacro MUI_HEADER_TEXT "Setting Up MySQL Database Access" "Choose a MySQL database and user account for LAMS.  If unsure, use the default."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "mysql.ini"
+FunctionEnd
+
+
+Function PostMySQLConfig
+    !insertmacro MUI_INSTALLOPTIONS_READ $MYSQL_DIR "mysql.ini" "Field 3" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $MYSQL_ROOT_PASS "mysql.ini" "Field 5" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $DB_NAME "mysql.ini" "Field 7" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $DB_USER "mysql.ini" "Field 9" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $DB_PASS "mysql.ini" "Field 10" "State"
+    
+    # check mysql version is 5.0.x
+    nsExec::ExecToStack '$MYSQL_DIR\bin\mysqladmin --version'
+    Pop $0
+    Pop $1
+    ${StrStr} $0 $1 "5.0"
+    ${If} $0 == "" ; if not 5.0.x, check 5.1.x
+        nsExec::ExecToStack '$MYSQL_DIR\bin\mysqladmin --version'
+        Pop $2
+        Pop $3
+        ${StrStr} $2 $3 "5.1"
+        ${If} $2 == ""
+            MessageBox MB_OK|MB_ICONSTOP "Your MySQL version does not appear to be compatible with LAMS (5.0.x or 5.1.x): $\r$\n$\r$\n$1"
+        ${EndIf}
+    ${EndIf}
+    
+    # check mysql is running
+    StrLen $0 $MYSQL_ROOT_PASS
+    ${If} $0 == 0
+        nsExec::ExecToStack '$MYSQL_DIR\bin\mysqladmin ping -u root'
+    ${Else}
+        nsExec::ExecToStack '$MYSQL_DIR\bin\mysqladmin ping -u root -p$MYSQL_ROOT_PASS'
+    ${EndIf}
+    Pop $0
+    Pop $1
+    ${StrStr} $0 $1 "mysqld is alive"
+    ${If} $0 == ""
+        MessageBox MB_OK|MB_ICONSTOP "MySQL does not appear to be running - please make sure it is running before continuing."
+        Abort
+    ${EndIf}
+FunctionEnd
+
+
+Function PreLAMSConfig
+    Call CheckJava
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 2" "State" "$JDK_DIR"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 10" "State" "$INSTDIR\repository"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 12" "State" "C:\lamsconf"
+    !insertmacro MUI_HEADER_TEXT "Setting Up LAMS" "Configure the LAMS Server.  If unsure, use the default."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams.ini"
+FunctionEnd
+
+
+Function PostLAMSConfig
+    !insertmacro MUI_INSTALLOPTIONS_READ $JDK_DIR "lams.ini" "Field 2" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_DOMAIN "lams.ini" "Field 4" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_PORT "lams.ini" "Field 6" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_LOCALE "lams.ini" "Field 8" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_REPOSITORY "lams.ini" "Field 10" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_CONF "lams.ini" "Field 12" "State"
+
+    # check java version using given dir
+    nsExec::ExecToStack '$JDK_DIR\bin\javac -version'
+    Pop $0
+    Pop $1
+    ${StrStr} $0 $1 "1.5"
+    ${If} $0 == ""
+        MessageBox MB_OK|MB_ICONSTOP "Could not verify Java JDK 1.5, please check your JDK directory."
+        Abort
+    ${EndIf}
+FunctionEnd
+
+
+Function PreWildfireConfig
+    !insertmacro MUI_HEADER_TEXT "Setting Up Wildfire Chat Server" "Configure Wildfire, chat server for LAMS.  If unsure, use the default."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "wildfire.ini"
+FunctionEnd
+
+
+Function PostWildfireConfig
+    !insertmacro MUI_INSTALLOPTIONS_READ $WILDFIRE_DOMAIN "wildfire.ini" "Field 2" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $WILDFIRE_USER "wildfire.ini" "Field 5" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $WILDFIRE_PASS "wildfire.ini" "Field 7" "State"
+
+    # check wildfire is running
+    SetOutPath $TEMP
+    File "..\build\LocalPortScanner.class"
+    nsExec::ExecToStack '$JDK_DIR\bin\java LocalPortScanner 9090'
+    Pop $0
+    Pop $1
+    ${If} $0 == 0
+        MessageBox MB_OK|MB_ICONSTOP "Wildfire does not appear to be running - LAMS will be OK, but chat rooms will be unavailable."
+    ${EndIf}
+FunctionEnd
+
+
+Function DeployConfig
+    # extract support files to write configuration
+    SetOutPath $INSTDIR
+    File /r "..\apache-ant-1.6.5"
+    SetOutPath $TEMP
+    ;File "..\build\Switch.class"
+    File "build.xml"
+    File "..\templates\lams.xml"
+    File "..\templates\mysql-ds.xml"
+    File "..\templates\server.xml"
+    File "..\templates\run.bat"
+    File "..\templates\wrapper.conf"
+        
+    # create build.properties
+    ClearErrors
+    FileOpen $0 $TEMP\installer.properties w
+    IfErrors 0 +2
+        goto error
+        
+    # convert '\' to '/' for Ant's benefit
+    ;nsExec::ExecToStack 'java -cp "$TEMP" Switch "$TEMP"'
+    ;Pop $1 ; return code, 0=success
+    ;Pop $2 ; output
+    Push $TEMP
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "TEMP=$2$\r$\n"
+    
+    ;nsExec::ExecToStack 'java -cp "$TEMP" Switch "$LAMS_CONF"'
+    ;Pop $1 ; return code, 0=success
+    ;Pop $2 ; output
+    Push $LAMS_CONF
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "LAMS_CONF=$2$\r$\n"
+        
+    ;nsExec::ExecToStack 'java -cp "$TEMP" Switch "$INSTDIR"'
+    ;Pop $1 ; return code, 0=success
+    ;Pop $2 ; output
+    Push $INSTDIR
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "URL=http://$LAMS_DOMAIN:$LAMS_PORT/lams/$\r$\n"
+    FileWrite $0 "INSTDIR=$2/$\r$\n"
+    FileWrite $0 "TEMPDIR=$2/temp$\r$\n"
+    FileWrite $0 "DUMPDIR=$2/dump$\r$\n"
+    FileWrite $0 "EARDIR=$2/jboss-4.0.2/server/default/deploy/lams.ear$\r$\n"
+    FileWrite $0 "DEPLOYDIR=$2/jboss-4.0.2/server/default/deploy$\r$\n"
+    FileWrite $0 "TOMCATDIR=$2/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar$\r$\n"
+    FileWrite $0 "BINDIR=$2/jboss-4.0.2/bin$\r$\n"
+    
+    # Use unix slashes for config in wrapper.conf
+    Push $JDK_DIR
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "JDK_DIR_UNIX_SLASH=$2$\r$\n"
+    
+    ;nsExec::ExecToStack 'java -cp "$TEMP" Switch "$LAMS_REPOSITORY"'
+    ;Pop $1 ; return code, 0=success
+    ;Pop $2 ; output
+    Push $LAMS_REPOSITORY
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "REPOSITORYDIR=$2$\r$\n"
+        
+    StrCpy $LAMS_LOCALE $LAMS_LOCALE 5
+    FileWrite $0 "LOCALE=$LAMS_LOCALE$\r$\n"
+    ${If} $LAMS_LOCALE == "ar_JO"
+        FileWrite $0 "LOCALE_DIRECTION=RTL$\r$\n"
+    ${Else}
+        FileWrite $0 "LOCALE_DIRECTION=LTR$\r$\n"
+    ${EndIf}
+    FileWrite $0 "WILDFIRE_DOMAIN=$WILDFIRE_DOMAIN$\r$\n"
+    FileWrite $0 "WILDFIRE_CONFERENCE=conference.$WILDFIRE_DOMAIN$\r$\n"
+    FileWrite $0 "WILDFIRE_USER=$WILDFIRE_USER$\r$\n"
+    FileWrite $0 "WILDFIRE_PASS=$WILDFIRE_PASS$\r$\n"
+    
+    FileWrite $0 "DB_NAME=$DB_NAME$\r$\n"
+    FileWrite $0 "DB_USER=$DB_USER$\r$\n"
+    FileWrite $0 "DB_PASS=$DB_PASS$\r$\n"
+    
+    FileWrite $0 "LAMS_PORT=$LAMS_PORT$\r$\n"
+    FileClose $0
+    # for debugging purposes
+    CopyFiles "$TEMP\installer.properties" $INSTDIR
+        
+    # use Ant to copy configuration to destination LAMS_CONF
+    DetailPrint '$INSTDIR\apache-ant-1.6.5\bin\ant.bat configure-deploy'
+    nsExec::ExecToStack '$INSTDIR\apache-ant-1.6.5\bin\ant.bat configure-deploy'
+    Pop $0 ; return code, 0=success, error=fail
+    Pop $1 ; console output
+    DetailPrint "LAMS configure status: $0"
+    DetailPrint "LAMS configure output: $1"
+    ${If} $0 == "error"
+        goto error
+    ${EndIf}
+    ${StrStr} $0 $1 "BUILD SUCCESSFUL"
+    ${If} $0 == ""
+        goto error
+    ${EndIf}
+    
+    goto done
+    
+    error:
+        MessageBox MB_OK|MB_ICONSTOP "LAMS configuration failed.  Please check your LAMS configuration and try again.$\r$\nError:$\r$\n$\r$\n$1"
+        Abort "LAMS configuration failed."
+    done:
+FunctionEnd
+
+
+Function ImportDatabase
+    SetOutPath $TEMP
+    File "..\build\dump.sql"
+    
+    # $9 == 0 for empty password
+    StrLen $9 $MYSQL_ROOT_PASS
+    
+    StrCpy $0 '$MYSQL_DIR\bin\mysql -e "CREATE DATABASE $DB_NAME DEFAULT CHARACTER SET utf8" -u root'
+    DetailPrint $0
+    ${If} $9 != 0
+        StrCpy $0 '$MYSQL_DIR\bin\mysql -e "CREATE DATABASE $DB_NAME DEFAULT CHARACTER SET utf8" -u root -p$MYSQL_ROOT_PASS' 
+    ${EndIf}
+    nsExec::ExecToStack $0
+    Pop $0
+    Pop $1
+    ${If} $0 == 1
+        goto error
+    ${EndIf}
+    
+    StrCpy $0 `$MYSQL_DIR\bin\mysql -e "GRANT ALL PRIVILEGES ON *.* TO $DB_USER@localhost IDENTIFIED BY '$DB_PASS'" -u root`
+    DetailPrint $0
+    ${If} $9 != 0
+        StrCpy $0 `$MYSQL_DIR\bin\mysql -e "GRANT ALL PRIVILEGES ON *.* TO $DB_USER@localhost IDENTIFIED BY '$DB_PASS'" -u root -p$MYSQL_ROOT_PASS`
+    ${EndIf}
+    nsExec::ExecToStack $0
+    Pop $0
+    Pop $1
+    ${If} $0 == 1
+        goto error
+    ${EndIf}
+    
+    StrCpy $0 '$MYSQL_DIR\bin\mysql -e "REVOKE PROCESS,SUPER ON *.* from $DB_USER@localhost" -u root'
+    DetailPrint $0
+    ${If} $9 != 0
+        StrCpy $0 '$MYSQL_DIR\bin\mysql -e "REVOKE PROCESS,SUPER ON *.* from $DB_USER@localhost" -u root -p$MYSQL_ROOT_PASS' 
+    ${EndIf}
+    nsExec::ExecToStack $0
+    Pop $0
+    Pop $1
+    ${If} $0 == 1
+        goto error
+    ${EndIf}
+    
+    StrCpy $0 '$MYSQL_DIR\bin\mysqladmin flush-privileges -u root'
+    DetailPrint $0
+    ${If} $9 != 0
+        StrCpy $0 '$MYSQL_DIR\bin\mysqladmin flush-privileges -u root -p$MYSQL_ROOT_PASS' 
+    ${EndIf}
+    nsExec::ExecToStack $0
+    Pop $0
+    Pop $1
+    ${If} $0 == 1
+        goto error
+    ${EndIf}
+    
+    /* mysql keeps rejecting 'mysql -e...' and 'mysql db_name < dump.sql' commands
+    StrCpy $0 `$MYSQL_DIR\bin\mysql -e "use $DB_NAME; source '$TEMP\dump.sql'" -u $DB_USER`
+    DetailPrint $0
+    StrLen $9 $DB_PASS
+    ${If} $9 != 0
+        StrCpy $0 `$MYSQL_DIR\bin\mysql -e "use $DB_NAME; source '$TEMP\dump.sql'" -u $DB_USER -p$DB_PASS`
+    ${EndIf}
+    nsExec::ExecToStack $0
+    Pop $0
+    Pop $1
+    ${If} $0 == 1
+        goto error
+    ${EndIf}
+    */
+    
+    # use Ant to import database
+    DetailPrint '$INSTDIR\apache-ant-1.6.5\bin\ant.bat import-db'
+    nsExec::ExecToStack '$INSTDIR\apache-ant-1.6.5\bin\ant.bat import-db'
+    Pop $0 ; return code, 0=success, error=fail
+    Pop $1 ; console output
+    DetailPrint "DB import status: $0"
+    DetailPrint "DB import output: $1"
+    ${StrStr} $0 $1 "BUILD SUCCESSFUL"
+    ${If} $0 == ""
+        goto error
+    ${EndIf}
+    
+    goto done
+    
+    error:
+        MessageBox MB_OK|MB_ICONSTOP "Database setup failed.  Please check your MySQL configuration and try again.$\r$\nError:$\r$\n$\r$\n$1"
+        Abort "Database setup failed."
+    done:
+    
+FunctionEnd
+
+
+Function DeployLAMSConfigAlt
+    # failed attempt to not use Ant
+    ;File "..\build\Filter.class"
+    ;File "lams.xml.template"
+    ;nsExec::ExecToStack 'java -cp "$TEMP" Filter lams.xml.template @URL@ "$LAMS_DOMAIN"'
+    ;nsExec::Exec 'copy "$TEMP\lams.xml.tmp" "$LAMS_CONF\lams.xml"'
+FunctionEnd
+
+
+Function WriteRegEntries
+    WriteRegStr HKLM "${REG_HEAD}" "dir_jdk" $JDK_DIR
+    WriteRegStr HKLM "${REG_HEAD}" "dir_mysql" $MYSQL_DIR
+    WriteRegStr HKLM "${REG_HEAD}" "dir_inst" $INSTDIR
+    WriteRegStr HKLM "${REG_HEAD}" "dir_repository" $LAMS_REPOSITORY
+    WriteRegStr HKLM "${REG_HEAD}" "dir_conf" $LAMS_CONF
+    WriteRegStr HKLM "${REG_HEAD}" "version" "${VERSION}"
+    WriteRegStr HKLM "${REG_HEAD}" "db_name" $DB_NAME
+    WriteRegStr HKLM "${REG_HEAD}" "db_user" $DB_USER
+    WriteRegStr HKLM "${REG_HEAD}" "db_pass" $DB_PASS
+    WriteRegStr HKLM "${REG_HEAD}" "lams_domain" $LAMS_DOMAIN
+    WriteRegStr HKLM "${REG_HEAD}" "lams_port" $LAMS_PORT
+    WriteRegStr HKLM "${REG_HEAD}" "lams_locale" $LAMS_LOCALE
+    WriteRegStr HKLM "${REG_HEAD}" "wildfire_domain" $WILDFIRE_DOMAIN
+    WriteRegStr HKLM "${REG_HEAD}" "wildfire_user" $WILDFIRE_USER
+    WriteRegStr HKLM "${REG_HEAD}" "wildfire_pass" $WILDFIRE_PASS
+FunctionEnd
+
+
+Function SetupStartMenu
+	CreateDirectory "$SMPROGRAMS\LAMSv2"
+	CreateShortCut "$SMPROGRAMS\LAMSv2\Start LAMS.lnk" "$INSTDIR\lams-start.exe"
+	CreateShortCut "$SMPROGRAMS\LAMSv2\Stop LAMS.lnk" "$INSTDIR\lams-stop.exe"
+	CreateShortCut "$SMPROGRAMS\LAMSv2\Uninstall LAMS.lnk" "$INSTDIR\lams-uninstall.exe"
+FunctionEnd
+
+
+# cleanup functions
+Function RemoveTempFiles
+    Delete "$TEMP\lams.xml"
+    Delete "$TEMP\mysql-ds.xml"
+    Delete "$TEMP\server.xml"
+    Delete "$TEMP\run.bat"
+    Delete "$TEMP\wrapper.conf"
+    Delete "$TEMP\dump.sql"
+    Delete "$TEMP\build.xml"
+    Delete "$TEMP\installer.properties"
+    Delete "$INSTDIR\wrapper.conf"
+FunctionEnd
+
+Function .onInstFailed
+    Call RemoveTempFiles
+    RMDir /r $INSTDIR
+    RMDir /r $LAMS_CONF
+FunctionEnd
+
+Function .onInstSuccess
+    Call RemoveTempFiles
+    RMDir /r "$INSTDIR\apache-ant-1.6.5"
+FunctionEnd
+
+
+# installer sections
+#
+SectionGroup /e "Install LAMS ${VERSION}"
+    Section "JBoss 4.0.2" jboss
+        SectionIn RO
+    SectionEnd
+
+    Section "LAMS ${VERSION}" lams
+        SectionIn RO
+        
+        SetOutPath $INSTDIR
+        File /a /r /x all /x minimal /x log /x tmp /x work /x jsMath.war ${SOURCE_JBOSS_HOME}
+        
+        Call DeployConfig
+        Call ImportDatabase
+        
+        CreateDirectory $INSTDIR\temp
+        CreateDirectory $INSTDIR\dump
+        CreateDirectory $LAMS_REPOSITORY
+        
+        SetOutPath $LAMS_CONF
+        File /a ${SOURCE_LAMS_CONF}\*.dtd
+        File /a ${SOURCE_LAMS_CONF}\authentication.xml
+
+        # Log mode is set to INFO in this template
+        SetOutPath "$INSTDIR\jboss-4.0.2\server\default\conf"
+        File /a "..\templates\log4j.xml"
+        
+        Call WriteRegEntries
+        
+        SetOutPath $INSTDIR
+        File /a "..\build\lams-start.exe"
+        File /a "..\build\lams-stop.exe"
+        Call SetupStartMenu
+        
+        WriteUninstaller "$INSTDIR\lams-uninstall.exe"
+    SectionEnd
+    
+    Section "Install as Service" service
+        SectionIn RO
+        SetOutPath "$INSTDIR\jboss-4.0.2\bin"
+        File /a "..\wrapper-windows-x86-32-3.2.1\bin\wrapper.exe"
+        File /a "/oname=$INSTDIR\jboss-4.0.2\bin\InstallLAMS-NT.bat" "..\wrapper-windows-x86-32-3.2.1\bin\InstallTestWrapper-NT.bat"
+        File /a "/oname=$INSTDIR\jboss-4.0.2\bin\UninstallLAMS-NT.bat" "..\wrapper-windows-x86-32-3.2.1\bin\UninstallTestWrapper-NT.bat"
+        SetOutPath "$INSTDIR\jboss-4.0.2\lib"
+        File /a "..\wrapper-windows-x86-32-3.2.1\lib\wrapper.dll"
+        File /a "..\wrapper-windows-x86-32-3.2.1\lib\wrapper.jar"
+        CreateDirectory "$INSTDIR\jboss-4.0.2\conf"
+        CopyFiles "$INSTDIR\wrapper.conf" "$INSTDIR\jboss-4.0.2\conf\wrapper.conf"
+        CreateDirectory "$INSTDIR\jboss-4.0.2\logs"
+        nsExec::ExecToStack '$INSTDIR\jboss-4.0.2\bin\InstallLAMS-NT.bat'
+        Pop $0
+        ${If} $0 == 0
+            DetailPrint "LAMSv2 successfully setup as a service. ($0)"
+        ${Else}
+            DetailPrint "LAMSv2 was not setup as a service. ($0)"
+            MessageBox MB_OK|MB_ICONSTOP "LAMSv2 was not installed as a service.  However you may start LAMS by double-clicking $INSTDIR\jboss-4.0.2\bin\run.bat."
+        ${EndIf}            
+    SectionEnd
+SectionGroupEnd
+
+SectionGroup /e "Optional"
+    Section /o "jsMath" jsmath
+        SetOutPath "$INSTDIR\jboss-4.0.2\server\default\deploy"
+        File /a /r "${SOURCE_JBOSS_HOME}\server\default\deploy\jsMath.war"
+    SectionEnd
+SectionGroupEnd
+
+
+# descriptions
+#
+LangString DESC_jboss ${LANG_ENGLISH} "JBoss Application Server."
+LangString DESC_lams ${LANG_ENGLISH} "LAMS Application."
+LangString DESC_service ${LANG_ENGLISH} "Install as a Windows service."
+LangString DESC_jsmath ${LANG_ENGLISH} "Include jsMath to be able to write and display mathematical symbols and equations."
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${jboss} $(DESC_jboss)
+    !insertmacro MUI_DESCRIPTION_TEXT ${lams} $(DESC_lams)
+    !insertmacro MUI_DESCRIPTION_TEXT ${service} $(DESC_service)
+    !insertmacro MUI_DESCRIPTION_TEXT ${jsmath} $(DESC_jsmath)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+# Uninstaller
+#
+Var UNINSTALL_DB
+
+Function un.onInit
+    !insertmacro MUI_LANGDLL_DISPLAY
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "uninstall.ini"
+FunctionEnd
+
+Function un.PreUninstall
+    !insertmacro MUI_HEADER_TEXT "Remove LAMS Database" "Choose whether to remove the LAMS database."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "uninstall.ini"
+FunctionEnd
+
+
+Function un.PostUninstall
+    !insertmacro MUI_INSTALLOPTIONS_READ $UNINSTALL_DB "uninstall.ini" "Field 1" "State"
+FunctionEnd
+
+
+Section "Uninstall"
+    # need to check lams is stopped
+    RMDir /r $INSTDIR
+    ReadRegStr $0 HKLM "${REG_HEAD}" "dir_conf"
+    DetailPrint "Removing $0..."
+    RMDir /r $0
+    
+    ${If} $UNINSTALL_DB == 1
+        ReadRegStr $0 HKLM "${REG_HEAD}" "dir_mysql"
+        ReadRegStr $1 HKLM "${REG_HEAD}" "db_name"
+        ReadRegStr $2 HKLM "${REG_HEAD}" "db_user"
+        ReadRegStr $3 HKLM "${REG_HEAD}" "db_pass"
+        StrLen $9 $3
+        StrCpy $4 '$0\bin\mysql -e "DROP DATABASE $1" -u $2'
+        DetailPrint $4
+        ${If} $9 != 0
+            StrCpy $4 '$0\bin\mysql -e "DROP DATABASE $1" -u $2 -p$3' 
+        ${EndIf}
+        nsExec::ExecToStack $4
+        Pop $0
+        Pop $1
+        ${If} $0 == 1
+            MessageBox MB_OK|MB_ICONSTOP "Couldn't remove LAMS database:$\r$\n$\r$\n$1"
+            DetailPrint "Failed to remove LAMS database."
+        ${EndIf}
+    ${EndIf}
+    
+    ; batch file doesn't want to work when called with ExecToStack
+    ;nsExec::ExecToStack '$INSTDIR\jboss-4.0.2\bin\UninstallLAMS-NT.bat'
+    nsExec::ExecToStack 'sc delete LAMSv2'
+    Pop $0
+    Pop $1
+    ${StrStr} $2 $1 "SUCCESS"
+    ${If} $2 == ""
+        MessageBox MB_OK|MB_ICONSTOP "Couldn't remove LAMSv2 service.$\r$\n$\r$\n$1"
+        DetailPrint "Failed to remove LAMSv2 service."
+    ${Else}
+        DetailPrint "Removed LAMSv2 service."
+    ${EndIf}
+    DeleteRegKey HKLM "${REG_HEAD}"
+SectionEnd
\ No newline at end of file
Index: win_installer/src/lams-start.nsi
===================================================================
diff -u
--- win_installer/src/lams-start.nsi	(revision 0)
+++ win_installer/src/lams-start.nsi	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,43 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+  
+Name "Start LAMS"
+OutFile "..\build\lams-start.exe"
+!define MUI_ICON "..\graphics\lams2.ico"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit
+    SetSilent silent
+FunctionEnd
+
+Section
+    nsExec::ExecToStack 'sc.exe start LAMSv2'
+    Pop $0
+    Pop $1
+    MessageBox MB_OK "Started LAMSv2 service...$\r$\n$1."
+SectionEnd
\ No newline at end of file
Index: win_installer/src/lams-stop.nsi
===================================================================
diff -u
--- win_installer/src/lams-stop.nsi	(revision 0)
+++ win_installer/src/lams-stop.nsi	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,43 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+  
+Name "Start LAMS"
+OutFile "..\build\lams-stop.exe"
+!define MUI_ICON "..\graphics\lams2.ico"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit
+    SetSilent silent
+FunctionEnd
+
+Section
+    nsExec::ExecToStack 'sc.exe stop LAMSv2'
+    Pop $0
+    Pop $1
+    MessageBox MB_OK "Stopping LAMSv2 service...$\r$\n$1."
+SectionEnd
\ No newline at end of file
Index: win_installer/src/lams.ini
===================================================================
diff -u
--- win_installer/src/lams.ini	(revision 0)
+++ win_installer/src/lams.ini	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,115 @@
+[Settings]
+NumFields=13
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=0
+Right=-1
+Bottom=-4
+Text=Configure LAMS...
+
+[Field 2]
+Type=DirRequest
+Left=7
+Top=22
+Right=152
+Bottom=35
+
+[Field 3]
+Type=Label
+Left=7
+Top=12
+Right=152
+Bottom=21
+Text=Java JDK directory...
+
+[Field 4]
+Type=Text
+Left=7
+Top=51
+Right=129
+Bottom=64
+State=localhost
+MinLen=1
+ValidateText=Please specify your server's domain name.
+
+[Field 5]
+Type=Label
+Left=7
+Top=41
+Right=129
+Bottom=50
+Text=Domain name...
+
+[Field 6]
+Type=Text
+Left=141
+Top=51
+Right=263
+Bottom=64
+State=8080
+MaxLen=5
+MinLen=1
+ValidateText=Please specify a port number.
+
+[Field 7]
+Type=Label
+Left=140
+Top=41
+Right=263
+Bottom=50
+Text=Port number...
+
+[Field 8]
+Type=DropList
+Left=7
+Top=82
+Right=106
+Bottom=180
+ListItems=en_AU - English (Australia)|es_ES - Espa�ol|mi_NZ - Maori|de_DE - Deutsch|zh_CN - Chinese(Simplified)|fr_FR - Fran�ais|it_IT - Italiano|no_NO - Norsk|sv_SE - Svenska|ko_KR - Korean|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|hu_HU - Magyar|bg_BG - Bulgarian|cy_GB - Cymraeg (Cymru)|th_TH - Thai|el_GR - Greek|nl_BE - Nederlands (Belgium)|ar_JO - Arabic (Jordan)|da_DK - Dansk|ru_RU - Russian
+State=en_AU - English (Australia)
+
+[Field 9]
+Type=Label
+Left=7
+Top=73
+Right=106
+Bottom=82
+Text=Default locale...
+
+[Field 10]
+Type=DirRequest
+Left=7
+Top=116
+Right=152
+Bottom=129
+State=
+MinLen=1
+ValidateText=Please specify a directory for the content repository.
+
+[Field 11]
+Type=Label
+Left=7
+Top=106
+Right=152
+Bottom=115
+Text=Content repository directory...
+
+[Field 12]
+Type=DirRequest
+Left=165
+Top=116
+Right=-7
+Bottom=129
+State=
+MinLen=1
+Flags=DISABLED
+
+[Field 13]
+Type=Label
+Left=165
+Top=106
+Right=293
+Bottom=115
+Text=Configuration file directory...
Index: win_installer/src/mysql.ini
===================================================================
diff -u
--- win_installer/src/mysql.ini	(revision 0)
+++ win_installer/src/mysql.ini	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+[Settings]
+NumFields=12
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=0
+Right=-1
+Bottom=46
+Text=About your MySQL database...
+
+[Field 2]
+Type=GroupBox
+Left=0
+Top=56
+Right=-1
+Bottom=-4
+Text=Specify a database name and user account...
+
+[Field 3]
+Type=DirRequest
+Left=8
+Top=22
+Right=153
+Bottom=35
+ValidateText=Please specify your MySQL directory.
+Text=
+
+[Field 4]
+Type=Label
+Left=8
+Top=12
+Right=130
+Bottom=21
+Text=MySQL directory
+
+[Field 5]
+Type=Password
+Left=169
+Top=22
+Right=291
+Bottom=35
+ValidateText=
+
+[Field 6]
+Type=Label
+Left=169
+Top=12
+Right=291
+Bottom=21
+Text=Root password
+
+[Field 7]
+Type=Text
+Left=8
+Top=80
+Right=130
+Bottom=93
+State=lams2
+ValidateText=Please choose a database name.
+MinLen=1
+
+[Field 8]
+Type=Label
+Left=8
+Top=70
+Right=130
+Bottom=79
+Text=Database name
+
+[Field 9]
+Type=Text
+Left=8
+Top=110
+Right=130
+Bottom=123
+State=lams2
+ValidateText=Please choose a username.
+MinLen=1
+
+[Field 10]
+Type=Text
+Left=169
+Top=110
+Right=291
+Bottom=123
+State=lamsdemo
+ValidateText=Please specify a password.
+MinLen=1
+
+[Field 11]
+Type=Label
+Left=8
+Top=100
+Right=130
+Bottom=109
+Text=MySQL Username
+
+[Field 12]
+Type=Label
+Left=169
+Top=100
+Right=291
+Bottom=109
+Text=MySQL Password
Index: win_installer/src/uninstall.ini
===================================================================
diff -u
--- win_installer/src/uninstall.ini	(revision 0)
+++ win_installer/src/uninstall.ini	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,11 @@
+[Settings]
+NumFields=1
+
+[Field 1]
+Type=CheckBox
+Left=8
+Top=30
+Right=121
+Bottom=40
+Text=Remove LAMS database?
+State=1
Index: win_installer/src/wildfire.ini
===================================================================
diff -u
--- win_installer/src/wildfire.ini	(revision 0)
+++ win_installer/src/wildfire.ini	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,57 @@
+[Settings]
+NumFields=7
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=0
+Right=-1
+Bottom=-4
+Text=Configure Wildfire...
+
+[Field 2]
+Type=Text
+Left=7
+Top=22
+Right=129
+Bottom=35
+State=localhost
+
+[Field 3]
+Type=Label
+Left=7
+Top=12
+Right=129
+Bottom=21
+Text=Domain name...
+
+[Field 4]
+Type=Label
+Left=7
+Top=52
+Right=129
+Bottom=61
+Text=Administrator's username...
+
+[Field 5]
+Type=Text
+Left=7
+Top=62
+Right=129
+Bottom=75
+State=admin
+
+[Field 6]
+Type=Label
+Left=7
+Top=94
+Right=129
+Bottom=103
+Text=Administrator's password...
+
+[Field 7]
+Type=Password
+Left=7
+Top=103
+Right=129
+Bottom=116
Index: win_installer/templates/lams.xml
===================================================================
diff -u
--- win_installer/templates/lams.xml	(revision 0)
+++ win_installer/templates/lams.xml	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Lams PUBLIC "-//LAMS//DTD LAMS//EN" "file:///C:/lamsconf/lams.dtd">
+<Lams>
+	<ServerURL>@URL@</ServerURL>
+	<Version>2.0 RC1</Version>
+	<LamsHome>@INSTDIR@</LamsHome>
+	<TempDir>@TEMPDIR@</TempDir>
+	<DumpDir>@DUMPDIR@</DumpDir>
+	<EARDir>@EARDIR@</EARDir>
+	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
+	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
+	<ContentRepositoryPath>@REPOSITORYDIR@</ContentRepositoryPath>
+	<UploadFileMaxSize>1048576</UploadFileMaxSize>
+	<UploadLargeFileMaxSize>10485760</UploadLargeFileMaxSize>
+	<UploadFileMaxMemorySize>4096</UploadFileMaxMemorySize>
+	<ChatServerName></ChatServerName>
+	<ChatPortNumber>9800</ChatPortNumber>
+	<FileManagerDir>d:/jboss-4.0.2/server/default/deploy/upload.war</FileManagerDir>
+	<ExecutableExtensions>.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs</ExecutableExtensions>
+	<TicketFile>d:/jboss-4.0.2/server/default/conf/lams.tck</TicketFile>
+	<!-- UserInactiveTimeout in seconds. 86400 seconds is one day-->
+	<UserInactiveTimeout>86400</UserInactiveTimeout>
+	<!-- If a user is allowed to login with different clients at the same time-->
+	<!-- It should be always false except when running testHarness-->
+	<AllowMultipleLogin>false</AllowMultipleLogin>
+	<!--  Turn on the cache debugging listener. Set to false in production -->
+	<UseCacheDebugListener>false</UseCacheDebugListener>
+	<!--  Number of days after which preview session data may be deleted. Recommend 7 days -->
+	<CleanupPreviewOlderThanDays>7</CleanupPreviewOlderThanDays>
+	<!--  used for client updates -->
+	<AuthoringClientVersion>2.0.200609260948</AuthoringClientVersion>
+	<MonitorClientVersion>2.0.200609260948</MonitorClientVersion>
+	<LearnerClientVersion>2.0.200609260948</LearnerClientVersion>
+	<ServerVersionNumber>2.0.200609260948</ServerVersionNumber>
+	<ServerLanguage>@LOCALE@</ServerLanguage>
+	<ServerPageDirection>@LOCALE_DIRECTION@</ServerPageDirection>
+	<DictionaryDateCreated>2006-01-02</DictionaryDateCreated>
+	<HelpURL>http://wiki.lamsfoundation.org/display/lamsdocs/</HelpURL>
+	<XmppDomain>@WILDFIRE_DOMAIN@</XmppDomain>
+	<XmppConference>@WILDFIRE_CONFERENCE@</XmppConference>
+	<XmppAdmin>@WILDFIRE_USER@</XmppAdmin>
+	<XmppPassword>@WILDFIRE_PASS@</XmppPassword>
+	<DefaultFlashTheme>default</DefaultFlashTheme>
+	<DefaultHTMLTheme>defaultHTML</DefaultHTMLTheme>
+</Lams>
\ No newline at end of file
Index: win_installer/templates/log4j.xml
===================================================================
diff -u
--- win_installer/templates/log4j.xml	(revision 0)
+++ win_installer/templates/log4j.xml	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+  <!-- ================================= -->
+  <!-- Preserve messages in a local file -->
+  <!-- ================================= -->
+
+  <!-- A time/date based rolling appender -->
+  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+    <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="Threshold" value="INFO"/>
+
+    <!-- Rollover at midnight each day -->
+    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+    <!-- Rollover at the top of each hour
+    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+    -->
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+
+      <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5r %-5p [%c] (%t:%x) %m%n"/>
+       -->
+    </layout>	    
+  </appender>
+
+    <!-- A size based file rolling appender
+  <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="MaxFileSize" value="500KB"/>
+    <param name="MaxBackupIndex" value="1"/>
+    <param name="Threshold" value="INFO"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+    </layout>	    
+  </appender>
+  -->
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ====================== -->
+   <!-- More Appender examples -->
+   <!-- ====================== -->
+
+   <!-- Buffer events and log them asynchronously
+   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <appender-ref ref="FILE"/>
+     <appender-ref ref="CONSOLE"/>
+     <appender-ref ref="SMTP"/>
+   </appender>
+   -->
+
+   <!-- EMail events to an administrator
+   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="To" value="admin@myhost.domain.com"/>
+     <param name="From" value="nobody@myhost.domain.com"/>
+     <param name="Subject" value="JBoss Sever Errors"/>
+     <param name="SMTPHost" value="localhost"/>
+     <param name="BufferSize" value="10"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Syslog events
+   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Facility" value="LOCAL7"/>
+     <param name="FacilityPrinting" value="true"/>
+     <param name="SyslogHost" value="localhost"/>
+   </appender>
+   -->
+
+   <!-- Log events to JMS (requires a topic to be created)
+   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+   </appender>
+   -->
+
+   <!-- Log events through SNMP
+   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+     <param name="ManagementHost" value="127.0.0.1"/>
+     <param name="ManagementHostTrapListenPort" value="162"/>
+     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+     <param name="LocalIPAddress" value="127.0.0.1"/>
+     <param name="LocalTrapSendPort" value="161"/>
+     <param name="GenericTrapType" value="6"/>
+     <param name="SpecificTrapType" value="12345678"/>
+     <param name="CommunityString" value="public"/>
+     <param name="ForwardStackTraceWithTrap" value="true"/>
+     <param name="Threshold" value="DEBUG"/>
+     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+     <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+     </layout>
+   </appender>
+   -->
+
+  <!-- ======================= -->
+  <!-- LAMS Setup              -->
+  <!-- ======================= -->
+  
+  <appender name="AUDITFILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+    <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+    <param name="File" value="${jboss.server.home.dir}/log/audit.log"/>
+    <param name="Append" value="true"/>
+    <param name="Threshold" value="INFO"/>
+
+    <!-- Rollover at midnight each day -->
+    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{ABSOLUTE} [%t:%x] %-5p %c - %m%n"/>
+
+    </layout>	    
+  </appender>
+  
+  <appender name="LAMSFILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/lams.log"/>
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="5MB"/>
+    <param name="MaxBackupIndex" value="20"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- Date [Thread:NDC] LEVEL Category - Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} [%t:%x] %-5p %c - %m%n"/>
+    </layout>	    
+  </appender>
+
+  <appender name="LAMSCONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- Date Priority Category - Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+    </layout>
+  </appender>
+
+  <appender name="HIBERNATEFILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/hibernatelams.log"/>
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="5MB"/>
+    <param name="MaxBackupIndex" value="20"/>
+    <layout class="org.apache.log4j.PatternLayout">
+		<!-- Date [Thread] Priority Category - Message\n -->
+		<param name="ConversionPattern" value="%d{ABSOLUTE} [%t] %-5p %c - %m%n"/>
+    </layout>	    
+  </appender>
+  
+  <category name="org.lamsfoundation.lams" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="LAMSFILE"/>
+    <appender-ref ref="LAMSCONSOLE"/>
+  </category>
+  
+  <category name="org.lamsfoundation.lams.util.audit" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="AUDITFILE"/>
+  </category>
+
+  <category name="org.hibernate" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="HIBERNATEFILE"/>
+  </category>
+  
+  <category name="org.apache">
+    <priority value="INFO"/>
+  </category>
+  
+  <category name="org.jboss">
+    <priority value="INFO"/>
+  </category>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->   
+
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit apache axis to INFO as its DEBUG is even more verbose -->
+   <category name="org.jboss.axis">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit JBoss categories
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+   -->
+
+   <!-- Limit the JSR77 categories -->
+   <category name="org.jboss.management">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit JBoss webservice category
+   <category name="org.jboss.webservice">
+      <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Decrease the priority threshold for the org.jboss.varia category
+   <category name="org.jboss.varia">
+     <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
+
+   <!--
+      | An example of enabling the custom TRACE level priority that is used
+      | by the JBoss internals to diagnose low level details. This example
+      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+      | subpackages. This will produce A LOT of logging output.
+   <category name="org.jboss.system">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   <category name="org.jboss.ejb.plugins">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
+  
+   <!--
+       | Logs these events to SNMP:
+           - server starts/stops
+           - cluster evolution (node death/startup)
+           - When an EJB archive is deployed (and associated verified messages)
+           - When an EAR archive is deployed
+      	 
+   <category name="org.jboss.system.server.Server">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+
+   <category name="org.jboss.deployment.MainDeployer">
+     <priority value="ERROR" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.ejb.EJBDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.deployment.EARDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+  
+   -->
+
+
+  <!-- ======================= -->
+  <!-- Setup the Root category -->
+  <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+   <!-- Clustering logging -->
+   <!-- Uncomment the following to redirect the org.jgroups and
+      org.jboss.ha categories to a cluster.log file.
+
+   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.home.dir}/log/cluster.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>
+   </appender>
+   <category name="org.jgroups">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   <category name="org.jboss.ha">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   -->
+
+
+</log4j:configuration>
Index: win_installer/templates/mysql-ds.xml
===================================================================
diff -u
--- win_installer/templates/mysql-ds.xml	(revision 0)
+++ win_installer/templates/mysql-ds.xml	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+<!--  Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
+
+<datasources>
+  <!-- lams-ds datasource for use by LAMS Core and Services -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/lams-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/@DB_NAME@</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
+    <!-- and convert MySQL zero times to null -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+
+  <!-- tool-ds datasource for use by Tools -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/tool-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/@DB_NAME@</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
+    <!-- and convert MySQL zero times to null -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+  
+  <!-- quartz-ds datasource for use by Quartz -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/quartz-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/@DB_NAME@</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+</datasources>
Index: win_installer/templates/run.bat
===================================================================
diff -u
--- win_installer/templates/run.bat	(revision 0)
+++ win_installer/templates/run.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,109 @@
+@echo off
+rem -------------------------------------------------------------------------
+rem JBoss Bootstrap Script for Win32
+rem -------------------------------------------------------------------------
+
+rem $Id$
+
+@if not "%ECHO%" == ""  echo %ECHO%
+@if "%OS%" == "Windows_NT"  setlocal
+
+set JAVA_HOME=@JAVA_HOME@
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM         set ARGS=%ARGS% %1
+REM         shift
+REM         goto loop
+REM :endloop
+
+rem Find run.jar, or we can't continue
+
+set RUNJAR=%DIRNAME%\run.jar
+if exist "%RUNJAR%" goto FOUND_RUN_JAR
+echo Could not locate %RUNJAR%. Please check that you are in the
+echo bin directory when running this script.
+goto END
+
+:FOUND_RUN_JAR
+
+if not "%JAVA_HOME%" == "" goto ADD_TOOLS
+
+set JAVA=java
+
+echo JAVA_HOME is not set.  Unexpected results may occur.
+echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+goto SKIP_TOOLS
+
+:ADD_TOOLS
+
+set JAVA=%JAVA_HOME%\bin\java
+
+if exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
+echo Could not locate %JAVA_HOME%\lib\tools.jar. Unexpected results may occur.
+echo Make sure that JAVA_HOME points to a JDK and not a JRE.
+
+:SKIP_TOOLS
+
+rem Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
+rem compatible distribution to which JAVA_HOME points
+
+set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
+
+rem If JBOSS_CLASSPATH is empty, don't include it, as this will 
+rem result in including the local directory, which makes error tracking
+rem harder.
+if "%JBOSS_CLASSPATH%" == "" (
+	set JBOSS_CLASSPATH=%JAVAC_JAR%;%RUNJAR%
+) ELSE (
+	set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%JAVAC_JAR%;%RUNJAR%
+)
+
+rem Setup JBoss specific properties
+set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
+set JBOSS_HOME=%DIRNAME%\..
+
+rem Sun JVM memory allocation pool parameters. Modify as appropriate.
+set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
+
+rem JPDA options. Uncomment and modify as appropriate to enable remote debugging.
+rem set JAVA_OPTS=-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+echo ===============================================================================
+echo .
+echo   JBoss Bootstrap Environment
+echo .
+echo   JBOSS_HOME: %JBOSS_HOME%
+echo .
+echo   JAVA: %JAVA%
+echo .
+echo   JAVA_OPTS: %JAVA_OPTS%
+echo .
+echo   CLASSPATH: %JBOSS_CLASSPATH%
+echo .
+echo ===============================================================================
+echo .
+
+:RESTART
+ECHO "%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" -classpath "%JBOSS_CLASSPATH%" org.jboss.Main %*
+IF ERRORLEVEL 10 GOTO RESTART
+
+:END
+if "%NOPAUSE%" == "" pause
+
+:END_NO_PAUSE
Index: win_installer/templates/server.xml
===================================================================
diff -u
--- win_installer/templates/server.xml	(revision 0)
+++ win_installer/templates/server.xml	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,128 @@
+<Server>
+
+   <!-- Use a custom version of StandardService that allows the
+   connectors to be started independent of the normal lifecycle
+   start to allow web apps to be deployed before starting the
+   connectors.
+   -->
+   <Service name="jboss.web"
+      className="org.jboss.web.tomcat.tc5.StandardService">
+
+      <!-- A HTTP/1.1 Connector on port 8080 -->
+      <Connector port="@LAMS_PORT@" address="${jboss.bind.address}"
+         maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
+         emptySessionPath="true"
+         enableLookups="false" redirectPort="8443" acceptCount="100"
+         connectionTimeout="20000" disableUploadTimeout="true"/>
+
+      <!-- A AJP 1.3 Connector on port 8009 -->
+      <Connector port="8009" address="${jboss.bind.address}"
+         emptySessionPath="true" enableLookups="false" redirectPort="8443" 
+         protocol="AJP/1.3"/>
+
+      <!-- SSL/TLS Connector configuration using the admin devl guide keystore
+      <Connector port="8443" address="${jboss.bind.address}"
+           maxThreads="100" strategy="ms" maxHttpHeaderSize="8192"
+           emptySessionPath="true"
+           scheme="https" secure="true" clientAuth="false" 
+           keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
+           keystorePass="rmi+ssl" sslProtocol = "TLS" />
+      -->
+
+      <Engine name="jboss.web" defaultHost="localhost">
+
+         <!-- The JAAS based authentication and authorization realm implementation
+         that is compatible with the jboss 3.2.x realm implementation.
+         - certificatePrincipal : the class name of the
+         org.jboss.security.auth.certs.CertificatePrincipal impl
+         used for mapping X509[] cert chains to a Princpal.
+         -->
+         <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+            certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+            />
+         <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
+         behavior of JBossSecurityMgrRealm, but overrides the authorization
+         checks to use JACC permissions with the current java.security.Policy
+         to determine authorized access.
+         <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+            certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+            />
+         -->
+
+         <Host name="localhost"
+            autoDeploy="false" deployOnStartup="false" deployXML="false">
+
+            <!-- Uncomment to enable request dumper. This Valve "logs interesting 
+                 contents from the specified Request (before processing) and the 
+                 corresponding Response (after processing). It is especially useful 
+                 in debugging problems related to headers and cookies."
+            -->
+            <!--
+            <Valve className="org.apache.catalina.valves.RequestDumperValve" />
+            -->
+ 
+            <!-- Access logger -->
+            <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+                prefix="localhost_access_log." suffix=".log"
+                pattern="common" directory="${jboss.server.home.dir}/log" 
+                resolveHosts="false" />
+
+            <!-- Uncomment to enable single sign-on across web apps
+                deployed to this host. Does not provide SSO across a cluster.     
+            
+                If this valve is used, do not use the JBoss ClusteredSingleSignOn 
+                valve shown below. 
+             -->
+            <!--
+            <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+            -->
+
+            <!-- Uncomment to enable single sign-on across web apps
+               deployed to this host AND to all other hosts in the cluster
+               with the same virtual hostname.
+            
+               If this valve is used, do not use the standard Tomcat SingleSignOn
+               valve shown above.
+            
+               This valve uses JGroups to communicate across the cluster.  The 
+               JGroups Channel used for this communication can be configured
+               by editing the "sso-channel.xml" file found in the same folder
+               as this file.  If this valve is running on a machine with multiple
+               IP addresses, configuring the "bind_addr" property of the JGroups
+               UDP protocol may be necessary.  Another possible configuration 
+               change would be to enable encryption of intra-cluster communications.
+               See the sso-channel.xml file for more details.
+            
+               Besides the attributes supported by the standard Tomcat
+               SingleSignOn valve (see the Tomcat docs), this version also supports 
+               the following attribute:
+            
+               partitionName     the name of the cluster partition in which 
+                                 this node participates.  If not set, the default
+                                 value is "sso-partition/" + the value of the
+                                 "name" attribute of the Host element that
+                                 encloses this element (e.g. "sso-partition/localhost")
+            -->
+            <!--
+            <Valve className="org.jboss.web.tomcat.tc5.sso.ClusteredSingleSignOn" />
+            -->
+         
+            <!-- Uncomment to check for unclosed connections and transaction terminated checks
+                 in servlets/jsps.
+                 Important: You need to uncomment the dependency on the CachedConnectionManager
+                            in META-INF/jboss-service.xml
+            <Valve className="org.jboss.web.tomcat.tc5.jca.CachedConnectionValve"
+                cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
+                transactionManagerObjectName="jboss:service=TransactionManager" />
+            -->
+            <!-- LAMS Login Request Valve -->
+			<Valve className="org.lamsfoundation.lams.integration.security.LoginRequestValve" />
+			
+			<Valve className="org.lamsfoundation.lams.integration.security.SingleSignOn" debug="0"/>
+         </Host>
+
+      </Engine>
+
+   </Service>
+
+</Server>
Index: win_installer/templates/wrapper.conf
===================================================================
diff -u
--- win_installer/templates/wrapper.conf	(revision 0)
+++ win_installer/templates/wrapper.conf	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,95 @@
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
+# Java Application
+wrapper.java.command=@JAVA_HOME@/bin/java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=../lib/wrapper.jar
+wrapper.java.classpath.2=./run.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=../lib
+
+# Java Additional Parameters
+wrapper.java.additional.1=-Dprogram.name=run.bat
+
+# Initial Java Heap Size (in MB)
+wrapper.java.initmemory=128
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=256
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.jboss.Main
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=../logs/wrapper.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=LAMSv2
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=LAMSv2
+
+# Display name of the service
+wrapper.ntservice.displayname=LAMSv2
+
+# Description of the service
+wrapper.ntservice.description=LAMSv2
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=DEMAND_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/InstallTestWrapper-NT.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/InstallTestWrapper-NT.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/InstallTestWrapper-NT.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service install script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Install the Wrapper as an NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -i %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/PauseTestWrapper-NT.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/PauseTestWrapper-NT.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/PauseTestWrapper-NT.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service start script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -a %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/ResumeTestWrapper-NT.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/ResumeTestWrapper-NT.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/ResumeTestWrapper-NT.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service start script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -e %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/StartTestWrapper-NT.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/StartTestWrapper-NT.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/StartTestWrapper-NT.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service start script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -t %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/StopTestWrapper-NT.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/StopTestWrapper-NT.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/StopTestWrapper-NT.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service stop script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Stop the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -p %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/TestWrapper.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/TestWrapper.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/TestWrapper.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,55 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general startup script
+rem
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem  For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem  can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/TestWrapperNoWrapper.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/TestWrapperNoWrapper.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/TestWrapperNoWrapper.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,12 @@
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem This script is an example of how to run your application without the Wrapper, but with the
+rem  Wrapper helper classes.  You can obtain the actual command generated by the wrapper for
+rem  your application by running the Wrapper with the wrapper.java.command.loglevel=INFO
+rem  property set.
+rem
+rem The wrapper.key property MUST be removed from the resulting command or it will fail to
+rem  run correctly.
+rem
+java -Xms16m -Xmx64m -Djava.library.path="../lib" -Djava.class.path="../lib/wrapper.jar;../lib/wrappertest.jar" -Dwrapper.native_library="wrapper" -Dwrapper.debug="TRUE" org.tanukisoftware.wrapper.test.Main
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/UninstallTestWrapper-NT.bat
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/bin/UninstallTestWrapper-NT.bat	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/bin/UninstallTestWrapper-NT.bat	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service uninstall script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Uninstall the Wrapper as an NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/bin/wrapper.exe
===================================================================
diff -u
Binary files differ
Index: win_installer/wrapper-windows-x86-32-3.2.1/lib/wrapper.dll
===================================================================
diff -u
Binary files differ
Index: win_installer/wrapper-windows-x86-32-3.2.1/lib/wrapper.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/wrapper-windows-x86-32-3.2.1/lib/wrappertest.jar
===================================================================
diff -u
Binary files differ
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/App.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/App.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/App.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,55 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general startup script
+rem
+
+rem
+rem Resolve the real path of the wrapper.exe
+rem  For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem  can be hard-coded below and the following test removed.
+rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/AppCommand.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/AppCommand.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/AppCommand.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,97 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper command based script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto validate
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto validate
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto validate
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+:validate
+rem Find the requested command.
+for /F %%v in ('echo %1^|findstr "^console$ ^start$ ^pause$ ^resume$ ^stop$ ^restart$ ^install$ ^remove"') do call :exec set COMMAND=%%v
+
+if "%COMMAND%" == "" (
+    echo Usage: %0 { console : start : pause : resume : stop : restart : install : remove }
+    pause
+    goto :eof
+) else (
+    shift
+)
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Run the application.
+rem At runtime, the current directory will be that of wrapper.exe
+rem
+call :%COMMAND%
+if errorlevel 1 pause
+goto :eof
+
+:console
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+goto :eof
+
+:start
+"%_WRAPPER_EXE%" -t %_WRAPPER_CONF%
+goto :eof
+
+:pause
+"%_WRAPPER_EXE%" -a %_WRAPPER_CONF%
+goto :eof
+
+:resume
+"%_WRAPPER_EXE%" -e %_WRAPPER_CONF%
+goto :eof
+
+:stop
+"%_WRAPPER_EXE%" -p %_WRAPPER_CONF%
+goto :eof
+
+:install
+"%_WRAPPER_EXE%" -i %_WRAPPER_CONF%
+goto :eof
+
+:remove
+"%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
+goto :eof
+
+:restart
+call :stop
+call :start
+goto :eof
+
+:exec
+%*
+goto :eof
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/AppNoWrapper.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/AppNoWrapper.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/AppNoWrapper.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,12 @@
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem This script is an example of how to run your application without the Wrapper, but with the
+rem  Wrapper helper classes.  You can obtain the actual command generated by the wrapper for
+rem  your application by running the Wrapper with the wrapper.java.command.loglevel=INFO
+rem  property set.
+rem
+rem The wrapper.key property MUST be removed from the resulting command or it will fail to
+rem  run correctly.
+rem
+java -Xms16m -Xmx64m -Djava.library.path="../lib" -Djava.class.path="../lib/wrapper.jar;../lib/wrappertest.jar" -Dwrapper.native_library="wrapper" -Dwrapper.debug="TRUE" org.tanukisoftware.wrapper.test.Main
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/InstallApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/InstallApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/InstallApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service install script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Install the Wrapper as an NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -i %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/PauseApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/PauseApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/PauseApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service start script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -a %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/ResumeApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/ResumeApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/ResumeApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service start script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -e %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleApp.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleApp.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleApp.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,15 @@
+@echo off
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="@app.home@\conf\wrapper.conf"
+
+:startup
+"@app.home@\bin\wrapper.exe" -c %_WRAPPER_CONF%
+if not errorlevel 1 goto end
+pause
+
+:end
+set _WRAPPER_CONF=
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleInstallApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleInstallApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleInstallApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,15 @@
+@echo off
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="@app.home@\conf\wrapper.conf"
+
+:startup
+"@app.home@\bin\wrapper.exe" -i %_WRAPPER_CONF%
+if not errorlevel 1 goto end
+pause
+
+:end
+set _WRAPPER_CONF=
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleUninstallApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleUninstallApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/SimpleUninstallApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,15 @@
+@echo off
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="@app.home@\conf\wrapper.conf"
+
+:startup
+"@app.home@\bin\wrapper.exe" -r %_WRAPPER_CONF%
+if not errorlevel 1 goto end
+pause
+
+:end
+set _WRAPPER_CONF=
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/StartApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/StartApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/StartApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service start script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Start the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -t %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/StopApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/StopApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/StopApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service stop script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Stop the Wrapper NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -p %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/bin/UninstallApp-NT.bat.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/bin/UninstallApp-NT.bat.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/bin/UninstallApp-NT.bat.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,50 @@
+@echo off
+setlocal
+
+rem Copyright (c) 1999, 2006 Tanuki Software Inc.
+rem
+rem Java Service Wrapper general NT service uninstall script
+rem
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_REALPATH%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not %_WRAPPER_CONF%=="" goto startup
+set _WRAPPER_CONF="%_REALPATH%..\conf\wrapper.conf"
+
+rem
+rem Uninstall the Wrapper as an NT service.
+rem
+:startup
+"%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
+if not errorlevel 1 goto :eof
+pause
+
Index: win_installer/wrapper-windows-x86-32-3.2.1/src/conf/wrapper.conf.in
===================================================================
diff -u
--- win_installer/wrapper-windows-x86-32-3.2.1/src/conf/wrapper.conf.in	(revision 0)
+++ win_installer/wrapper-windows-x86-32-3.2.1/src/conf/wrapper.conf.in	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
@@ -0,0 +1,94 @@
+#********************************************************************
+# Wrapper Properties
+#********************************************************************
+# Java Application
+wrapper.java.command=java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=../lib/wrapper.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=../lib
+
+# Java Additional Parameters
+#wrapper.java.additional.1=
+
+# Initial Java Heap Size (in MB)
+#wrapper.java.initmemory=3
+
+# Maximum Java Heap Size (in MB)
+#wrapper.java.maxmemory=64
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=<YourMainClass>
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=../logs/wrapper.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=@app.long.name@
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=@app.name@
+
+# Display name of the service
+wrapper.ntservice.displayname=@app.long.name@
+
+# Description of the service
+wrapper.ntservice.description=@app.description@
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+