[jboss-cvs] JBossAS SVN: r75691 - trunk/build.

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2008-07-11 09:38:16 -0400 (Fri, 11 Jul 2008)
New Revision: 75691

Modified:
   trunk/build/build.xml
Log:
JBAS-5073, fix and tidy up.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-07-11 13:23:06 UTC (rev 75690)
+++ trunk/build/build.xml	2008-07-11 13:38:16 UTC (rev 75691)
@@ -945,52 +945,53 @@
    <!-- check if thirdparty libraries are to be downloaded -->
    <target name="check.inhibit.downloads">
       <condition property="inhibit.downloads">
-      	<istrue value="${nodownload}"/>
+         <istrue value="${nodownload}"/>
       </condition>
-  </target>
+   </target>
 
-  <!-- check if the the user has specied proxy settings -->
-  <target name="check.proxy">
-    <condition property="hasproxy">
-        <and>
+   <!-- check if the the user has specied proxy settings -->
+   <target name="check.proxy">
+      <condition property="hasproxy">
+         <and>
             <isset property="proxy.host"/>
             <isset property="proxy.port"/>
             <not>
-                <equals arg1="" arg2="${proxy.host}" trim="true"/>
+               <equals arg1="" arg2="${proxy.host}" trim="true"/>
             </not>
             <not>
-                <equals arg1="" arg2="${proxy.port}" trim="true"/>
+               <equals arg1="" arg2="${proxy.port}" trim="true"/>
             </not>
-        </and>
-    </condition>
-  </target>
+         </and>
+      </condition>
 
-  <!-- set proxy settings -->
-  <condition property="hasproxyauth">
-        <and>
+      <!-- set proxy settings -->
+      <condition property="hasproxyauth">
+         <and>
             <isset property="hasproxy"/>
             <isset property="proxy.username"/>
             <isset property="proxy.password"/>
             <not>
-                <equals arg1="" arg2="${proxy.username}" trim="true"/>
+               <equals arg1="" arg2="${proxy.username}" trim="true"/>
             </not>
             <not>
-                <equals arg1="" arg2="${proxy.password}" trim="true"/>
+               <equals arg1="" arg2="${proxy.password}" trim="true"/>
             </not>
-        </and>
-    </condition>
-  <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
+         </and>
+      </condition>
+   </target>
+   
+   <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
 
-  <!-- set proxy settings without auth -->
-  <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
-    <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
-  </target>
+   <!-- set proxy settings without auth -->
+   <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
+      <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+      <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+   </target>
 
-  <!-- set proxy settings using auth -->
-  <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
-    <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
-  </target>
+   <!-- set proxy settings using auth -->
+   <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
+      <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
+      <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
+   </target>
 
 </project>