Author: nextgens
Date: 2006-04-02 12:32:36 +0000 (Sun, 02 Apr 2006)
New Revision: 8429
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/config/freenet.ini
Log:
installer: There was a really nasty bug : while set to -1, the portnumber was
b0rking the node
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-04-01 21:44:39 UTC (rev
8428)
+++ trunk/apps/installer/antinstall-config.xml 2006-04-02 12:32:36 UTC (rev
8429)
@@ -136,13 +136,13 @@
<comment
displayText="Enter your node's port number in
the following field"/>
<comment
- displayText="If you choose -1, a random one
will be picked up"/>
+ displayText="If you let the field empty, a
random one will be picked up"/>
<!-- TODO: try to bind it to verify it's free WONTFIX: toad
said : "not needed"-->
<validated
property="portNumber"
displayText="Port :"
- regex="^([0-9]{4}[0-9]*|-1)*$"
- defaultValue="-1"
+ regex="^([0-9]{4}[0-9]*)*$"
+ defaultValue=""
force="false"/>
<comment
displayText="How much bandwidth may be used by FRED?"/>
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-04-01 21:44:39 UTC (rev 8428)
+++ trunk/apps/installer/build.xml 2006-04-02 12:32:36 UTC (rev 8429)
@@ -9,9 +9,6 @@
<mkdir dir="${installDir}"/>
<mkdir dir="${installDir}/lib"/>
<mkdir dir="${installDir}/bin"/>
- <condition property="skip_frost" value="true">
- <isfalse value="${frost}" />
- </condition>
<condition property="is_windows" value="true">
<os family="windows" />
</condition>
@@ -48,18 +45,14 @@
<condition property="Name" else="${nodeName}"
value="MyFirstFreenetNode">
<equals arg1="${nodeName}" arg2="MyFirstFreenetNode" />
</condition>
- <condition property="Bandwidth" value="${bw}K" else="15K">
- <not>
+ <condition property="Bandwidth" else="${bw}K" value="15K">
<equals arg1="${bw}" arg2="" />
- </not>
</condition>
- <condition property="DataStoreSize" value="${dsSize}G"
else="1G">
- <not>
+ <condition property="DataStoreSize" else="${dsSize}G"
value="1G">
<equals arg1="${dsSize}" arg2="" />
- </not>
</condition>
- <condition property="Port" value="${portNumber}" else="-1">
- <isset property="portNumber" />
+ <condition property="Port" else="node.listenPort=${portNumber}"
value="">
+ <equals arg1="${portNumber}" arg2=""/>
</condition>
<condition property="myHostName" else="${hostName}" value="">
<equals arg1="${hostName}" arg2=""/>
@@ -67,18 +60,24 @@
<condition property="Testnet" value="${enableTestnet}"
else="true">
<isset property="enableTestnet" />
</condition>
- <condition property="SNMP" value="${enableSNMP}" else="false">
- <isset property="enableSNMP" />
+ <condition property="SNMP" else="snmp.enabled=${enableSNMP}"
value="snmp.enabled=false">
+ <equals arg1="${enableSNMP}" arg2=""/>
</condition>
- <condition property="FCP" value="${enableFCP}" else="true">
- <isset property="enableFCP" />
+ <condition property="FCP" else="fcp.enabled=${enableFCP}"
value="fcp.enabled=true">
+ <equals arg1="${enableFCP}" arg2=""/>
</condition>
- <condition property="Fproxy" value="${enableFproxy}"
else="true">
- <isset property="enableFproxy" />
+ <condition property="Fproxy"
else="fproxy.enabled=${enableFproxy}" value="fproxy.enabled=true">
+ <equals arg1="${enableFproxy}" arg2=""/>
</condition>
- <condition property="Console" value="${enableConsole}"
else="true">
- <isset property="enableConsole" />
+ <condition property="Console"
else="console.enabled=${enableConsole}" value="console.enabled=true">
+ <equals arg1="${enableConsole}" arg2=""/>
</condition>
+ <condition property="skip_frost" value="true">
+ <and>
+ <equals arg1="${frost}" arg2="false"/>
+ <isfalse value="${frost}"/>
+ </and>
+ </condition>
<echo message="Name: ${Name}"/>
<echo message="Bandwidth: ${Bandwidth}"/>
<echo message="Port: ${Port}"/>
@@ -90,6 +89,7 @@
<echo message="FCP: ${FCP}"/>
<echo message="Fproxy: ${Fproxy}"/>
<echo message="Console: ${Console}"/>
+ <echo message="Frost: ${frost}"/>
</target>
Modified: trunk/apps/installer/installclasspath/config/freenet.ini
===================================================================
--- trunk/apps/installer/installclasspath/config/freenet.ini 2006-04-01
21:44:39 UTC (rev 8428)
+++ trunk/apps/installer/installclasspath/config/freenet.ini 2006-04-02
12:32:36 UTC (rev 8429)
@@ -1,16 +1,16 @@
node.ipAddressOverride=@hostname@
node.outputBandwidthLimit=@bandwidth@
node.storeSize=@dsSize@
-node.listenPort=@portnumber@
+ at portnumber@
node.name=@nodename@
node.testnet.enabled=@enabletestnet@
-fcp.enabled=@enablefcp@
+ at enablefcp@
fcp.port=@fcpport@
logger.maxZippedLogsSize=1G
-fproxy.enabled=@enablefproxy@
+ at enablefproxy@
fproxy.port=@fproxyport@
-snmp.enabled=@enablesnmp@
+ at enablesnmp@
console.directEnabled=false
-console.enabled=@enableconsole@
+ at enableconsole@
console.port=@consoleport@
End
