From b4bcd034439ceb9a770f54463b08735700195daa Mon Sep 17 00:00:00 2001
From: Christian Corsano <christian.corsano@conceptoire.com>
Date: Wed, 12 Mar 2008 02:46:00 +0000
Subject: [PATCH] Finalisation de l'Installer

---
 YACOSCore/Install/Install-izPack.xml | 5 ++++-
 YACOSCore/Install/StartYACOS.bat     | 1 +
 YACOSCore/Install/StartYACOS.sh      | 1 +
 YACOSCore/Install/userInputSpec.xml  | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/YACOSCore/Install/Install-izPack.xml b/YACOSCore/Install/Install-izPack.xml
index dbffe47..15dbd7a 100644
--- a/YACOSCore/Install/Install-izPack.xml
+++ b/YACOSCore/Install/Install-izPack.xml
@@ -14,7 +14,6 @@
 		<author name="Jialin Wang" email="kooksnake@hotmail.com"/>
 	</authors>
 	<javaversion>1.5</javaversion>
-	<requiresjdk>yes</requiresjdk>
   </info>
 
   <guiprefs width="600" height="480" resizable="no">
@@ -39,6 +38,9 @@
   <variables>
     <variable name="app_name" value="YACOS"/>
     <variable name="jboss_version" value="jboss-4.2.2.GA"/>
+    <variable name="JDKPathPanel.minVersion" value="1.5.0" />
+    <variable name="JDKPathPanel.maxVersion" value="1.5.99" />
+    <variable name="JDKPathPanel.skipIfValid" value="yes" />
   </variables>
 
   <resources>
@@ -57,6 +59,7 @@
     <panel classname="HelloPanel"/>
     <panel classname="HTMLInfoPanel"/>
     <panel classname="TargetPanel"/>
+    <panel classname="JDKPathPanel"/>
     <panel classname="PacksPanel"/>
 	<panel classname="UserInputPanel" id="UserInputPanel.0"/>
     <panel classname="SummaryPanel"/>
diff --git a/YACOSCore/Install/StartYACOS.bat b/YACOSCore/Install/StartYACOS.bat
index 8e8a13f..e1f9444 100644
--- a/YACOSCore/Install/StartYACOS.bat
+++ b/YACOSCore/Install/StartYACOS.bat
@@ -1 +1,2 @@
+set JAVA_HOME=@JDKPath
 jboss-4.2.2.GA/bin/run.bat --host=@{server.address} -Dyacos.port=@{server.port}
\ No newline at end of file
diff --git a/YACOSCore/Install/StartYACOS.sh b/YACOSCore/Install/StartYACOS.sh
index 3fea044..c8c130d 100644
--- a/YACOSCore/Install/StartYACOS.sh
+++ b/YACOSCore/Install/StartYACOS.sh
@@ -1 +1,2 @@
+export JAVA_HOME="@JDKPath"
 sh jboss-4.2.2.GA/bin/run.sh --host=@{server.address} -Dyacos.port=@{server.port}
\ No newline at end of file
diff --git a/YACOSCore/Install/userInputSpec.xml b/YACOSCore/Install/userInputSpec.xml
index 8ef4e0f..6e81ac5 100644
--- a/YACOSCore/Install/userInputSpec.xml
+++ b/YACOSCore/Install/userInputSpec.xml
@@ -3,7 +3,7 @@
 	<field type="text" variable="server.address">
 	  <description align="left" txt="This is the address that will be used to access the server."
 	      id="server.address.text"/>
-	  <spec txt="Enter the server address :" id="server.address.label" size="20" set="127.0.0.1"/>
+	  <spec txt="Enter the server address :" id="server.address.label" size="20" set="$HOST_NAME"/>
 	</field>
 	<field type="text" variable="server.port">
 	  <description align="left" txt="Please enter the port on which the web server should be accessible. Please note that on most systems you will need to have administrative privileges to run the server on ports lesser than 1024."