[jboss-cvs] JBossAS SVN: r75689 - branches/Branch_4_2/build.

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

Author: dimitris at jboss.org
Date: 2008-07-11 09:22:37 -0400 (Fri, 11 Jul 2008)
New Revision: 75689

Modified:
   branches/Branch_4_2/build/build.xml
Log:
JBAS-5073, just tidy up, it was already fixed.

Modified: branches/Branch_4_2/build/build.xml
===================================================================
--- branches/Branch_4_2/build/build.xml	2008-07-11 13:17:24 UTC (rev 75688)
+++ branches/Branch_4_2/build/build.xml	2008-07-11 13:22:37 UTC (rev 75689)
@@ -823,38 +823,36 @@
   <!-- 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"/>
-            </not>
-            <not>
-                <equals arg1="" arg2="${proxy.port}" trim="true"/>
-            </not>
-        </and>
+      <and>
+        <isset property="proxy.host"/>
+        <isset property="proxy.port"/>
+        <not>
+          <equals arg1="" arg2="${proxy.host}" trim="true"/>
+        </not>
+        <not>
+          <equals arg1="" arg2="${proxy.port}" trim="true"/>
+        </not>
+      </and>
     </condition>
 
-  <!-- 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"/>
-            </not>
-            <not>
-                <equals arg1="" arg2="${proxy.password}" trim="true"/>
-            </not>
-        </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"/>
+        </not>
+        <not>
+          <equals arg1="" arg2="${proxy.password}" trim="true"/>
+        </not>
+      </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>