flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject flex-blazeds git commit: remove dependency on antcontrib
Date Wed, 10 Dec 2014 01:45:23 GMT
Repository: flex-blazeds
Updated Branches:
  refs/heads/master 65183f6fc -> 6b02b4960


remove dependency on antcontrib


Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/6b02b496
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/6b02b496
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/6b02b496

Branch: refs/heads/master
Commit: 6b02b49605876089baf33426490f96a1eb2fa863
Parents: 65183f6
Author: Alex Harui <aharui@apache.org>
Authored: Tue Dec 9 17:45:12 2014 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Dec 9 17:45:12 2014 -0800

----------------------------------------------------------------------
 apps/blazeds/build.xml              |   7 ++-
 apps/ds-console/build.xml           |  12 ++--
 apps/team/build.xml                 |  52 ++++++++--------
 build.xml                           | 100 ++++++++++++++-----------------
 modules/common/build.xml            |   2 -
 modules/core/build.xml              |   3 +-
 modules/opt/build.xml               |  96 ++++++++++++++---------------
 modules/proxy/build.xml             |   3 +-
 modules/remoting/build.xml          |   3 +-
 modules/sdk/build.xml               |  94 +++++++++++++++--------------
 qa/apps/qa-manual/build.xml         |  26 ++++----
 qa/apps/qa-regress/build.xml        |  66 ++++++++++----------
 qa/resources/webtier/build.xml      |  23 ++++---
 resources/fds-ajax-bridge/build.xml |  24 +++-----
 14 files changed, 242 insertions(+), 269 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/apps/blazeds/build.xml
----------------------------------------------------------------------
diff --git a/apps/blazeds/build.xml b/apps/blazeds/build.xml
index 8d8731b..c47017f 100755
--- a/apps/blazeds/build.xml
+++ b/apps/blazeds/build.xml
@@ -90,9 +90,10 @@
             <fileset dir="${classes.dir}" includes="**/*.class"/>
         </delete>
         <delete quiet="true" file="${dist.dir}/blazeds.war" />
-        <delete quiet="true" dir="${blazeds.war}/WEB-INF/lib" />
-        <delete quiet="true" dir="${blazeds.war}/WEB-INF/src" />
-        <delete quiet="true" file="${blazeds.war}/WEB-INF/flex/version.properties" />
+        <delete quiet="true" dir="${blazeds.war}/WEB-INF/lib" />
+        <delete quiet="true" dir="${blazeds.war}/WEB-INF/src" />
+        <delete quiet="true" file="${blazeds.war}/WEB-INF/flex/version.properties" />
+        <echo>apps/blazeds clean</echo>
     </target>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/apps/ds-console/build.xml
----------------------------------------------------------------------
diff --git a/apps/ds-console/build.xml b/apps/ds-console/build.xml
index 844583e..4abf7af 100755
--- a/apps/ds-console/build.xml
+++ b/apps/ds-console/build.xml
@@ -43,8 +43,6 @@
     <target name="ds-console" depends="compile,compile-swf"/>
 
     <property environment="env"/>
-    <property name="ant-contrib.jar" location="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>
 
     <target name="prepare">
         <mkdir dir="${ds-console.war}/WEB-INF/src"/>
@@ -143,7 +141,7 @@
         </war>
     </target>
 
-    <target name="clean" description="--> Removes jars and classes">
+    <target name="clean" description="--> Removes jars and classes">
         <delete quiet="true">
             <fileset dir="${ds-console.war}/" includes="swfobject.js,index.html,console.swf,expressInstall.swf,history/*"/>
         </delete>
@@ -166,10 +164,10 @@
             <fileset dir="${classes.dir}" includes="**/*.class"/>
         </delete>
         <delete quiet="true" file="${dist.dir}/console.war"/>
-        <delete quiet="true" file="${dist.dir}/ds-console.war"/>
-        <delete quiet="true" dir="${ds-console.war}/history" />
-        <delete quiet="true" dir="${ds-console.war}/WEB-INF/lib" />
-        <delete quiet="true" dir="${ds-console.war}/WEB-INF/classes" />
+        <delete quiet="true" file="${dist.dir}/ds-console.war"/>
+        <delete quiet="true" dir="${ds-console.war}/history" />
+        <delete quiet="true" dir="${ds-console.war}/WEB-INF/lib" />
+        <delete quiet="true" dir="${ds-console.war}/WEB-INF/classes" />
 
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/apps/team/build.xml
----------------------------------------------------------------------
diff --git a/apps/team/build.xml b/apps/team/build.xml
index 135d6b9..f41ca33 100755
--- a/apps/team/build.xml
+++ b/apps/team/build.xml
@@ -23,22 +23,18 @@
 <project name="team.war/build.xml" default="main" basedir="../..">
 
     <property file="${basedir}/build.properties" />
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
     <property name="team.war" value="${basedir}/apps/team" />
     <property name="dist.dir" value="${basedir}/dist" />
     <property name="src.dir" value="${team.war}/WEB-INF/src" />
     <property name="classes.dir" value="${team.war}/WEB-INF/classes" />
-    <if>
+    <condition property="template.dir" value="client-side-detection-with-history">
         <equals arg1="${sdk.version}" arg2="3"/>
-        <then>
-            <property name="template.dir" value="client-side-detection-with-history"/>
-            <property name="war.filename" value="team-sdk3.war"/>
-        </then>            
-        <else>
-            <property name="template.dir" value=""/>
-            <property name="war.filename" value="team.war"/>
-        </else>        
-    </if>
+    </condition>
+    <property name="template.dir" value=""/>
+    <condition property="war.filename" value="team-sdk3.war">
+        <equals arg1="${sdk.version}" arg2="3"/>
+    </condition>
+    <property name="war.filename" value="team.war"/>
 
     <path id="classpath">
         <fileset dir="${team.war}/WEB-INF/lib" includes="**/*.jar" />
@@ -146,16 +142,16 @@
         <delete quiet="true">
             <fileset dir="${team.war}/WEB-INF/lib" includes="${webapp.ce.lib},${webtier.lib},${jgroups.jars}"
/>
             <fileset dir="${team.war}/WEB-INF" includes="web.xml"/>
-            <fileset dir="${team.war}/WEB-INF/flex">
-                <include name="*-manifest.xml" />
-                <include name="air-config.xml"/>
-                <include name="flex-config.xml"/>
-                <include name="flex-webtier-config.xml"/>
-                <include name="flash-unicode-table.xml"/>
-                <include name="flex-sdk-description.xml" />
-                <include name="*.ser"/>
-                <include name="locale/**/*"/>
-                <include name="themes/**/*"/>
+            <fileset dir="${team.war}/WEB-INF/flex">
+                <include name="*-manifest.xml" />
+                <include name="air-config.xml"/>
+                <include name="flex-config.xml"/>
+                <include name="flex-webtier-config.xml"/>
+                <include name="flash-unicode-table.xml"/>
+                <include name="flex-sdk-description.xml" />
+                <include name="*.ser"/>
+                <include name="locale/**/*"/>
+                <include name="themes/**/*"/>
             </fileset>
         </delete>
         <delete quiet="true">
@@ -176,13 +172,13 @@
         <delete quiet="true" file="${dist.dir}/${war.filename}" />
         <delete quiet="true" includeEmptyDirs="true">
             <fileset dir="${team.war}/history" includes="**/*"/>
-        </delete>
-        <delete quiet="true" dir="${team.war}/history" />
-        <delete quiet="true" dir="${team.war}/WEB-INF/lib" />
-        <delete quiet="true" dir="${team.war}/WEB-INF/classes" />
-        <delete quiet="true" dir="${team.war}/WEB-INF/flex/jars" />
-        <delete quiet="true" dir="${team.war}/WEB-INF/flex/libs" />
-        <delete quiet="true" dir="${team.war}/WEB-INF/flex/locale" />
+        </delete>
+        <delete quiet="true" dir="${team.war}/history" />
+        <delete quiet="true" dir="${team.war}/WEB-INF/lib" />
+        <delete quiet="true" dir="${team.war}/WEB-INF/classes" />
+        <delete quiet="true" dir="${team.war}/WEB-INF/flex/jars" />
+        <delete quiet="true" dir="${team.war}/WEB-INF/flex/libs" />
+        <delete quiet="true" dir="${team.war}/WEB-INF/flex/locale" />
         <delete quiet="true" dir="${team.war}/WEB-INF/flex/themes" />
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fa95942..4e17b94 100755
--- a/build.xml
+++ b/build.xml
@@ -42,9 +42,6 @@ Each of the main targets for the modules will call clean themselves before
proce
 
     <property name="server.baseurl" value="http://localhost:8400"/>
 
-    <property name="ant-contrib.jar" location="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>
-
     <property name="tmp.dir" value="${basedir}/packagetemp/temp" />
     <property name="local.sdk.dir" value="resources/flex_sdk" />
     
@@ -53,7 +50,30 @@ Each of the main targets for the modules will call clean themselves before
proce
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="ANT_HOME" value="${env.ANT_HOME}"/>
 
-    <target name="check-env" 
+    <condition property="ocx.dir" value="${env.WINDIR}/system32/Macromed/Flash/" >
+        <isset property="env.WINDIR"/>
+    </condition>
+    <condition property="ocx.dir" value="${env.WinDir}/system32/Macromed/Flash/" >
+        <isset property="env.WinDir"/>
+    </condition>
+    <property name="ocx.dir" value="${env.windir}/system32/Macromed/Flash/" />
+
+    <condition property="isFlex3" value="true">
+        <equals arg1="${sdk.version}" arg2="3"/>
+    </condition>
+
+
+    <condition property="installer.exe" value="${fp9.installer.exe}">
+        <equals arg1="${sdk.version}" arg2="3"/>
+    </condition>
+    <property name="installer.exe" value="${fp11.installer.exe}"/>
+
+    <condition property="installer.plugin.exe" value="${fp9.installer.plugin.exe}">
+        <equals arg1="${sdk.version}" arg2="3"/>
+    </condition>
+    <property name="installer.plugin.exe" value="${fp11.installer.plugin.exe}"/>
+
+    <target name="check-env"
         depends="check-flex-home, load-more-properties, check-playerglobal-home" />
     
     <target name="check-flex-home" unless="flexhome.exists"
@@ -180,15 +200,13 @@ Each of the main targets for the modules will call clean themselves
before proce
     </target>
 
     <target name="consoleapp" description="full build of the flex admin app">
-        <if>
-            <equals arg1="${sdk.version}" arg2="3"/>
-            <then>
-                <echo message="Console app doesn't build with SDK 3, skipping."/>
-            </then>
-            <else>
-                <ant antfile="${basedir}/apps/ds-console/build.xml" target="${subproject.target}"/>
-            </else>
-        </if>
+        <antcall target="build.consoleapp" />
+    </target>
+    <target name="build.consoleapp" depends="check.flex3.consoleapp" if="isFlex3">
+        <ant antfile="${basedir}/apps/ds-console/build.xml" target="${subproject.target}"/>
+    </target>
+    <target name="check.flex3.consoleapp" unless="isFlex3" >
+        <echo message="Console app doesn't build with SDK 3, skipping."/>
     </target>
 
     <target name="qaapp" description="full build of the qa app">
@@ -210,23 +228,6 @@ Each of the main targets for the modules will call clean themselves before
proce
     <target name="createMMSFile"
         description="create mms.cfg in order to enable local shared object access"
         if="isWindows">
-        <if>
-            <isset property="env.WINDIR"/>
-            <then>
-                <property name="ocx.dir" value="${env.WINDIR}/system32/Macromed/Flash/"
/>
-            </then>
-            <else>
-                <if>
-                    <isset property="env.WinDir"/>
-                    <then>
-                        <property name="ocx.dir" value="${env.WinDir}/system32/Macromed/Flash/"
/>
-                    </then>
-                    <else>
-                        <property name="ocx.dir" value="${env.windir}/system32/Macromed/Flash/"
/>
-                    </else>
-                </if>
-            </else>
-        </if>
         <!-- Sets the default maximum local shared object storage size to unlimited -->
         <echo file="${ocx.dir}/mms.cfg" append="false">LocalStorageLimit=6</echo>
     </target>
@@ -756,40 +757,17 @@ Each of the main targets for the modules will call clean themselves
before proce
     <target name="ocx" description="Update the ActiveX player to the latest.  You must
CLOSE YOUR BROWSERS for this to work.">
         <property name="ant-contrib.jar" location="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
         
-        
-        <if>
-            <equals arg1="${sdk.version}" arg2="3"/>
-            <then>
-                <property name="installer.exe" value="${fp9.installer.exe}"/>
-                <property name="installer.plugin.exe" value="${fp9.installer.plugin.exe}"/>
-            </then>
-            <else>
-                <property name="installer.exe" value="${fp11.installer.exe}"/>
-                <property name="installer.plugin.exe" value="${fp11.installer.plugin.exe}"/>
-            </else> 
-        </if>
-        
-  
         <available file="${basedir}/qa/automation/bin/${uninstaller.exe}" property="uninstaller.exists"
/>
 
-        <if>
+        <condition property="uninstall.fp" value="true">
             <and>
                 <equals arg1="${uninstaller.exists}" arg2="true" />
                 <not>
                     <equals arg1="${skip.uninstall}" arg2="true" />
                 </not>
             </and>
-            <then>
-                <echo>Uninstalling the old ActiveX and Plugin players.</echo>
-                <exec dir="${basedir}" executable="${basedir}/qa/automation/bin/${uninstaller.exe}"
>
-                    <arg line="-uninstall" />
-                </exec>
-            </then>
-            <else>
-                <echo>Uninstall was skipped.</echo>
-                <echo> - skip.uninstall? ${skip.uninstall}</echo>
-            </else>
-        </if>
+        </condition>
+        <antcall target="actual.uninstall.fp" />
 
         <echo>Installing the new player.</echo>
         <exec dir="${basedir}/bin" executable="${basedir}/bin/${installer.exe}">
@@ -800,6 +778,16 @@ Each of the main targets for the modules will call clean themselves before
proce
            <arg line="-install"/>
         </exec>
     </target>
+    <target name="actual.uninstall.fp" depends="check.uninstall.fp" if="uninstall.fp">
+        <echo>Uninstalling the old ActiveX and Plugin players.</echo>
+        <exec dir="${basedir}" executable="${basedir}/qa/automation/bin/${uninstaller.exe}"
>
+            <arg line="-uninstall" />
+        </exec>
+    </target>
+    <target name="check.uninstall.fp" unless="uninstall.fp" >
+        <echo>Uninstall was skipped.</echo>
+        <echo> - skip.uninstall? ${skip.uninstall}</echo>
+    </target>
 
     <target name="javadoc">
         <delete dir="${basedir}/docs" failonerror="false" includeEmptyDirs="true" />

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/modules/common/build.xml
----------------------------------------------------------------------
diff --git a/modules/common/build.xml b/modules/common/build.xml
index 8ef6c38..6644d33 100755
--- a/modules/common/build.xml
+++ b/modules/common/build.xml
@@ -36,8 +36,6 @@
         <fileset dir="${lib.dir}" includes="**/*.jar"/>
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
     <target name="main" depends="clean,prepare,run-depend,jar" description="cleans and
runs the full build"/>
 
     <target name="prepare">

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/modules/core/build.xml
----------------------------------------------------------------------
diff --git a/modules/core/build.xml b/modules/core/build.xml
index 9053766..84d1c84 100755
--- a/modules/core/build.xml
+++ b/modules/core/build.xml
@@ -45,8 +45,6 @@
         <fileset dir="${tomcat.lib.dir}" erroronmissingdir="false" includes="**/*.jar"/>
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
     <target name="main" depends="clean,prepare,run-depend,jar" description="cleans and
runs the full build"/>
     <target name="dev" depends="prepare,run-depend,jar" description="runs src.depend build
for development"/>
 
@@ -120,6 +118,7 @@
             </fileset>
         </delete>
         <delete dir="${module.classes}" failonerror="false" includeEmptyDirs="true"/>
+        <echo>modules/core clean</echo>
     </target>
 
    <target name="javadoc">

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/modules/opt/build.xml
----------------------------------------------------------------------
diff --git a/modules/opt/build.xml b/modules/opt/build.xml
index 36f91b1..036ff8f 100755
--- a/modules/opt/build.xml
+++ b/modules/opt/build.xml
@@ -18,7 +18,6 @@
 
 -->
 <project name="modules/opt/build.xml" default="main" basedir="../..">
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
 
     <!-- properties -->
     <property file="${basedir}/build.properties"/>
@@ -48,15 +47,10 @@
 
     <property name="build.number" value=""/>
 
-    <if >
+    <condition property="javacexecutable" value="javac.exe">
         <os family="windows" />
-        <then>
-            <property name="javacexecutable" value="javac.exe"/>
-        </then>
-        <else>
-             <property name="javacexecutable" value="javac"/>
-        </else>
-    </if>
+    </condition>
+    <property name="javacexecutable" value="javac"/>
  
     <path id="base.classpath">
         <fileset dir="${lib.dir}" includes="**/*.jar"/>
@@ -125,8 +119,6 @@
         </fileset>
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
     <target name="main" depends="clean,prepare,run-depend,jar" description="cleans and
runs the full build"/>
 
     <target name="prepare">
@@ -238,21 +230,21 @@
 	<target name="compile-weblogic" depends="prepare" description="compile the weblogic-related
classes">
 		<mkdir dir="${weblogic.src}"/>
 		<available file="${module.lib.dir}/weblogic.jar" property="isWeblogic"/>
-		<if>
-			<equals arg1="${isWeblogic}" arg2="true" />
-			<then>
-				<echo message="**** compiling with weblogic jar ****" />
-				<javac debug="${src.debug}" destdir="${module.classes}" srcdir="${weblogic.src}" 
-				classpathref="weblogic.classpath">
-				<include name="**/*.java"/>
-				</javac>    
-			</then>
-			<else>
-				<echo message="**** compiling without weblogic jar ****" />
-			</else>
-		</if>
+		<antcall target="actual.weblogic.compile" />
 	</target>
-	
+
+    <target name="check.weblogic" unless="isWeblogic" >
+        <echo message="**** compiling without weblogic jar ****" />
+    </target>
+
+    <target name="actual.weblogic.compile" depends="check.weblogic" if="isWeblogic" >
+        <echo message="**** compiling with weblogic jar ****" />
+        <javac debug="${src.debug}" destdir="${module.classes}" srcdir="${weblogic.src}"
+            classpathref="weblogic.classpath">
+            <include name="**/*.java"/>
+        </javac>    
+    </target>
+    
 	<!--If asynchbeans.jar is present it looks for sas.jar and wsexception.jar otherwise
the build will fail -->
 	<target name="compile-websphere" depends="prepare" description="compile the websphere-related
classes">
 		<mkdir dir="${websphere.src}"/>
@@ -263,20 +255,20 @@
 				<available file="${module.lib.dir}/wsexception.jar"/>
 			</and>
 		</condition>
-		<if>
-			<equals arg1="${isWebsphere}" arg2="true" />
-			<then>
-				<echo message="**** compiling with websphere jars: asynchbeans jar, sas.jar and wsexception.jar
****" />
-				<javac debug="${src.debug}" destdir="${module.classes}" srcdir="${websphere.src}"
-				classpathref="websphere.classpath">
-				<include name="**/*.java"/>
-				</javac>    
-			</then>
-			<else>
-				<echo message="**** compiling without websphere jars: asynchbeans jar, sas.jar and
wsexception.jar ****" />
-			</else>
-		</if>
+        <antcall target="actual.websphere.compile" />
 	</target>
+    
+    <target name="check.websphere" unless="isWebsphere" >
+        <echo message="**** compiling without websphere jars: asynchbeans jar, sas.jar
and wsexception.jar ****" />
+    </target>
+    
+    <target name="actual.websphere.compile" depends="check.websphere" if="isWebsphere"
>
+        <echo message="**** compiling with websphere jars: asynchbeans jar, sas.jar and
wsexception.jar ****" />
+        <javac debug="${src.debug}" destdir="${module.classes}" srcdir="${websphere.src}"
+            classpathref="websphere.classpath">
+            <include name="**/*.java"/>
+        </javac>
+    </target>
 	
 	<!-- Both the jar "jazncore and oc4j-api" files are in and condition because both are
interdependent and with the absense of either one jar the build will fail.-->
 	<target name="compile-oracle" depends="prepare" description="compile the oracle-related
classes">
@@ -287,20 +279,21 @@
 				<available file="${module.lib.dir}/oc4j-api.jar"/>
 			</and>
 		</condition>
-		<if>
-			<equals arg1="${isOracle}" arg2="true" />
-			<then>
-				<echo message="**** compiling with oracle jar ****" />
-				<javac debug="${src.debug}" destdir="${module.classes}" srcdir="${oracle.src}"
-                 classpathref="oracle.classpath">
-				<include name="**/*.java"/>
-				</javac>     
-			</then>
-			<else>
-				<echo message="**** compiling without oracle jar ****" />
-			</else>
-		</if>
+        <antcall target="actual.oracle.compile" />
 	</target>
+    
+    <target name="check.oracle" unless="isOracle" >
+        <echo message="**** compiling without oracle jar ****" />
+    </target>
+    
+    <target name="actual.oracle.compile" depends="check.oracle" if="isOracle" >
+        <echo message="**** compiling with oracle jar ****" />
+        <javac debug="${src.debug}" destdir="${module.classes}" srcdir="${oracle.src}"
+            classpathref="oracle.classpath">
+            <include name="**/*.java"/>
+        </javac>
+    </target>
+    
 	<!--Edit Ends here; Making the dependencies of weblogic.jar, asynchbeans.jar, jazncore.jar
and oc4j-api.jar conditional-->
 	      
     <target name="jar" depends="compile-jrun,jar-tomcat,compile-oracle,compile-weblogic,compile-websphere">
@@ -345,6 +338,7 @@
         <delete file="${tomcat.jar.dir}/${tomcat.valve}" failonerror="false"/>
         <delete dir="${appserver.dir}/lib/blazeds" failonerror="false" />
         <delete dir="${module.classes}" failonerror="false" />
+        <echo>modules/opt clean</echo>
     </target>
 
 </project>

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/modules/proxy/build.xml
----------------------------------------------------------------------
diff --git a/modules/proxy/build.xml b/modules/proxy/build.xml
index 86e03f9..d8318bd 100755
--- a/modules/proxy/build.xml
+++ b/modules/proxy/build.xml
@@ -37,8 +37,6 @@
         <fileset dir="${tomcat.lib.dir}" includes="**/*.jar"/>
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
     <target name="main" depends="clean,prepare,run-depend,jar" description="cleans and
runs the full build"/>
 
     <target name="prepare">
@@ -61,6 +59,7 @@
             </fileset>
         </delete>
         <delete quiet="true" dir="${module.classes}" />
+        <echo>modules/proxy clean</echo>
     </target>
 
     <target name="compile" depends="prepare" description="compile">

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/modules/remoting/build.xml
----------------------------------------------------------------------
diff --git a/modules/remoting/build.xml b/modules/remoting/build.xml
index b5be701..8cee396 100755
--- a/modules/remoting/build.xml
+++ b/modules/remoting/build.xml
@@ -35,8 +35,6 @@
         <fileset dir="${lib.dir}" includes="**/*.jar"/>
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
     <target name="main" depends="clean,prepare,run-depend,jar" description="cleans and
runs the full build"/>
 
     <target name="prepare">
@@ -59,6 +57,7 @@
             </fileset>
         </delete>
         <delete quiet="true" dir="${module.classes}" />
+        <echo>modules/remoting clean</echo>
     </target>
 
     <target name="compile" depends="prepare" description="compile">

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/modules/sdk/build.xml
----------------------------------------------------------------------
diff --git a/modules/sdk/build.xml b/modules/sdk/build.xml
index 0c172db..df53213 100755
--- a/modules/sdk/build.xml
+++ b/modules/sdk/build.xml
@@ -19,8 +19,6 @@
 -->
 <project name="modules/sdk/build.xml" default="main" basedir="../..">
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-
     <!-- properties -->
     <property file="${basedir}/build.properties"/>
     <property name="lib.dir" value="${basedir}/lib"/>
@@ -99,38 +97,19 @@
 
         <!-- If using SDK3 copy dmv swcs for SDK 3 to frameworks\libs directory -->
 
-        <if>
+        <condition property="isFlex3" value="true">
             <equals arg1="${sdk.version}" arg2="3"/>
-            <then>
-                <copy todir="${basedir}/frameworks/libs">
-                    <fileset dir="${sdk.zip.dir}/dmv/">
-                        <include name="datavisualization.swc"/>
-                    </fileset>
-                </copy>
-                <copy todir="${basedir}/frameworks/locale">
-                    <fileset dir="${sdk.zip.dir}/dmv/locale">
-                        <include name="**/*.swc"/>
-                    </fileset>
-                </copy>
-            </then>
-        </if>
+        </condition>
+        <antcall target="copy.flex3.dmv" />
 
         <!-- 
              Override with any custom "local" swcs. These swcs are written over the
              base set of accepted swcs that have been unpacked or copied above. 
         -->
-        <if>
+        <condition property="using.local.swcs" value="true">
             <istrue value="${use.local.swcs}"/>
-            <then>
-                <echo message="Processing local swc overrides..."/>
-                <copy todir="${basedir}/frameworks/libs">
-                    <fileset dir="${basedir}/frameworks/local-swcs/">
-                        <include name="**/*"/>
-                        <exclude name="readme.txt"/>
-                    </fileset>
-                </copy>
-            </then>
-        </if>
+        </condition>
+        <antcall target="copy.local.swcs" />
 
         <!-- set swcs read only -->
         <!-- attrib only works on windows -->
@@ -166,29 +145,51 @@
         <!-- When the build is instrumented, command line compilation fails
               if clover.jar is not in the classpath 
         -->
-        <if>
-            <istrue value="${build.is.instrumented}"/>
-            <then>
-                <echo message="adding clover.jar to bin/jvm.config's classpath...."/>
-                <replace file="${basedir}/bin/jvm.config" token="java.class.path="
-                         value="java.class.path=c:/depot/flex/enterprise/lib/clover.jar"/>
-
-                <echo message="Updating mxmlc.jar's manifest to include clover.jar"/>
-                <copy file="${basedir}/lib/mxmlc.jar" tofile="${basedir}/lib/mxmlc.jar.orig"/>
-
-                <unjar src="${basedir}/lib/mxmlc.jar" dest="${basedir}/lib/ccTemp"/>
-
-                <replace file="${basedir}/lib/ccTemp/META-INF/MANIFEST.MF">
-                    <replacefilter token="Class-Path:" value="Class-Path: clover.jar"/>
-                </replace>
+        <antcall target="instrumented.build" />
 
-                <jar basedir="${basedir}/lib/ccTemp" destfile="${basedir}/lib/mxmlc.jar"
-                     manifest="${basedir}/lib/ccTemp/META-INF/MANIFEST.MF"/>
-            </then>
-        </if>
+    </target>
 
+    <target name="copy.flex3.dmv" if="isFlex3" >
+        <copy todir="${basedir}/frameworks/libs">
+            <fileset dir="${sdk.zip.dir}/dmv/">
+                <include name="datavisualization.swc"/>
+            </fileset>
+        </copy>
+        <copy todir="${basedir}/frameworks/locale">
+            <fileset dir="${sdk.zip.dir}/dmv/locale">
+                <include name="**/*.swc"/>
+            </fileset>
+        </copy>
+    </target>
+    
+    <target name="copy.local.swcs" if="using.local.swcs">
+        <echo message="Processing local swc overrides..."/>
+        <copy todir="${basedir}/frameworks/libs">
+            <fileset dir="${basedir}/frameworks/local-swcs/">
+                <include name="**/*"/>
+                <exclude name="readme.txt"/>
+            </fileset>
+        </copy>
     </target>
 
+    <target name="instrumented.build" if="build.is.instrumented">
+        <echo message="adding clover.jar to bin/jvm.config's classpath...."/>
+        <replace file="${basedir}/bin/jvm.config" token="java.class.path="
+        value="java.class.path=c:/depot/flex/enterprise/lib/clover.jar"/>
+        
+        <echo message="Updating mxmlc.jar's manifest to include clover.jar"/>
+        <copy file="${basedir}/lib/mxmlc.jar" tofile="${basedir}/lib/mxmlc.jar.orig"/>
+        
+        <unjar src="${basedir}/lib/mxmlc.jar" dest="${basedir}/lib/ccTemp"/>
+        
+        <replace file="${basedir}/lib/ccTemp/META-INF/MANIFEST.MF">
+            <replacefilter token="Class-Path:" value="Class-Path: clover.jar"/>
+        </replace>
+        
+        <jar basedir="${basedir}/lib/ccTemp" destfile="${basedir}/lib/mxmlc.jar"
+        manifest="${basedir}/lib/ccTemp/META-INF/MANIFEST.MF"/>
+    </target>
+    
     <target name="clean" description="clean">
         <delete failonerror="true" includeEmptyDirs="true" verbose="true">
             <fileset dir="${lib.dir}" erroronmissingdir="false">
@@ -223,6 +224,7 @@
         <delete quiet="true" dir="${basedir}/frameworks/tests"/>
         <delete quiet="true" dir="${basedir}/frameworks/themes"/>
         <delete quiet="true" dir="${basedir}/frameworks/flash-integration"/>
+        <echo>modules/sdk cleaned</echo>
     </target>
 
 </project>

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/qa/apps/qa-manual/build.xml
----------------------------------------------------------------------
diff --git a/qa/apps/qa-manual/build.xml b/qa/apps/qa-manual/build.xml
index 36d72bf..8622f02 100755
--- a/qa/apps/qa-manual/build.xml
+++ b/qa/apps/qa-manual/build.xml
@@ -19,7 +19,6 @@
 -->
 <project name="qa-manual.war/build.xml" default="main" basedir="../..">
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
     <property name="qa.dir" location="${basedir}"/>
     <property name="blazeds.dir" location="${qa.dir}/.."/>
     
@@ -38,21 +37,23 @@
     
     <property name="qa.frameworks.dir" value="${qa.dir}/frameworks"/>
     
-    <if>
+    <condition property="template.dir" value="client-side-detection-with-history">
         <equals arg1="${sdk.version}" arg2="3"/>
-        <then>
-            <property name="template.dir" value="client-side-detection-with-history"/>
-            <property name="qa-manual.war.file" value="qa-manual-sdk3.war"/>
-        </then>            
-        <else>
-            <property name="template.dir" value=""/>
-            <property name="qa-manual.war.file" value="qa-manual.war"/>
-        </else>        
-    </if>
+    </condition>
+    <condition property="qa-manual.war.file" value="qa-manual-sdk3.war">
+        <equals arg1="${sdk.version}" arg2="3"/>
+    </condition>
+    <property name="template.dir" value=""/>
+    <property name="qa-manual.war.file" value="qa-manual.war"/>
+
+    <condition property="flextasks.dir" value="${FLEX_HOME}/ant/lib">
+        <available file="${FLEX_HOME}/ant/lib/flexTasks.jar" />
+    </condition>
+    <property name="flextasks.dir" value="${FLEX_HOME}/lib" />
 
     <path id="qa-manual-classpath">
         <fileset dir="${qa-manual.war}/WEB-INF/lib" includes="**/*.jar"/>
-        <fileset dir="${FLEX_HOME}/ant/lib" includes="flexTasks.jar"/>
+        <fileset dir="${flextasks.dir}" includes="flexTasks.jar"/>
         <pathelement location="${servlet.jar}"/>
         <pathelement location="${jms.jar}"/>
     </path>
@@ -60,6 +61,7 @@
     <path id="qa.classpath">
         <pathelement location="${qa.dir}/classes" />
         <fileset dir="${qa.dir}/lib" includes="**/*.jar"/>
+        <fileset dir="${blazeds.dir}/lib" includes="**/*.jar"/>
         <fileset dir="${FLEX_HOME}/lib/external" includes="xercesImpl.jar"/>
     </path>
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/qa/apps/qa-regress/build.xml
----------------------------------------------------------------------
diff --git a/qa/apps/qa-regress/build.xml b/qa/apps/qa-regress/build.xml
index c69d973..6f8fe53 100755
--- a/qa/apps/qa-regress/build.xml
+++ b/qa/apps/qa-regress/build.xml
@@ -20,7 +20,6 @@
 <project name="qa-regress.war/build.xml" default="main" basedir="../.."> <!-- flex/qa
-->
 
     <property environment="env"/>
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
     <property name="qa.dir" value="${basedir}" />
     <property name="blazeds.dir" value="${qa.dir}/.."/>
        
@@ -43,22 +42,24 @@
     <property name="nowarn" value="on" />   
     <property name="server" value="${build.number}"/>
     
-    <if>
+    <condition property="template.dir" value="client-side-detection-with-history">
         <equals arg1="${sdk.version}" arg2="3"/>
-        <then>
-            <property name="template.dir" value="client-side-detection-with-history"/>
-            <property name="qa-regress.war.file" value="qa-regress-sdk3.war"/>
-        </then>            
-        <else>
-            <property name="template.dir" value=""/>
-            <property name="qa-regress.war.file" value="qa-regress.war"/>
-        </else>        
-    </if>
-
+    </condition>
+    <condition property="qa-regress.war.file" value="qa-regress-sdk3.war">
+        <equals arg1="${sdk.version}" arg2="3"/>
+    </condition>
+    <property name="template.dir" value=""/>
+    <property name="qa-regress.war.file" value="qa-regress.war"/>
+    
+    <condition property="flextasks.dir" value="${FLEX_HOME}/ant/lib">
+        <available file="${FLEX_HOME}/ant/lib/flexTasks.jar" />
+    </condition>
+    <property name="flextasks.dir" value="${FLEX_HOME}/lib" />
+        
 
     <path id="classpath">
         <fileset dir="${qa.war}/WEB-INF/lib" includes="**/*.jar"/>
-        <fileset dir="${FLEX_HOME}/ant/lib" includes="flexTasks.jar"/>
+        <fileset dir="${flextasks.dir}" includes="flexTasks.jar"/>
         <pathelement location="${jms.jar}"/>
         <pathelement location="${servlet.jar}"/>
         <pathelement location="${xalan.jar}"/>
@@ -66,6 +67,7 @@
 
     <path id="qa.classpath">
         <fileset dir="${qa.dir}/lib" includes="**/*.jar"/>
+        <fileset dir="${blazeds.dir}/lib" includes="**/*.jar"/>
         <!--fileset dir="${ANT_HOME}/lib" includes="**/*.jar"/>
         <fileset dir="${FLEX_HOME}/ant/lib" includes="flexTasks.jar"/-->
         <fileset dir="${FLEX_HOME}/lib/external" includes="xercesImpl.jar"/>
@@ -128,15 +130,11 @@
     
     <target name="copy-resources" depends="copy-webtier">
         
-       <if>
+        <condition property="runtype.spring" value="true">
             <equals arg1="${runtype}" arg2="spring" />
-            <then>
-                <!-- replace web.xml with web.xml.spring -->
-                <copy file="${qa.war}/WEB-INF/web.xml" tofile="${qa.war}/WEB-INF/web.xml.orig"/>
-                <delete file="${qa.war}/WEB-INF/web.xml"/>
-                <copy file="${qa.war}/WEB-INF/web.xml.spring" tofile="${qa.war}/WEB-INF/web.xml"/>
                       
-            </then>
-        </if>
+        </condition>
+        <antcall target="copy.if.spring" />
+        
         <!-- copy to the WEB-INF/flex directory -->
         <copy todir="${qa.war}/WEB-INF/flex">
             <fileset dir="${blazeds.dir.frameworks.dir}">
@@ -193,6 +191,13 @@
         </propertyfile>
     </target>
 
+    <target name="copy.if.spring" if="runtype.spring" >
+        <!-- replace web.xml with web.xml.spring -->
+        <copy file="${qa.war}/WEB-INF/web.xml" tofile="${qa.war}/WEB-INF/web.xml.orig"/>
+        <delete file="${qa.war}/WEB-INF/web.xml"/>
+        <copy file="${qa.war}/WEB-INF/web.xml.spring" tofile="${qa.war}/WEB-INF/web.xml"/>
+    </target>
+    
     <target name="copy.automation.resources" description="Copy QA Resources..." >
         <!-- delete old folders -->
         <delete>
@@ -305,18 +310,19 @@
 
         <delete dir="${config.dir}/mergeGenerated" quiet="true"/>
         
-        <if>
+        <condition property="runtype.validators" value="true">
             <equals arg1="${runtype}" arg2="validators" />
-            <then>
-                <!-- replace services-config.xml with services-config.validators.xml for
class deserialization validator testing -->
-                <copy file="${qa.war}/WEB-INF/flex/services-config.xml" tofile="${qa.war}/WEB-INF/flex/services-config.xml.orig"/>
-                <delete file="${qa.war}/WEB-INF/flex/services-config.xml"/>
-                <copy file="${qa.war}/WEB-INF/flex/services-config.validators.xml" tofile="${qa.war}/WEB-INF/flex/services-config.xml"/>
-            </then>
-        </if>
+        </condition>
+        <antcall target="copy.if.validators" />
     </target>
 
-
+    <target name="copy.if.validators" if="runtype.validators" >
+        <!-- replace services-config.xml with services-config.validators.xml for class
deserialization validator testing -->
+        <copy file="${qa.war}/WEB-INF/flex/services-config.xml" tofile="${qa.war}/WEB-INF/flex/services-config.xml.orig"/>
+        <delete file="${qa.war}/WEB-INF/flex/services-config.xml"/>
+        <copy file="${qa.war}/WEB-INF/flex/services-config.validators.xml" tofile="${qa.war}/WEB-INF/flex/services-config.xml"/>
+    </target>
+    
     <target name="generate-deployable-config-files" depends="generate-config-files"
             description="--> Remove relative paths from config files.  Override 'config.sourcedir'
to specify a different source location for the original config files." >
         <property name="config.sourcedir" location="${qa.dir}/resources/config" />

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/qa/resources/webtier/build.xml
----------------------------------------------------------------------
diff --git a/qa/resources/webtier/build.xml b/qa/resources/webtier/build.xml
index 78b0c32..6d2dfe3 100755
--- a/qa/resources/webtier/build.xml
+++ b/qa/resources/webtier/build.xml
@@ -22,7 +22,6 @@
     <!-- properties -->
     <property file="${basedir}/build.properties" />
     <property environment="env"/>
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${env.ANT_HOME}/lib/ant-contrib-1.0b2.jar"/>
 
     <property name="lib.dir" value="${basedir}/lib"/>
     <property name="webtier.dir" value="${basedir}/qa/resources/webtier"/>
@@ -48,15 +47,15 @@
         </delete>
         <delete failonerror="false">
             <fileset dir="${config.dir}" erroronmissingdir="false">
-                <include name="flex*.xml"/>
+                <include name="flex*.xml"/>
                 <include name="air-config.xml"/>
             </fileset>
         </delete>
-        <delete quiet="true" dir="${basedir}/qa/lib" includes="browserServer.jar,qa-config.jar,qa-flexunit.jar,qa-jasmine.jar,qa-mxunit.jar,qa-utils.jar,xalan.jar"/>
-        <delete quiet="true" dir="${basedir}/qa/resources/frameworks/expanded" />
-        <delete quiet="true" dir="${basedir}/qa/frameworks" />
-    </target>
-
+        <delete quiet="true" dir="${basedir}/qa/lib" includes="browserServer.jar,qa-config.jar,qa-flexunit.jar,qa-jasmine.jar,qa-mxunit.jar,qa-utils.jar,xalan.jar"/>
+        <delete quiet="true" dir="${basedir}/qa/resources/frameworks/expanded" />
+        <delete quiet="true" dir="${basedir}/qa/frameworks" />
+    </target>
+
     
     <target name="copy">        
         <!-- copy version specific webtier jars -->     
@@ -65,7 +64,7 @@
                 <patternset refid="webtier.jars"/>
             </fileset>
         </copy>
-        
+        
         <!-- copy version specific config files -->
         <copy todir="${config.dir}">
             <fileset dir="${FLEX_HOME}/frameworks">
@@ -74,9 +73,9 @@
             </fileset>
         </copy> 
 
-        <!-- aharui commented out the next step
-             I don't think we want to hack in the halo
-             theme as a default -->
+        <!-- aharui commented out the next step
+             I don't think we want to hack in the halo
+             theme as a default -->
         <!-- copy our modified flex-config.xml and air-config.xml files to 
              the frameworks dir. this is so we can use the halo theme 
         <copy todir="${frameworks.dir}" overwrite="true">
@@ -84,7 +83,7 @@
                 <include name="flex*.xml"/>
                 <include name="air*.xml"/>
             </fileset>
-        </copy>
+        </copy>
         -->
      </target>
         

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/6b02b496/resources/fds-ajax-bridge/build.xml
----------------------------------------------------------------------
diff --git a/resources/fds-ajax-bridge/build.xml b/resources/fds-ajax-bridge/build.xml
index 770f9b0..6a6a721 100755
--- a/resources/fds-ajax-bridge/build.xml
+++ b/resources/fds-ajax-bridge/build.xml
@@ -38,24 +38,16 @@ To use the fds-ajax-bridge, run this build file
     <property name="qa.app.war" location="${blazeds.dir}/qa/apps/qa-manual" />
     <property name="qa.config.file" value="${qa.app.war}/WEB-INF/flex/services-config.xml"/>
 	
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-	
-	<path id="classpath">			
+    <!--override the value of class path if the build is being instrumented for code coverage
-->
+    <condition property="classpath.lib.folder" value="../../lib">
+        <istrue value="${build.is.instrumented}"/>
+    </condition>
+    <property name="classpath.lib.folder" value="${blazeds.dir}/lib" />
+    
+	<path id="classpath">
 		<fileset dir="${app.war}/WEB-INF/flex/jars" includes="*.jar"/> 
-        <fileset dir="${blazeds.dir}/lib" includes="clover.jar"/>
+        <fileset dir="${classpath.lib.folder}" includes="clover.jar"/>
     </path>
-
-	<!--override the value of class path if the build is being instrumented for code coverage
-->
-	<if>
-        <istrue value="${build.is.instrumented}"/>
-     <then>		
-		<path id="classpath">			
-			<fileset dir="${app.war}/WEB-INF/flex/jars" includes="*.jar"/> 
-            <fileset dir="../../lib" includes="clover.jar"/>
-        </path>
-     </then>	 	
-    </if>
-
     
     <target name="main" depends="clean,dev" description="Cleans and builds the fds-ajax
bridge on dev application"/>
 


Mime
View raw message