You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2024/03/04 22:54:50 UTC

(flex-flexunit) branch develop updated (b6a6698 -> 2da1a17)

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/flex-flexunit.git


    from b6a6698  README: Update Java/Ant requirements
     new 15a4401  Auto-detect flex-sdk in same parent directory as flex-flexunit, if env.FLEX_HOME isn't set
     new a0a8852  make indentation more consistent across build files
     new b78064e  FlexUnit4SampleCIProject: this detection of FLEX_HOME shouldn't have changed
     new bd20b2a  optional env.properties file
     new 2da1a17  .gitignore: rat.report and /out/

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |   3 +
 FlexUnit4/build.xml                                | 428 +++++------
 FlexUnit4AirCIListener/build.xml                   | 182 ++---
 FlexUnit4AntTasks/build.xml                        | 162 ++--
 FlexUnit4CIListener/build.xml                      | 170 ++---
 FlexUnit4FlexCoverListener/build.xml               |   8 +-
 FlexUnit4FluintExtensions/build.xml                | 176 ++---
 FlexUnit4SampleCIProject/build.browser.xml         |  32 +-
 FlexUnit4SampleCIProject/build.custom.xml          |  32 +-
 FlexUnit4SampleCIProject/build.xml                 |  32 +-
 FlexUnit4SampleCIProject/pom.xml                   | 138 ++--
 FlexUnit4Test/build.xml                            | 360 ++++-----
 .../Unit1/Start/FlexUnit4Training/downloads.xml    | 250 +++----
 FlexUnit4UIListener/build.xml                      | 306 ++++----
 FlexUnit4UIListener/src/design.xml                 |  44 +-
 build.xml                                          | 818 ++++++++++-----------
 build/tag_release.sh => env-template.properties    |  42 +-
 17 files changed, 1617 insertions(+), 1566 deletions(-)
 copy build/tag_release.sh => env-template.properties (51%)
 mode change 100755 => 100644


(flex-flexunit) 02/05: make indentation more consistent across build files

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/flex-flexunit.git

commit a0a88526bd2fab2713f4786f40622962fea4f8d5
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Mon Mar 4 14:20:07 2024 -0800

    make indentation more consistent across build files
---
 FlexUnit4/build.xml                                | 436 +++++------
 FlexUnit4AirCIListener/build.xml                   | 190 ++---
 FlexUnit4AntTasks/build.xml                        | 162 ++--
 FlexUnit4CIListener/build.xml                      | 178 ++---
 FlexUnit4FluintExtensions/build.xml                | 184 ++---
 FlexUnit4SampleCIProject/pom.xml                   | 138 ++--
 FlexUnit4Test/build.xml                            | 368 +++++-----
 .../Unit1/Start/FlexUnit4Training/downloads.xml    | 250 +++----
 FlexUnit4UIListener/build.xml                      | 314 ++++----
 FlexUnit4UIListener/src/design.xml                 |  44 +-
 build.xml                                          | 817 ++++++++++-----------
 11 files changed, 1539 insertions(+), 1542 deletions(-)

diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index 595b2ad..72dffd9 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,40 +16,40 @@
   limitations under the License.
 -->
 <project name="FlexUnit4Core" basedir="." default="package">
-   <import file="${basedir}/../utils.xml" />
-   <property environment="env" />
-
-   <!-- Configuration -->
-   <property name="build.artifactId" value="flexunit" />
-   <property name="build.finalName.flex" value="${build.artifactId}-${build.version}-${build.number}-flex_${build.sdk}" />
-   <property name="build.finalName.as3" value="${build.artifactId}-${build.version}-${build.number}-as3_${build.sdk}" />
-   <property name="build.packaging" value="swc" />
-   <property name="instrument.finalName" value="instrument" />
-   <property name="instrument.metadata" value="flexunit-instrument.cvm" />
-   <property name="build.deploy.name" value="FlexUnit Core Library" />
-   <property name="build.deploy.description" value="FlexUnit core library" />
-
-   <!-- Existing -->
-   <property name="src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/libs" />
-
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="report.loc" location="${basedir}/target/report" />
-   <property name="doc.loc" location="${basedir}/target/docs" />
-
-   <!-- Setup Flex Ant Resources -->
-   <available file="${env.FLEX_HOME}/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${env.FLEX_HOME}"/>
-   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${basedir}/../../flex-sdk"/>
-   <property name="FLEX_COVER_HOME" location="${env.FLEX_COVER_HOME}" />
+	<import file="${basedir}/../utils.xml" />
+	<property environment="env" />
+
+	<!-- Configuration -->
+	<property name="build.artifactId" value="flexunit" />
+	<property name="build.finalName.flex" value="${build.artifactId}-${build.version}-${build.number}-flex_${build.sdk}" />
+	<property name="build.finalName.as3" value="${build.artifactId}-${build.version}-${build.number}-as3_${build.sdk}" />
+	<property name="build.packaging" value="swc" />
+	<property name="instrument.finalName" value="instrument" />
+	<property name="instrument.metadata" value="flexunit-instrument.cvm" />
+	<property name="build.deploy.name" value="FlexUnit Core Library" />
+	<property name="build.deploy.description" value="FlexUnit core library" />
+
+	<!-- Existing -->
+	<property name="src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/libs" />
+
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="report.loc" location="${basedir}/target/report" />
+	<property name="doc.loc" location="${basedir}/target/docs" />
+
+	<!-- Setup Flex Ant Resources -->
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
+	<property name="FLEX_COVER_HOME" location="${env.FLEX_COVER_HOME}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
@@ -57,191 +57,191 @@
 		</classpath>
 	</taskdef>
 	
-   <!-- Reusable macro for compile SWC variations -->
-   <macrodef name="compile-swc">
-      <attribute name="sdk" />
-      <attribute name="classes" />
-      <attribute name="artifact" />
-      <attribute name="useflex" />
-      <element name="args" optional="true" />
-      <sequential>
-         <echo />
-         <echo message="SDK: @{sdk}" />
-         <echo message="Artifact: @{artifact}" />
-         <echo message="UseFlex: @{useFlex}" />
-         <echo />
-         <java jar="@{sdk}/lib/compc.jar" fork="true" failonerror="true">
-            <jvmarg value="-Xmx256m" />
-            <arg line="+flexlib '@{sdk}/frameworks'" />
-            <arg line="-link-report '${bin.loc}/link-report-@{useflex}.xml'" />
-            <arg line="-include-classes @{classes}" />
-            <arg line="-source-path+='${src.loc}'" />
-            <arg line="-output '${bin.loc}/@{artifact}'" />
-            <arg line="-library-path+='${lib.loc}'" />
-            <arg line="-external-library-path+='@{sdk}/frameworks/libs/'" />
-            <arg line="-keep-as3-metadata+=RunWith,BeforeClass,AfterClass,Before,After,Suite,Test,TestCase,Ignore,Filter,Sort,Theory,DataPoint,DataPoints,ArrayElementType,Rule,Parameters" />
-            <arg line="-define=CONFIG::useFlexClasses,@{useFlex}" />
-            <arg line="-verbose-stacktraces=true" />
-            <arg line="-headless-server=true" />
-            <args />
-         </java>
-      </sequential>
-   </macrodef>
-
-   <target name="clean">
-      <delete dir="${dist.loc}" />
+	<!-- Reusable macro for compile SWC variations -->
+	<macrodef name="compile-swc">
+		<attribute name="sdk" />
+		<attribute name="classes" />
+		<attribute name="artifact" />
+		<attribute name="useflex" />
+		<element name="args" optional="true" />
+		<sequential>
+			<echo />
+			<echo message="SDK: @{sdk}" />
+			<echo message="Artifact: @{artifact}" />
+			<echo message="UseFlex: @{useFlex}" />
+			<echo />
+			<java jar="@{sdk}/lib/compc.jar" fork="true" failonerror="true">
+				<jvmarg value="-Xmx256m" />
+				<arg line="+flexlib '@{sdk}/frameworks'" />
+				<arg line="-link-report '${bin.loc}/link-report-@{useflex}.xml'" />
+				<arg line="-include-classes @{classes}" />
+				<arg line="-source-path+='${src.loc}'" />
+				<arg line="-output '${bin.loc}/@{artifact}'" />
+				<arg line="-library-path+='${lib.loc}'" />
+				<arg line="-external-library-path+='@{sdk}/frameworks/libs/'" />
+				<arg line="-keep-as3-metadata+=RunWith,BeforeClass,AfterClass,Before,After,Suite,Test,TestCase,Ignore,Filter,Sort,Theory,DataPoint,DataPoints,ArrayElementType,Rule,Parameters" />
+				<arg line="-define=CONFIG::useFlexClasses,@{useFlex}" />
+				<arg line="-verbose-stacktraces=true" />
+				<arg line="-headless-server=true" />
+				<args />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<target name="clean">
+		<delete dir="${dist.loc}" />
   	  <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" />
-   </target>
-
-   <target name="init">
-      <!-- Create paths -->
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${apache-maven.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${report.loc}" />
-      <mkdir dir="${doc.loc}" />
-
-      <!-- Create properties file from .flexLibProperties -->
-      <xslt in="${basedir}/.flexLibProperties" out="${bin.loc}/flexLib.properties" style="${basedir}/flexLibProperties.xsl" />
-   </target>
+	</target>
+
+	<target name="init">
+		<!-- Create paths -->
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${apache-maven.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${report.loc}" />
+		<mkdir dir="${doc.loc}" />
+
+		<!-- Create properties file from .flexLibProperties -->
+		<xslt in="${basedir}/.flexLibProperties" out="${bin.loc}/flexLib.properties" style="${basedir}/flexLibProperties.xsl" />
+	</target>
 	
-    <target name="thirdparty-downloads">
+	 <target name="thirdparty-downloads">
 		<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />
-    </target>
-
-   <target name="compile" depends="init, thirdparty-downloads, compile-flex,compile-as3,as3-linker-check" />
-   
-   <target name="compile-flex">
-      <!-- Pull in class file list for compc -->
-      <property file="${bin.loc}/flexLib.properties" />
-      
-      <!-- Compile Flex SWC -->
-      <compile-swc sdk="${FLEX_HOME}" artifact="${build.finalName.flex}.${build.packaging}" classes="${src.class-list}" useflex="true" />
-   </target>
-   
-   <target name="compile-as3">
-      <!-- Pull in class file list for compc -->
-      <property file="${bin.loc}/flexLib.properties" />
-   
-      <!-- Compile AS3 SWC -->
-      <compile-swc sdk="${FLEX_HOME}" artifact="${build.finalName.as3}.${build.packaging}" classes="${src.class-list}" useflex="false" />
-   </target>
-
-   <target name="instrument-compile" depends="compile" if="build.instrument" description="All instrumentation on Flex SWC">
-      <!-- Pull in class file list for compc -->
-      <property file="${bin.loc}/flexLib.properties" />
-
-      <!-- Compile SWC using FlexCover SDK for flex -->
-      <compile-swc sdk="${FLEX_COVER_HOME}" artifact="${instrument.finalName}.${build.packaging}" classes="${src.class-list}" useflex="true">
-         <args>
-            <arg line="-coverage" />
-            <arg line="-coverage-metadata='${bin.loc}/${instrument.metadata}'" />
-         </args>
-      </compile-swc>
-   </target>
-
-   <target name="as3-linker-check" depends="compile-as3">
-      <!-- Create properties file from link report for last built SWC, which should be Flex -->
-      <xslt in="${bin.loc}/link-report-false.xml" out="${bin.loc}/flex-dependencies.txt" style="${basedir}/link-report.xsl" />
-
-      <!-- Was the flex-dependencies report empty for AS3 only builds? -->
-      <fail message="Build contains depedencies on the Flex framework, but is being built for AS3.">
-         <condition>
-            <length file="${bin.loc}/flex-dependencies.txt" when="greater" length="0" />
-         </condition>
-      </fail>
-   </target>
-
-   <target name="report" depends="pmdReport" if="build.report" description="All reporting done on Flex SWC">
-      <!-- Pull in class file list to use with asdoc -->
-      <property file="${bin.loc}/flexLib.properties" />
-
-      <!-- Generate asdocs -->
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-classes ${src.class-list}" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-         <arg line="-define=CONFIG::useFlexClasses,true" />
-      </java>
-   </target>
-   
-   <target name="asdocs" description="AS docs">
-      <!-- Pull in class file list to use with asdoc -->
-      <property file="${bin.loc}/flexLib.properties" />
-
-      <!-- Generate asdocs -->
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-classes ${src.class-list}" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-         <arg line="-define=CONFIG::useFlexClasses,true" />
-      </java>
-   </target>
+	 </target>
+
+	<target name="compile" depends="init, thirdparty-downloads, compile-flex,compile-as3,as3-linker-check" />
+	
+	<target name="compile-flex">
+		<!-- Pull in class file list for compc -->
+		<property file="${bin.loc}/flexLib.properties" />
+		
+		<!-- Compile Flex SWC -->
+		<compile-swc sdk="${FLEX_HOME}" artifact="${build.finalName.flex}.${build.packaging}" classes="${src.class-list}" useflex="true" />
+	</target>
+	
+	<target name="compile-as3">
+		<!-- Pull in class file list for compc -->
+		<property file="${bin.loc}/flexLib.properties" />
+	
+		<!-- Compile AS3 SWC -->
+		<compile-swc sdk="${FLEX_HOME}" artifact="${build.finalName.as3}.${build.packaging}" classes="${src.class-list}" useflex="false" />
+	</target>
+
+	<target name="instrument-compile" depends="compile" if="build.instrument" description="All instrumentation on Flex SWC">
+		<!-- Pull in class file list for compc -->
+		<property file="${bin.loc}/flexLib.properties" />
+
+		<!-- Compile SWC using FlexCover SDK for flex -->
+		<compile-swc sdk="${FLEX_COVER_HOME}" artifact="${instrument.finalName}.${build.packaging}" classes="${src.class-list}" useflex="true">
+			<args>
+				<arg line="-coverage" />
+				<arg line="-coverage-metadata='${bin.loc}/${instrument.metadata}'" />
+			</args>
+		</compile-swc>
+	</target>
+
+	<target name="as3-linker-check" depends="compile-as3">
+		<!-- Create properties file from link report for last built SWC, which should be Flex -->
+		<xslt in="${bin.loc}/link-report-false.xml" out="${bin.loc}/flex-dependencies.txt" style="${basedir}/link-report.xsl" />
+
+		<!-- Was the flex-dependencies report empty for AS3 only builds? -->
+		<fail message="Build contains depedencies on the Flex framework, but is being built for AS3.">
+			<condition>
+				<length file="${bin.loc}/flex-dependencies.txt" when="greater" length="0" />
+			</condition>
+		</fail>
+	</target>
+
+	<target name="report" depends="pmdReport" if="build.report" description="All reporting done on Flex SWC">
+		<!-- Pull in class file list to use with asdoc -->
+		<property file="${bin.loc}/flexLib.properties" />
+
+		<!-- Generate asdocs -->
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-classes ${src.class-list}" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+			<arg line="-define=CONFIG::useFlexClasses,true" />
+		</java>
+	</target>
+	
+	<target name="asdocs" description="AS docs">
+		<!-- Pull in class file list to use with asdoc -->
+		<property file="${bin.loc}/flexLib.properties" />
+
+		<!-- Generate asdocs -->
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-classes ${src.class-list}" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+			<arg line="-define=CONFIG::useFlexClasses,true" />
+		</java>
+	</target>
+	
+	<target name="pmdReport" if="build.pmd">
+		<taskdef name="pmd" classname="com.adobe.ac.pmd.ant.FlexPmdAntTask" />
+		<taskdef name="cpd" classname="com.adobe.ac.cpd.ant.FlexCpdAntTask" />
+		<taskdef name="metrics" classname="com.adobe.ac.pmd.metrics.ant.FlexMetricsAntTask" />
+
+		<!-- Generate FlexPMD reports -->
+		<pmd sourceDirectory="${src.loc}" outputDirectory="${report.loc}" ruleset="${basedir}/pmd-ruleset.xml" />
+
+		<cpd minimumTokenCount="50" outputFile="${report.loc}/cpd.xml">
+			<fileset dir="${src.loc}">
+				<include name="**/*.as" />
+				<include name="**/*.mxml" />
+			</fileset>
+		</cpd>
+
+		<metrics sourcedirectory="${src.loc}" outputfile="${report.loc}/javancss.xml" />
+	</target>
+
+	<target name="package" depends="package-default,package-instrument,asdocs" />
+
+	<target name="package-default" depends="compile">
+		<copy file="${bin.loc}/${build.finalName.as3}.${build.packaging}" todir="${dist.loc}" />
+		<copy file="${bin.loc}/${build.finalName.flex}.${build.packaging}" todir="${dist.loc}" />
+	</target>
+
+	<target name="package-instrument" depends="instrument-compile" if="build.instrument">
+		<copy file="${bin.loc}/${instrument.metadata}" todir="${dist.loc}" />
+		<copy file="${bin.loc}/${instrument.finalName}.${build.packaging}" todir="${dist.loc}" />
+	</target>
+	
+	<target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
+		<!-- deploy flex swc to apache-maven -->
+		<apache-deploy
+			binaryFile="${bin.loc}/${build.finalName.flex}.${build.packaging}"
+			todir="${apache-maven.loc}/flex"
+			pomTemplate="${basedir}/../pom.template"
+			artifact="${build.artifactId}-flex"
+			type="${build.packaging}"
+			name="${build.deploy.name}"
+			version="${build.version}"
+			description="${build.deploy.description}">
+		</apache-deploy>
+
+		 <!-- deploy as3 swc to apache-maven -->
+		 <apache-deploy
+			binaryFile="${bin.loc}/${build.finalName.as3}.${build.packaging}"
+			todir="${apache-maven.loc}/as3"
+			pomTemplate="${basedir}/../pom.template"
+			artifact="${build.artifactId}-as3"
+			type="${build.packaging}"
+			name="${build.deploy.name}"
+			version="${build.version}"
+			description="${build.deploy.description}">
+		 </apache-deploy>
+	</target>
 	
-   <target name="pmdReport" if="build.pmd">
-      <taskdef name="pmd" classname="com.adobe.ac.pmd.ant.FlexPmdAntTask" />
-      <taskdef name="cpd" classname="com.adobe.ac.cpd.ant.FlexCpdAntTask" />
-      <taskdef name="metrics" classname="com.adobe.ac.pmd.metrics.ant.FlexMetricsAntTask" />
-
-      <!-- Generate FlexPMD reports -->
-      <pmd sourceDirectory="${src.loc}" outputDirectory="${report.loc}" ruleset="${basedir}/pmd-ruleset.xml" />
-
-      <cpd minimumTokenCount="50" outputFile="${report.loc}/cpd.xml">
-         <fileset dir="${src.loc}">
-            <include name="**/*.as" />
-            <include name="**/*.mxml" />
-         </fileset>
-      </cpd>
-
-      <metrics sourcedirectory="${src.loc}" outputfile="${report.loc}/javancss.xml" />
-   </target>
-
-   <target name="package" depends="package-default,package-instrument,asdocs" />
-
-   <target name="package-default" depends="compile">
-      <copy file="${bin.loc}/${build.finalName.as3}.${build.packaging}" todir="${dist.loc}" />
-      <copy file="${bin.loc}/${build.finalName.flex}.${build.packaging}" todir="${dist.loc}" />
-   </target>
-
-   <target name="package-instrument" depends="instrument-compile" if="build.instrument">
-      <copy file="${bin.loc}/${instrument.metadata}" todir="${dist.loc}" />
-      <copy file="${bin.loc}/${instrument.finalName}.${build.packaging}" todir="${dist.loc}" />
-   </target>
-   
-   <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
-      <!-- deploy flex swc to apache-maven -->
-      <apache-deploy
-           binaryFile="${bin.loc}/${build.finalName.flex}.${build.packaging}"
-           todir="${apache-maven.loc}/flex"
-           pomTemplate="${basedir}/../pom.template"
-           artifact="${build.artifactId}-flex"
-           type="${build.packaging}"
-           name="${build.deploy.name}"
-           version="${build.version}"
-           description="${build.deploy.description}">
-      </apache-deploy>
-
-       <!-- deploy as3 swc to apache-maven -->
-       <apache-deploy
-           binaryFile="${bin.loc}/${build.finalName.as3}.${build.packaging}"
-           todir="${apache-maven.loc}/as3"
-           pomTemplate="${basedir}/../pom.template"
-           artifact="${build.artifactId}-as3"
-           type="${build.packaging}"
-           name="${build.deploy.name}"
-           version="${build.version}"
-           description="${build.deploy.description}">
-       </apache-deploy>
-   </target>
-   
-   <target name="clean_as3">
-       <delete file="${bin.loc}/${build.finalName.as3}.${build.packaging}" failonerror="false" />
-       <delete file="${dist.loc}/${build.finalName.as3}.${build.packaging}" failonerror="false" />
-   </target>
+	<target name="clean_as3">
+		 <delete file="${bin.loc}/${build.finalName.as3}.${build.packaging}" failonerror="false" />
+		 <delete file="${dist.loc}/${build.finalName.as3}.${build.packaging}" failonerror="false" />
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4AirCIListener/build.xml b/FlexUnit4AirCIListener/build.xml
index 99d7f5d..bd5796c 100644
--- a/FlexUnit4AirCIListener/build.xml
+++ b/FlexUnit4AirCIListener/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,35 +16,35 @@
   limitations under the License.
 -->
 <project name="FlexUnit4AirCIListener" basedir="." default="package">
-   <import file="${basedir}/../utils.xml" />
-   <property environment="env" />
+	<import file="${basedir}/../utils.xml" />
+	<property environment="env" />
 
-   <!-- Configuration -->
-   <property name="build.artifactId" value="flexunit-aircilistener" />
-   <property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
-   <property name="build.packaging" value="swc" />
-   <property name="build.deploy.name" value="FlexUnit AIR CI Listener" />
-   <property name="build.deploy.description" value="Continuous integration listener to be used with the FlexUnit Ant Tasks and AIR-based TestRunners." />
+	<!-- Configuration -->
+	<property name="build.artifactId" value="flexunit-aircilistener" />
+	<property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
+	<property name="build.packaging" value="swc" />
+	<property name="build.deploy.name" value="FlexUnit AIR CI Listener" />
+	<property name="build.deploy.description" value="Continuous integration listener to be used with the FlexUnit Ant Tasks and AIR-based TestRunners." />
 
-   <!-- Existing -->
-   <property name="src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/libs" />
+	<!-- Existing -->
+	<property name="src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/libs" />
 
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="doc.loc" location="${basedir}/target/docs" />
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="doc.loc" location="${basedir}/target/docs" />
 
-   <!-- Setup Flex Ant Resources -->
-   <available file="${env.FLEX_HOME}/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${env.FLEX_HOME}"/>
-   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${basedir}/../../flex-sdk"/>
+	<!-- Setup Flex Ant Resources -->
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
@@ -52,78 +52,78 @@
 		</classpath>
 	</taskdef>
 	
-   <target name="clean">
-      <delete dir="${dist.loc}" failonerror="false" />
-      <delete failonerror="false">
-         <fileset dir="${lib.loc}" />
-      </delete>
-   </target>
+	<target name="clean">
+		<delete dir="${dist.loc}" failonerror="false" />
+		<delete failonerror="false">
+			<fileset dir="${lib.loc}" />
+		</delete>
+	</target>
 
-   <target name="init">
-      <mkdir dir="${lib.loc}" />
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${apache-maven.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${doc.loc}" />
+	<target name="init">
+		<mkdir dir="${lib.loc}" />
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${apache-maven.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${doc.loc}" />
 
-      <!-- Copy required dependencies -->
-      <copy todir="${lib.loc}" overwrite="true" failonerror="false">
-         <fileset dir="${basedir}/../FlexUnit4/target">
-            <include name="flexunit*as3*.swc" />
-         </fileset>
-         <fileset dir="${basedir}/../FlexUnit4CIListener/target">
-            <include name="*.swc" />
-         </fileset>
-      </copy>
-   </target>
+		<!-- Copy required dependencies -->
+		<copy todir="${lib.loc}" overwrite="true" failonerror="false">
+			<fileset dir="${basedir}/../FlexUnit4/target">
+				<include name="flexunit*as3*.swc" />
+			</fileset>
+			<fileset dir="${basedir}/../FlexUnit4CIListener/target">
+				<include name="*.swc" />
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="compile" depends="init">
-      <compc output="${bin.loc}/${build.finalName}.${build.packaging}">
-         <load-config filename="${FLEX_HOME}/frameworks/air-config.xml" />
-         <include-sources dir="${src.loc}" includes="*" append="true" />
-         <source-path path-element="${src.loc}" />
-         <compiler.external-library-path dir="${lib.loc}" append="true">
-            <include name="*.swc" />
-         </compiler.external-library-path>
-         <compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
-            <include name="flex.swc" />
-            <include name="framework.swc" />
-            <include name="rpc.swc" />
-            <include name="utilities.swc" />
-            <include name="air/airglobal.swc" />
-         </compiler.external-library-path>
-         <compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
-         <compiler.headless-server>true</compiler.headless-server>
-      </compc>
-   </target>
+	<target name="compile" depends="init">
+		<compc output="${bin.loc}/${build.finalName}.${build.packaging}">
+			<load-config filename="${FLEX_HOME}/frameworks/air-config.xml" />
+			<include-sources dir="${src.loc}" includes="*" append="true" />
+			<source-path path-element="${src.loc}" />
+			<compiler.external-library-path dir="${lib.loc}" append="true">
+				<include name="*.swc" />
+			</compiler.external-library-path>
+			<compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
+				<include name="flex.swc" />
+				<include name="framework.swc" />
+				<include name="rpc.swc" />
+				<include name="utilities.swc" />
+				<include name="air/airglobal.swc" />
+			</compiler.external-library-path>
+			<compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
+			<compiler.headless-server>true</compiler.headless-server>
+		</compc>
+	</target>
 
-   <target name="report" depends="compile" if="build.report">
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-sources '${src.loc}'" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-         <arg line="-library-path+='${FLEX_HOME}/frameworks/libs/air/airglobal.swc'" />
-      </java>
-   </target>
+	<target name="report" depends="compile" if="build.report">
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-sources '${src.loc}'" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+			<arg line="-library-path+='${FLEX_HOME}/frameworks/libs/air/airglobal.swc'" />
+		</java>
+	</target>
 
-   <target name="package" depends="report">
-      <copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
-   </target>
-   
-   <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
-      <!-- deploy to apache-maven repo -->
-      <apache-deploy
-         binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
-         todir="${apache-maven.loc}"
-         pomTemplate="${basedir}/../pom.template" 
-         artifact="${build.artifactId}" 
-         type="${build.packaging}" 
-         name="${build.deploy.name}" 
-         version="${build.version}" 
-         description="${build.deploy.description}">
-      </apache-deploy>
-   </target>
+	<target name="package" depends="report">
+		<copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
+	</target>
+	
+	<target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
+		<!-- deploy to apache-maven repo -->
+		<apache-deploy
+			binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
+			todir="${apache-maven.loc}"
+			pomTemplate="${basedir}/../pom.template" 
+			artifact="${build.artifactId}" 
+			type="${build.packaging}" 
+			name="${build.deploy.name}" 
+			version="${build.version}" 
+			description="${build.deploy.description}">
+		</apache-deploy>
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4AntTasks/build.xml b/FlexUnit4AntTasks/build.xml
index 51cb997..cea11d8 100644
--- a/FlexUnit4AntTasks/build.xml
+++ b/FlexUnit4AntTasks/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,96 +16,96 @@
   limitations under the License.
 -->
 <project name="FlexUnitAntTasks" basedir="." default="package">
-   <import file="${basedir}/../utils.xml" />
+	<import file="${basedir}/../utils.xml" />
 
-   <!--Configuration-->
-   <property name="build.artifactId" value="flexUnitTasks" />
-   <property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}" />
-   <property name="build.packaging" value="jar" />
-   <property name="build.deploy.name" value="FlexUnit Ant Tasks" />
-   <property name="build.deploy.description" value="Ant tasks which allow the compilation, execution, and reporting for FlexUnit test suites." />
+	<!--Configuration-->
+	<property name="build.artifactId" value="flexUnitTasks" />
+	<property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}" />
+	<property name="build.packaging" value="jar" />
+	<property name="build.deploy.name" value="FlexUnit Ant Tasks" />
+	<property name="build.deploy.description" value="Ant tasks which allow the compilation, execution, and reporting for FlexUnit test suites." />
 
-   <!-- Existing -->
-   <property name="src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/lib" />
+	<!-- Existing -->
+	<property name="src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/lib" />
 
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="doc.loc" location="${basedir}/target/docs" />
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="doc.loc" location="${basedir}/target/docs" />
 
-   <target name="clean">
-      <delete dir="${dist.loc}" />
+	<target name="clean">
+		<delete dir="${dist.loc}" />
   	  <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" />
-   </target>
-   
-    <target name="thirdparty-downloads">
+	</target>
+	
+	 <target name="thirdparty-downloads">
 		<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />
-    </target>
+	 </target>
 
-   <target name="init">
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${apache-maven.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${doc.loc}" />
-   </target>
+	<target name="init">
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${apache-maven.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${doc.loc}" />
+	</target>
 
-   <target name="compile" depends="init, thirdparty-downloads">
-      <javac target="1.8" source="1.8" fork="true" memoryMaximumSize="256m" srcdir="${src.loc}" failonerror="yes" verbose="false" nowarn="true" destdir="${bin.loc}">
-         <classpath>
-            <fileset dir="${lib.loc}">
-               <include name="**/*.jar" />
-            </fileset>
-         </classpath>
-      </javac>
-   </target>
+	<target name="compile" depends="init, thirdparty-downloads">
+		<javac target="1.8" source="1.8" fork="true" memoryMaximumSize="256m" srcdir="${src.loc}" failonerror="yes" verbose="false" nowarn="true" destdir="${bin.loc}">
+			<classpath>
+				<fileset dir="${lib.loc}">
+					<include name="**/*.jar" />
+				</fileset>
+			</classpath>
+		</javac>
+	</target>
 
-   <target name="report" depends="compile" if="build.report">
-      <javadoc destdir="${doc.loc}" packagenames="org.flexunit.ant.*" sourcepath="${src.loc}" access="private" Author="true" version="true" Use="true" noindex="true" Windowtitle="FlexUnit Ant Tasks " Doctitle="FlexUnit Ant Tasks" failonerror="true" />
-   </target>
+	<target name="report" depends="compile" if="build.report">
+		<javadoc destdir="${doc.loc}" packagenames="org.flexunit.ant.*" sourcepath="${src.loc}" access="private" Author="true" version="true" Use="true" noindex="true" Windowtitle="FlexUnit Ant Tasks " Doctitle="FlexUnit Ant Tasks" failonerror="true" />
+	</target>
 
-   <target name="package" depends="report">
-      <!-- prep bin dir to be JARd -->
-      <copy file="${src.loc}/flexUnitTasks.tasks" todir="${bin.loc}" />
-      <copy file="${src.loc}/flexUnitDescriptor.template" todir="${bin.loc}" />
-   	  <copy file="${src.loc}/TestRunner.template" todir="${bin.loc}" />
+	<target name="package" depends="report">
+		<!-- prep bin dir to be JARd -->
+		<copy file="${src.loc}/flexUnitTasks.tasks" todir="${bin.loc}" />
+		<copy file="${src.loc}/flexUnitDescriptor.template" todir="${bin.loc}" />
+		  <copy file="${src.loc}/TestRunner.template" todir="${bin.loc}" />
 
-      <unjar src="${lib.loc}/dom4j-1.6.1.jar" dest="${bin.loc}" />
-      <unjar src="${lib.loc}/jaxen-1.1-beta-6.jar" dest="${bin.loc}" />
+		<unjar src="${lib.loc}/dom4j-1.6.1.jar" dest="${bin.loc}" />
+		<unjar src="${lib.loc}/jaxen-1.1-beta-6.jar" dest="${bin.loc}" />
 
-      <!-- Create JAR for binaries, source and javadoc -->
-      <jar destfile="${dist.loc}/${build.finalName}.${build.packaging}">
-         <fileset dir="${bin.loc}">
-            <include name="**/*" />
-         </fileset>
-      </jar>
-      
-      <jar destfile="${dist.loc}/${build.finalName}-sources.${build.packaging}">
-         <fileset dir="${src.loc}">
-            <include name="**/*" />
-         </fileset>
-      </jar>
-      
-      <jar destfile="${dist.loc}/${build.finalName}-javadoc.${build.packaging}">
-         <fileset dir="${doc.loc}">
-            <include name="**/*" />
-         </fileset>
-      </jar>
-   </target>
-   
-   <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
-      <apache-deploy
-         binaryFile="${dist.loc}/${build.finalName}.${build.packaging}"
-         sourcesFile="${dist.loc}/${build.finalName}-sources.${build.packaging}"
-         docFile="${dist.loc}/${build.finalName}-javadoc.${build.packaging}"
-         todir="${apache-maven.loc}"
-         pomTemplate="${basedir}/../pom.template" 
-         artifact="${build.artifactId}" 
-         type="${build.packaging}" 
-         name="${build.deploy.name}" 
-         version="${build.version}" 
-         description="${build.deploy.description}">
-      </apache-deploy>
-   </target>
+		<!-- Create JAR for binaries, source and javadoc -->
+		<jar destfile="${dist.loc}/${build.finalName}.${build.packaging}">
+			<fileset dir="${bin.loc}">
+				<include name="**/*" />
+			</fileset>
+		</jar>
+		
+		<jar destfile="${dist.loc}/${build.finalName}-sources.${build.packaging}">
+			<fileset dir="${src.loc}">
+				<include name="**/*" />
+			</fileset>
+		</jar>
+		
+		<jar destfile="${dist.loc}/${build.finalName}-javadoc.${build.packaging}">
+			<fileset dir="${doc.loc}">
+				<include name="**/*" />
+			</fileset>
+		</jar>
+	</target>
+	
+	<target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
+		<apache-deploy
+			binaryFile="${dist.loc}/${build.finalName}.${build.packaging}"
+			sourcesFile="${dist.loc}/${build.finalName}-sources.${build.packaging}"
+			docFile="${dist.loc}/${build.finalName}-javadoc.${build.packaging}"
+			todir="${apache-maven.loc}"
+			pomTemplate="${basedir}/../pom.template" 
+			artifact="${build.artifactId}" 
+			type="${build.packaging}" 
+			name="${build.deploy.name}" 
+			version="${build.version}" 
+			description="${build.deploy.description}">
+		</apache-deploy>
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4CIListener/build.xml b/FlexUnit4CIListener/build.xml
index 29e3a7f..8141add 100644
--- a/FlexUnit4CIListener/build.xml
+++ b/FlexUnit4CIListener/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,107 +16,107 @@
   limitations under the License.
 -->
 <project name="FlexUnit4CIListener" basedir="." default="package">
-   <import file="${basedir}/../utils.xml" />
-   <property environment="env" />
+	<import file="${basedir}/../utils.xml" />
+	<property environment="env" />
 
-   <!-- Configuration -->
-   <property name="build.artifactId" value="flexunit-cilistener" />
-   <property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
-   <property name="build.packaging" value="swc" />
-   <property name="build.deploy.name" value="FlexUnit CI Listener" />
-   <property name="build.deploy.description" value="Continuous integration listener to be used with the FlexUnit Ant Tasks and Flash-based TestRunners." />
+	<!-- Configuration -->
+	<property name="build.artifactId" value="flexunit-cilistener" />
+	<property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
+	<property name="build.packaging" value="swc" />
+	<property name="build.deploy.name" value="FlexUnit CI Listener" />
+	<property name="build.deploy.description" value="Continuous integration listener to be used with the FlexUnit Ant Tasks and Flash-based TestRunners." />
 
-   <!-- Existing -->
-   <property name="src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/libs" />
+	<!-- Existing -->
+	<property name="src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/libs" />
 
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="doc.loc" location="${basedir}/target/docs" />
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="doc.loc" location="${basedir}/target/docs" />
 
-   <!-- Setup Flex Ant Resources -->
-   <available file="${env.FLEX_HOME}/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${env.FLEX_HOME}"/>
-   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${basedir}/../../flex-sdk"/>
+	<!-- Setup Flex Ant Resources -->
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 			<pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
 		</classpath>
 	</taskdef>
-   <target name="clean">
-      <delete dir="${dist.loc}" failonerror="false" />
-      <delete failonerror="false">
-         <fileset dir="${lib.loc}" />
-      </delete>
-   </target>
+	<target name="clean">
+		<delete dir="${dist.loc}" failonerror="false" />
+		<delete failonerror="false">
+			<fileset dir="${lib.loc}" />
+		</delete>
+	</target>
 
-   <target name="init">
-      <mkdir dir="${lib.loc}" />
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${apache-maven.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${doc.loc}" />
+	<target name="init">
+		<mkdir dir="${lib.loc}" />
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${apache-maven.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${doc.loc}" />
 
-      <!-- Copy required dependencies -->
-      <copy todir="${lib.loc}" overwrite="true" failonerror="false">
-         <fileset dir="${basedir}/../FlexUnit4/target">
-            <include name="flexunit*as3*.swc" />
-         </fileset>
-      </copy>
-   </target>
+		<!-- Copy required dependencies -->
+		<copy todir="${lib.loc}" overwrite="true" failonerror="false">
+			<fileset dir="${basedir}/../FlexUnit4/target">
+				<include name="flexunit*as3*.swc" />
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="compile" depends="init">
-      <compc output="${bin.loc}/${build.finalName}.${build.packaging}">
-         <include-sources dir="${src.loc}" includes="*" append="true" />
-         <source-path path-element="${src.loc}" />
-         <compiler.external-library-path dir="${lib.loc}" append="true">
-            <include name="*.swc" />
-         </compiler.external-library-path>
-         <compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
-            <include name="flex.swc" />
-            <include name="framework.swc" />
-            <include name="rpc.swc" />
-            <include name="utilities.swc" />
-         </compiler.external-library-path>
-         <compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
-         <compiler.headless-server>true</compiler.headless-server>
-      </compc>
-   </target>
+	<target name="compile" depends="init">
+		<compc output="${bin.loc}/${build.finalName}.${build.packaging}">
+			<include-sources dir="${src.loc}" includes="*" append="true" />
+			<source-path path-element="${src.loc}" />
+			<compiler.external-library-path dir="${lib.loc}" append="true">
+				<include name="*.swc" />
+			</compiler.external-library-path>
+			<compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
+				<include name="flex.swc" />
+				<include name="framework.swc" />
+				<include name="rpc.swc" />
+				<include name="utilities.swc" />
+			</compiler.external-library-path>
+			<compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
+			<compiler.headless-server>true</compiler.headless-server>
+		</compc>
+	</target>
 
-   <target name="report" depends="compile" if="build.report">
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-sources '${src.loc}'" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-      </java>
-   </target>
+	<target name="report" depends="compile" if="build.report">
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-sources '${src.loc}'" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+		</java>
+	</target>
 
-   <target name="package" depends="report">
-      <copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
-   </target>
-   
-   <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
-      <!-- deploy to apache-maven repo -->
-      <apache-deploy
-         binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
-         todir="${apache-maven.loc}"
-         pomTemplate="${basedir}/../pom.template" 
-         artifact="${build.artifactId}" 
-         type="${build.packaging}" 
-         name="${build.deploy.name}" 
-         version="${build.version}" 
-         description="${build.deploy.description}">
-      </apache-deploy>
-   </target>
+	<target name="package" depends="report">
+		<copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
+	</target>
+	
+	<target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
+		<!-- deploy to apache-maven repo -->
+		<apache-deploy
+			binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
+			todir="${apache-maven.loc}"
+			pomTemplate="${basedir}/../pom.template" 
+			artifact="${build.artifactId}" 
+			type="${build.packaging}" 
+			name="${build.deploy.name}" 
+			version="${build.version}" 
+			description="${build.deploy.description}">
+		</apache-deploy>
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4FluintExtensions/build.xml b/FlexUnit4FluintExtensions/build.xml
index bf19f60..1e82d5d 100644
--- a/FlexUnit4FluintExtensions/build.xml
+++ b/FlexUnit4FluintExtensions/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,35 +16,35 @@
   limitations under the License.
 -->
 <project name="FlexUnit4CIListener" basedir="." default="package">
-   <import file="${basedir}/../utils.xml" />
-   <property environment="env" />
+	<import file="${basedir}/../utils.xml" />
+	<property environment="env" />
 
-   <!-- Configuration -->
-   <property name="build.artifactId" value="fluint-extensions" />
-   <property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
-   <property name="build.packaging" value="swc" />
-   <property name="build.deploy.name" value="FlexUnit Fluint Extensions" />
-   <property name="build.deploy.description" value="Extensions to FlexUnit 4 to allow interaction with Fluint tests." />
+	<!-- Configuration -->
+	<property name="build.artifactId" value="fluint-extensions" />
+	<property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
+	<property name="build.packaging" value="swc" />
+	<property name="build.deploy.name" value="FlexUnit Fluint Extensions" />
+	<property name="build.deploy.description" value="Extensions to FlexUnit 4 to allow interaction with Fluint tests." />
 
-   <!-- Existing -->
-   <property name="src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/libs" />
+	<!-- Existing -->
+	<property name="src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/libs" />
 
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="doc.loc" location="${basedir}/target/docs" />
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="doc.loc" location="${basedir}/target/docs" />
 
-   <!-- Setup Flex Ant Resources -->
-   <available file="${env.FLEX_HOME}/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${env.FLEX_HOME}"/>
-   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${basedir}/../../flex-sdk"/>
+	<!-- Setup Flex Ant Resources -->
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
@@ -52,78 +52,78 @@
 		</classpath>
 	</taskdef>
 	
-   <target name="clean">
-      <delete dir="${dist.loc}" failonerror="false" />
-      <delete failonerror="false">
-         <fileset dir="${lib.loc}">
+	<target name="clean">
+		<delete dir="${dist.loc}" failonerror="false" />
+		<delete failonerror="false">
+			<fileset dir="${lib.loc}">
 			<include name="flexunit*.swc" />
-         </fileset>
-      </delete>
-   </target>
+			</fileset>
+		</delete>
+	</target>
 
-   <target name="init">
-      <mkdir dir="${lib.loc}" />
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${apache-maven.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${doc.loc}" />
+	<target name="init">
+		<mkdir dir="${lib.loc}" />
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${apache-maven.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${doc.loc}" />
 
-      <!-- Copy required dependencies -->
-      <copy todir="${lib.loc}" overwrite="true" failonerror="false">
-         <fileset dir="${basedir}/../FlexUnit4/target">
-            <include name="flexunit*as3*.swc" />
-         </fileset>
-      </copy>
-   </target>
+		<!-- Copy required dependencies -->
+		<copy todir="${lib.loc}" overwrite="true" failonerror="false">
+			<fileset dir="${basedir}/../FlexUnit4/target">
+				<include name="flexunit*as3*.swc" />
+			</fileset>
+		</copy>
+	</target>
 	
-   <target name="thirdparty-downloads">
+	<target name="thirdparty-downloads">
 		<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />
-    </target>
+	 </target>
 
-   <target name="compile" depends="init, thirdparty-downloads">
-      <compc output="${bin.loc}/${build.finalName}.${build.packaging}">
-         <include-sources dir="${src.loc}" includes="*" append="true" />
-         <source-path path-element="${src.loc}" />
-         <compiler.external-library-path dir="${lib.loc}" append="true">
-            <include name="*.swc" />
-         </compiler.external-library-path>
-         <compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
-            <include name="flex.swc" />
-            <include name="framework.swc" />
-            <include name="rpc.swc" />
-            <include name="utilities.swc" />
-         </compiler.external-library-path>
-         <compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
-         <compiler.headless-server>true</compiler.headless-server>
-      </compc>
-   </target>
+	<target name="compile" depends="init, thirdparty-downloads">
+		<compc output="${bin.loc}/${build.finalName}.${build.packaging}">
+			<include-sources dir="${src.loc}" includes="*" append="true" />
+			<source-path path-element="${src.loc}" />
+			<compiler.external-library-path dir="${lib.loc}" append="true">
+				<include name="*.swc" />
+			</compiler.external-library-path>
+			<compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
+				<include name="flex.swc" />
+				<include name="framework.swc" />
+				<include name="rpc.swc" />
+				<include name="utilities.swc" />
+			</compiler.external-library-path>
+			<compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
+			<compiler.headless-server>true</compiler.headless-server>
+		</compc>
+	</target>
 
-   <target name="report" depends="compile" if="build.report">
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-sources '${src.loc}'" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-      </java>
-   </target>
+	<target name="report" depends="compile" if="build.report">
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-sources '${src.loc}'" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+		</java>
+	</target>
 
-   <target name="package" depends="report">
-      <copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
-   </target>
-   
-   <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
-      <!-- deploy to apache-maven repo -->
-      <apache-deploy
-         binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
-         todir="${apache-maven.loc}"
-         pomTemplate="${basedir}/../pom.template" 
-         artifact="${build.artifactId}" 
-         type="${build.packaging}" 
-         name="${build.deploy.name}" 
-         version="${build.version}" 
-         description="${build.deploy.description}">
-      </apache-deploy>
-   </target>
+	<target name="package" depends="report">
+		<copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
+	</target>
+	
+	<target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
+		<!-- deploy to apache-maven repo -->
+		<apache-deploy
+			binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
+			todir="${apache-maven.loc}"
+			pomTemplate="${basedir}/../pom.template" 
+			artifact="${build.artifactId}" 
+			type="${build.packaging}" 
+			name="${build.deploy.name}" 
+			version="${build.version}" 
+			description="${build.deploy.description}">
+		</apache-deploy>
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4SampleCIProject/pom.xml b/FlexUnit4SampleCIProject/pom.xml
index 742eba1..8468687 100644
--- a/FlexUnit4SampleCIProject/pom.xml
+++ b/FlexUnit4SampleCIProject/pom.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,81 +16,81 @@
   limitations under the License.
 -->
 <!-- 
-   Please note that this build file is an example of how to implement FlexMojos to execute all tests for a project
-   following Maven conventions. This is just one possible way to utilize FlexMojos and Maven. Please note, this build
-   will fail due to the sample test failures in this project.
-   
-   Please note to use the unit testing support baked into FlexMojos in this example, the Flash Player executable must be 
-   available on the PATH available to Maven.
+	Please note that this build file is an example of how to implement FlexMojos to execute all tests for a project
+	following Maven conventions. This is just one possible way to utilize FlexMojos and Maven. Please note, this build
+	will fail due to the sample test failures in this project.
+	
+	Please note to use the unit testing support baked into FlexMojos in this example, the Flash Player executable must be 
+	available on the PATH available to Maven.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-   <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
 
-   <groupId>org.apache.flex.flexunit</groupId>
-   <artifactId>demo</artifactId>
-   <version>1.0.0</version>
-   <packaging>swf</packaging>
-   <name>FlexUnit4 Demo</name>
+	<groupId>org.apache.flex.flexunit</groupId>
+	<artifactId>demo</artifactId>
+	<version>1.0.0</version>
+	<packaging>swf</packaging>
+	<name>FlexUnit4 Demo</name>
 
-   <properties>
-      <flex.sdk.version>4.12.0.20140303</flex.sdk.version>
-      <flexmojos.version>7.1.0-SNAPSHOT</flexmojos.version>
-   </properties>
+	<properties>
+		<flex.sdk.version>4.12.0.20140303</flex.sdk.version>
+		<flexmojos.version>7.1.0-SNAPSHOT</flexmojos.version>
+	</properties>
 
-   <build>
-      <sourceDirectory>src/main/flex</sourceDirectory>
-      <testSourceDirectory>src/test/flex</testSourceDirectory>
-      <plugins>
-         <plugin>
-            <groupId>net.flexmojos.oss</groupId>
-            <artifactId>flexmojos-maven-plugin</artifactId>
-            <version>${flexmojos.version}</version>
-            <extensions>true</extensions>
-            <configuration>
-               <headlessServer>true</headlessServer>
-               <verboseStacktraces>true</verboseStacktraces>
-               <includeTestFiles>
-                  <includeTestFile>*Test.as</includeTestFile>
-               </includeTestFiles>
-            </configuration>
-            <dependencies>
-               <!--
-                    These bundles currently have to be created by a tool called
-                    the Mavenizer, which is part of the flex-utilities
-               -->
-               <dependency>
-                  <groupId>org.apache.flex</groupId>
-                  <artifactId>compiler</artifactId>
-                  <version>${flex.sdk.version}</version>
-                  <type>pom</type>
-               </dependency>
-            </dependencies>
-         </plugin>
-      </plugins>
-   </build>
+	<build>
+		<sourceDirectory>src/main/flex</sourceDirectory>
+		<testSourceDirectory>src/test/flex</testSourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>net.flexmojos.oss</groupId>
+				<artifactId>flexmojos-maven-plugin</artifactId>
+				<version>${flexmojos.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<headlessServer>true</headlessServer>
+					<verboseStacktraces>true</verboseStacktraces>
+					<includeTestFiles>
+						<includeTestFile>*Test.as</includeTestFile>
+					</includeTestFiles>
+				</configuration>
+				<dependencies>
+					<!--
+						  These bundles currently have to be created by a tool called
+						  the Mavenizer, which is part of the flex-utilities
+					-->
+					<dependency>
+						<groupId>org.apache.flex</groupId>
+						<artifactId>compiler</artifactId>
+						<version>${flex.sdk.version}</version>
+						<type>pom</type>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
 
-   <dependencies>
-       <!--
-            These bundles currently have to be created by a tool called
-            the Mavenizer, which is part of the flex-utilities
-       -->
-      <dependency>
-         <groupId>org.apache.flex.framework</groupId>
-         <artifactId>flex-framework</artifactId>
-         <version>${flex.sdk.version}</version>
-         <type>pom</type>
-      </dependency>
+	<dependencies>
+		<!--
+			These bundles currently have to be created by a tool called
+			the Mavenizer, which is part of the flex-utilities
+		-->
+		<dependency>
+			<groupId>org.apache.flex.framework</groupId>
+			<artifactId>flex-framework</artifactId>
+			<version>${flex.sdk.version}</version>
+			<type>pom</type>
+		</dependency>
 
-      <!-- Based on testing library dependency specified, FlexMojos will know how to test your application -->
-      <dependency>
-          <groupId>org.apache.flex.flexunit</groupId>
-          <artifactId>flexunit-flex</artifactId>
-          <version>4.3.0</version>
-          <type>swc</type>
-      </dependency>
-   </dependencies>
+		<!-- Based on testing library dependency specified, FlexMojos will know how to test your application -->
+		<dependency>
+			 <groupId>org.apache.flex.flexunit</groupId>
+			 <artifactId>flexunit-flex</artifactId>
+			 <version>4.3.0</version>
+			 <type>swc</type>
+		</dependency>
+	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml
index 2fc183c..b825ce1 100644
--- a/FlexUnit4Test/build.xml
+++ b/FlexUnit4Test/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,41 +16,41 @@
   limitations under the License.
 -->
 <!--
-   The sole purpose of this project is to create a transitive dependency between the core and cilistener
-   projects.  If the tests resided with the core project, then core and cilistener would have a circular
-   dependency which would be more difficult to manage from a build perspective.
-   -->
+	The sole purpose of this project is to create a transitive dependency between the core and cilistener
+	projects.  If the tests resided with the core project, then core and cilistener would have a circular
+	dependency which would be more difficult to manage from a build perspective.
+-->
 <project name="FlexUnit4Test" basedir="." default="test">
-   <property environment="env" />
+	<property environment="env" />
 
-   <!-- Configuration -->
-   <property name="build.useFlex" value="true" />
-   <property name="test.finalName" value="TestRunner.swf" />
-   <property name="instrument.metadata" value="flexunit-instrument.cvm" />
+	<!-- Configuration -->
+	<property name="build.useFlex" value="true" />
+	<property name="test.finalName" value="TestRunner.swf" />
+	<property name="instrument.metadata" value="flexunit-instrument.cvm" />
 
-   <!-- Existing -->
-   <property name="main.src.loc" location="${basedir}/../FlexUnit4/src" />
-   <property name="test.src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/libs" />
-   <property name="build.lib.loc" location="${lib.loc}/build" />
+	<!-- Existing -->
+	<property name="main.src.loc" location="${basedir}/../FlexUnit4/src" />
+	<property name="test.src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/libs" />
+	<property name="build.lib.loc" location="${lib.loc}/build" />
 
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="report.xunit.flex.loc" location="${basedir}/target/report/xunit/flex" />
-   <property name="report.xunit.as3.loc" location="${basedir}/target/report/xunit/as3" />
-   <property name="report.flexcover.loc" location="${basedir}/target/report/flexcover" />
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="report.xunit.flex.loc" location="${basedir}/target/report/xunit/flex" />
+	<property name="report.xunit.as3.loc" location="${basedir}/target/report/xunit/as3" />
+	<property name="report.flexcover.loc" location="${basedir}/target/report/flexcover" />
 
-   <!-- Setup Flex Ant Resources -->
-   <available file="${env.FLEX_HOME}/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${env.FLEX_HOME}"/>
-   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${basedir}/../../flex-sdk"/>
-   <property name="FLEX_COVER_VIEWER" location="${env.FLEX_COVER_VIEWER}" />
+	<!-- Setup Flex Ant Resources -->
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
+	<property name="FLEX_COVER_VIEWER" location="${env.FLEX_COVER_VIEWER}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
@@ -58,167 +58,167 @@
 		</classpath>
 	</taskdef>
 	
-   <macrodef name="compile-runner">
-      <attribute name="runner" />
-      <attribute name="swf" />
-      <attribute name="include" />
-      <attribute name="useflex" />
-      <sequential>
-	     <mxmlc file="@{runner}" output="@{swf}" static-link-runtime-shared-libraries="true" >
-	        <library-path dir="${lib.loc}" append="true">
-	            <include name="@{include}" />
-	            <include name="*cilistener*.swc" />
-             	<include name="fluint*.swc" />
-	            <include name="*flexcoverlistener*.swc" />
-	            <include name="FlexUnit1Lib.swc" />
-				<include name="FlexUnit1Lib.swc" />
-	            <include name="hamcrest-as3*.swc" />
-    	        <include name="mock-as3.swc" />
-        	    <include name="mockolate*.swc" />
-	        </library-path>
-	        <define name="CONFIG::useFlexClasses" value="@{useflex}" />
-	        <compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
-	        <compiler.headless-server>true</compiler.headless-server>
-         </mxmlc>
-      </sequential>
-   </macrodef>
-   
-   <macrodef name="execute-tests">
-      <attribute name="swf" />
-      <attribute name="reportdir" />
-      <sequential>
-         <flexunit swf="@{swf}" toDir="@{reportdir}" haltonfailure="false" verbose="true" />
-      </sequential>
-   </macrodef>
-   
-   <macrodef name="execute-tests-using-flexcover">
-      <attribute name="swf" />
-      <attribute name="reportdir" />
-      <attribute name="flexcoverreport" />
-      <attribute name="coberturareport" />
-      <sequential>
-	      <parallel>
-	         <!-- Use CoverageViewer to generate coverage report and translate to Cobertura format -->
-	         <sequential>
-	            <exec executable="${FLEX_COVER_VIEWER}" dir="${bin.loc}" spawn="true">
-	               <arg line="-output '@{flexcoverreport}'" />
-	               <arg line="'${lib.loc}/${instrument.metadata}'" />
-	            </exec>
-	            <waitfor checkevery="3" checkeveryunit="second" maxwait="360000">
-	               <available file="@{flexcoverreport}" />
-	            </waitfor>
-	            <tstamp>
-	               <format property="instrument.timestamp" pattern="MM/dd/yyyy HH:mm:ss.SSS" />
-	            </tstamp>
-	            <xslt in="@{flexcoverreport}" out="@{coberturareport}" style="${basedir}/fc-to-cobertura.xsl">
-	               <classpath>
-	                  <fileset dir="${build.lib.loc}">
-	                     <include name="saxon*.jar" />
-	                  </fileset>
-	               </classpath>
-	               <param name="sourcePath" expression="${main.src.loc}" />
-	               <param name="timestamp" expression="${instrument.timestamp}" />
-	               <param name="version" expression="0.81" />
-	            </xslt>
-	         </sequential>
-	         
-	         <!-- Launch FlexUnit tests after a short delay -->
-	         <sequential>
-	            <sleep seconds="30" />
-	            <flexunit swf="@{swf}" toDir="@{reportdir}" haltonfailure="false" verbose="true" />
-	         </sequential>
-	      </parallel>
-      </sequential>
-   </macrodef>
-   
-   <macrodef name="generate-html-report">
-      <attribute name="dir" />
-      <attribute name="todir" />
-      <sequential>
-         <junitreport todir="@{dir}">
-	         <fileset dir="@{dir}">
-	            <include name="TEST-*.xml" />
-	         </fileset>
-	         <report format="frames" todir="@{todir}" />
-          </junitreport>
-      </sequential>
-   </macrodef>
+	<macrodef name="compile-runner">
+		<attribute name="runner" />
+		<attribute name="swf" />
+		<attribute name="include" />
+		<attribute name="useflex" />
+		<sequential>
+			<mxmlc file="@{runner}" output="@{swf}" static-link-runtime-shared-libraries="true" >
+				<library-path dir="${lib.loc}" append="true">
+					<include name="@{include}" />
+					<include name="*cilistener*.swc" />
+					<include name="fluint*.swc" />
+					<include name="*flexcoverlistener*.swc" />
+					<include name="FlexUnit1Lib.swc" />
+					<include name="FlexUnit1Lib.swc" />
+					<include name="hamcrest-as3*.swc" />
+					<include name="mock-as3.swc" />
+					<include name="mockolate*.swc" />
+				</library-path>
+				<define name="CONFIG::useFlexClasses" value="@{useflex}" />
+				<compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
+				<compiler.headless-server>true</compiler.headless-server>
+			</mxmlc>
+		</sequential>
+	</macrodef>
+	
+	<macrodef name="execute-tests">
+		<attribute name="swf" />
+		<attribute name="reportdir" />
+		<sequential>
+			<flexunit swf="@{swf}" toDir="@{reportdir}" haltonfailure="false" verbose="true" />
+		</sequential>
+	</macrodef>
+	
+	<macrodef name="execute-tests-using-flexcover">
+		<attribute name="swf" />
+		<attribute name="reportdir" />
+		<attribute name="flexcoverreport" />
+		<attribute name="coberturareport" />
+		<sequential>
+			<parallel>
+				<!-- Use CoverageViewer to generate coverage report and translate to Cobertura format -->
+				<sequential>
+					<exec executable="${FLEX_COVER_VIEWER}" dir="${bin.loc}" spawn="true">
+						<arg line="-output '@{flexcoverreport}'" />
+						<arg line="'${lib.loc}/${instrument.metadata}'" />
+					</exec>
+					<waitfor checkevery="3" checkeveryunit="second" maxwait="360000">
+						<available file="@{flexcoverreport}" />
+					</waitfor>
+					<tstamp>
+						<format property="instrument.timestamp" pattern="MM/dd/yyyy HH:mm:ss.SSS" />
+					</tstamp>
+					<xslt in="@{flexcoverreport}" out="@{coberturareport}" style="${basedir}/fc-to-cobertura.xsl">
+						<classpath>
+							<fileset dir="${build.lib.loc}">
+								<include name="saxon*.jar" />
+							</fileset>
+						</classpath>
+						<param name="sourcePath" expression="${main.src.loc}" />
+						<param name="timestamp" expression="${instrument.timestamp}" />
+						<param name="version" expression="0.81" />
+					</xslt>
+				</sequential>
+				
+				<!-- Launch FlexUnit tests after a short delay -->
+				<sequential>
+					<sleep seconds="30" />
+					<flexunit swf="@{swf}" toDir="@{reportdir}" haltonfailure="false" verbose="true" />
+				</sequential>
+			</parallel>
+		</sequential>
+	</macrodef>
+	
+	<macrodef name="generate-html-report">
+		<attribute name="dir" />
+		<attribute name="todir" />
+		<sequential>
+			<junitreport todir="@{dir}">
+				<fileset dir="@{dir}">
+					<include name="TEST-*.xml" />
+				</fileset>
+				<report format="frames" todir="@{todir}" />
+			 </junitreport>
+		</sequential>
+	</macrodef>
 
-   <target name="clean">
-      <delete dir="${dist.loc}" />
+	<target name="clean">
+		<delete dir="${dist.loc}" />
 
-	  <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" />
-   </target>
+		<ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" />
+	</target>
 
-   <target name="init">
-      <!-- Create paths -->
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${report.xunit.flex.loc}" />
-      <mkdir dir="${report.xunit.as3.loc}" />
-      <mkdir dir="${report.flexcover.loc}" />
+	<target name="init">
+		<!-- Create paths -->
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${report.xunit.flex.loc}" />
+		<mkdir dir="${report.xunit.as3.loc}" />
+		<mkdir dir="${report.flexcover.loc}" />
 
-      <!-- Copy dependencies -->
-      <copy todir="${lib.loc}" overwrite="true">
-         <fileset dir="${basedir}/../FlexUnit4/target">
-            <include name="*.swc" />
-            <include name="*.cvm" />
-         </fileset>
-         <fileset dir="${basedir}/../FlexUnit4CIListener/target">
-            <include name="*.swc" />
-         </fileset>
-         <fileset dir="${basedir}/../FlexUnit4FlexCoverListener/target">
-            <include name="*.swc" />
-         </fileset>
-		 <fileset dir="${basedir}/../FlexUnit4FluintExtensions/target">
-            <include name="*.swc" />
-         </fileset>
-      </copy>
-      <copy todir="${build.lib.loc}" overwrite="true">
-         <fileset dir="${basedir}/../FlexUnit4AntTasks/target">
-            <include name="*.jar" />
-            <exclude name="*-sources.jar" />
-            <exclude name="*-javadoc.jar" />
-         </fileset>
-      </copy>
+		<!-- Copy dependencies -->
+		<copy todir="${lib.loc}" overwrite="true">
+			<fileset dir="${basedir}/../FlexUnit4/target">
+				<include name="*.swc" />
+				<include name="*.cvm" />
+			</fileset>
+			<fileset dir="${basedir}/../FlexUnit4CIListener/target">
+				<include name="*.swc" />
+			</fileset>
+			<fileset dir="${basedir}/../FlexUnit4FlexCoverListener/target">
+				<include name="*.swc" />
+			</fileset>
+		 	<fileset dir="${basedir}/../FlexUnit4FluintExtensions/target">
+				<include name="*.swc" />
+			</fileset>
+		</copy>
+		<copy todir="${build.lib.loc}" overwrite="true">
+			<fileset dir="${basedir}/../FlexUnit4AntTasks/target">
+				<include name="*.jar" />
+				<exclude name="*-sources.jar" />
+				<exclude name="*-javadoc.jar" />
+			</fileset>
+		</copy>
 
-      <!-- Hook FlexUnit into Ant -->
-      <taskdef resource="flexUnitTasks.tasks">
-         <classpath>
-            <fileset dir="${build.lib.loc}">
-               <include name="flexUnitTasks*.jar" />
-            </fileset>
-         </classpath>
-      </taskdef>
-   </target>
+		<!-- Hook FlexUnit into Ant -->
+		<taskdef resource="flexUnitTasks.tasks">
+			<classpath>
+				<fileset dir="${build.lib.loc}">
+					<include name="flexUnitTasks*.jar" />
+				</fileset>
+			</classpath>
+		</taskdef>
+	</target>
 	
-   <target name="thirdparty-downloads">
+	<target name="thirdparty-downloads">
 		<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />
-    </target>
+	 </target>
 
-   <target name="test" depends="init,thirdparty-downloads,test-only,test-and-instrument" />
+	<target name="test" depends="init,thirdparty-downloads,test-only,test-and-instrument" />
 
-   <target name="test-only" unless="build.instrument">
-      <echo message="Testing FlexUnit Flex build..." />
-      <compile-runner runner="${test.src.loc}/TestRunner.mxml" swf="${bin.loc}/TestRunner-flex.swf" include="flexunit*flex*.swc" useflex="true" />
-      <execute-tests swf="${bin.loc}/TestRunner-flex.swf" reportdir="${report.xunit.flex.loc}" />
-      <generate-html-report dir="${report.xunit.flex.loc}" todir="${report.xunit.flex.loc}/html" />
-      
-      <echo message="Testing FlexUnit AS3 ONLY build..." />
-      <compile-runner runner="${test.src.loc}/TestRunner.mxml" swf="${bin.loc}/TestRunner-as3.swf" include="flexunit*as3*.swc" useflex="false" />
-      <execute-tests swf="${bin.loc}/TestRunner-as3.swf" reportdir="${report.xunit.as3.loc}" />
-      <generate-html-report dir="${report.xunit.as3.loc}" todir="${report.xunit.as3.loc}/html" />
-   </target>
+	<target name="test-only" unless="build.instrument">
+		<echo message="Testing FlexUnit Flex build..." />
+		<compile-runner runner="${test.src.loc}/TestRunner.mxml" swf="${bin.loc}/TestRunner-flex.swf" include="flexunit*flex*.swc" useflex="true" />
+		<execute-tests swf="${bin.loc}/TestRunner-flex.swf" reportdir="${report.xunit.flex.loc}" />
+		<generate-html-report dir="${report.xunit.flex.loc}" todir="${report.xunit.flex.loc}/html" />
+		
+		<echo message="Testing FlexUnit AS3 ONLY build..." />
+		<compile-runner runner="${test.src.loc}/TestRunner.mxml" swf="${bin.loc}/TestRunner-as3.swf" include="flexunit*as3*.swc" useflex="false" />
+		<execute-tests swf="${bin.loc}/TestRunner-as3.swf" reportdir="${report.xunit.as3.loc}" />
+		<generate-html-report dir="${report.xunit.as3.loc}" todir="${report.xunit.as3.loc}/html" />
+	</target>
 
-   <target name="test-and-instrument" if="build.instrument">
-      <echo message="Testing FlexUnit Flex build..." />
-      <compile-runner runner="${test.src.loc}/InstrumentTestRunner.mxml" swf="${bin.loc}/TestRunner-flex.swf" include="flexunit*flex*.swc" useflex="true" />
-      <execute-tests-using-flexcover swf="${bin.loc}/TestRunner-flex.swf" reportdir="${report.xunit.flex.loc}" flexcoverreport="${report.flexcover.loc}/flexunit-instrument-flex.cvr" coberturareport="${report.flexcover.loc}/coverage-flex.xml" />
-      <generate-html-report dir="${report.xunit.flex.loc}" todir="${report.xunit.flex.loc}/html" />
-      
-      <echo message="Testing FlexUnit AS3 ONLY build..." />
-      <compile-runner runner="${test.src.loc}/InstrumentTestRunner.mxml" swf="${bin.loc}/TestRunner-as3.swf" include="flexunit*as3*.swc"  useflex="false" />
-      <execute-tests-using-flexcover swf="${bin.loc}/TestRunner-as3.swf" reportdir="${report.xunit.as3.loc}" flexcoverreport="${report.flexcover.loc}/flexunit-instrument-as3.cvr" coberturareport="${report.flexcover.loc}/coverage-as3.xml" />
-      <generate-html-report dir="${report.xunit.as3.loc}" todir="${report.xunit.as3.loc}/html" />
-   </target>
+	<target name="test-and-instrument" if="build.instrument">
+		<echo message="Testing FlexUnit Flex build..." />
+		<compile-runner runner="${test.src.loc}/InstrumentTestRunner.mxml" swf="${bin.loc}/TestRunner-flex.swf" include="flexunit*flex*.swc" useflex="true" />
+		<execute-tests-using-flexcover swf="${bin.loc}/TestRunner-flex.swf" reportdir="${report.xunit.flex.loc}" flexcoverreport="${report.flexcover.loc}/flexunit-instrument-flex.cvr" coberturareport="${report.flexcover.loc}/coverage-flex.xml" />
+		<generate-html-report dir="${report.xunit.flex.loc}" todir="${report.xunit.flex.loc}/html" />
+		
+		<echo message="Testing FlexUnit AS3 ONLY build..." />
+		<compile-runner runner="${test.src.loc}/InstrumentTestRunner.mxml" swf="${bin.loc}/TestRunner-as3.swf" include="flexunit*as3*.swc"  useflex="false" />
+		<execute-tests-using-flexcover swf="${bin.loc}/TestRunner-as3.swf" reportdir="${report.xunit.as3.loc}" flexcoverreport="${report.flexcover.loc}/flexunit-instrument-as3.cvr" coberturareport="${report.flexcover.loc}/coverage-as3.xml" />
+		<generate-html-report dir="${report.xunit.as3.loc}" todir="${report.xunit.as3.loc}/html" />
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4Tutorials/Unit1/Start/FlexUnit4Training/downloads.xml b/FlexUnit4Tutorials/Unit1/Start/FlexUnit4Training/downloads.xml
index 289b884..1f2307e 100644
--- a/FlexUnit4Tutorials/Unit1/Start/FlexUnit4Training/downloads.xml
+++ b/FlexUnit4Tutorials/Unit1/Start/FlexUnit4Training/downloads.xml
@@ -8,7 +8,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+	  http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,142 +20,142 @@
 
 <project name="downloads" default="main" basedir=".">
 	
-    <pathconvert property="compiler.tests" dirsep="/">
-        <path location="${basedir}"/>
-    </pathconvert>
+	<pathconvert property="compiler.tests" dirsep="/">
+		<path location="${basedir}"/>
+	</pathconvert>
 
-    <property name="lib.dir" value="${compiler.tests}/libs"/>
-    
+	<property name="lib.dir" value="${compiler.tests}/libs"/>
+	
 	<property name="download.dir" value="${compiler.tests}/in"/>
-    
+	
 	<!-- 
 	   Notes:
-	       For Apache, the SWCs must be removed from the repository.
-	       
-	       Licenses:
-            asx.swc  - MIT
+		   For Apache, the SWCs must be removed from the repository.
+		   
+		   Licenses:
+			asx.swc  - MIT
 			flexunit-core-flex - Apache 2.0
 			floxy - BDY
-            hamcrest (1.1.3)  - BSD
+			hamcrest (1.1.3)  - BSD
 			mockolate (0.9.3)  - MIT
 	-->
-		     
-    <!-- 
-        Because the downloads requires a network connection and the JARs don't change very often, 
-        they are each downloaded only if they don't already exist. 
-    -->
-    
+			 
+	<!-- 
+		Because the downloads requires a network connection and the JARs don't change very often, 
+		they are each downloaded only if they don't already exist. 
+	-->
+	
 	<target name="main" depends="prepare, asx-swc, flexunit-core-flex-swc, floxy-swc, hamcrest-swc, mockolate-swc"
-		    description="Downloads all the required thirdparty SWCs"/>
+			description="Downloads all the required thirdparty SWCs"/>
 
-    <target name="prepare" >
-        <mkdir dir="${lib.dir}" />
-    </target>
-    
-    <!--
+	<target name="prepare" >
+		<mkdir dir="${lib.dir}" />
+	</target>
+	
+	<!--
 		Cleanup
 	-->
 	
-    <target name="clean" 
-            description="Removes thirdparty downloads.">
-        <delete includeEmptyDirs="true" failonerror="false">
-            <fileset dir="${lib.dir}" />
+	<target name="clean" 
+			description="Removes thirdparty downloads.">
+		<delete includeEmptyDirs="true" failonerror="false">
+			<fileset dir="${lib.dir}" />
 			<fileset dir="${download.dir}" />
-        </delete>
-    </target>
-    
-    <!--
-	    Download thirdparty SWCs    
+		</delete>
+	</target>
+	
+	<!--
+		Download thirdparty SWCs    
 	-->
 
-    <!--
-        Download a swc file and optionally verify the checksum.
-        If the checksum fails, this script fails.
-        
-        Params are:
-            srcUrl
-            srcSwcFile
-            destSwcFile
-            [md5]
-    -->
-    <target name="download-swc" 
-            description="Downloads swc, and optionally verifies checksum.">                    
-        <get src="${srcUrl}/${srcSwcFile}" dest="${destSwcFile}"/>
-        <checksum file="${destSwcFile}" algorithm="MD5" property="${we.failed}"/>
-        <antcall target="fail-with-message">
-            <param name="message" value="Checksum mismatch for ${destSwcFile}"/>
-        </antcall>
-    </target>
+	<!--
+		Download a swc file and optionally verify the checksum.
+		If the checksum fails, this script fails.
+		
+		Params are:
+			srcUrl
+			srcSwcFile
+			destSwcFile
+			[md5]
+	-->
+	<target name="download-swc" 
+			description="Downloads swc, and optionally verifies checksum.">                    
+		<get src="${srcUrl}/${srcSwcFile}" dest="${destSwcFile}"/>
+		<checksum file="${destSwcFile}" algorithm="MD5" property="${we.failed}"/>
+		<antcall target="fail-with-message">
+			<param name="message" value="Checksum mismatch for ${destSwcFile}"/>
+		</antcall>
+	</target>
 	
-    <!--
-        Download a zip or gz file, extracts the jar file, and optionally copies the jar
-        file to a different location and optinally verifies the checksum.  
-        If the checksum fails, this script fails.
+	<!--
+		Download a zip or gz file, extracts the jar file, and optionally copies the jar
+		file to a different location and optinally verifies the checksum.  
+		If the checksum fails, this script fails.
 
-        Params are:
-            srcUrl
-            zipFile - a .gz file for untar with gzip, else unzip
-            [md5]
-            [srcJarPath] - both src and dest required for the copy
-            [destJarFile]
+		Params are:
+			srcUrl
+			zipFile - a .gz file for untar with gzip, else unzip
+			[md5]
+			[srcJarPath] - both src and dest required for the copy
+			[destJarFile]
 
-        Note: This is purposely coded without <if><else><then> so that a dependency on
-        ant-contrib.jar isn't required.        
-    -->
+		Note: This is purposely coded without <if><else><then> so that a dependency on
+		ant-contrib.jar isn't required.        
+	-->
 	
-    <target name="download-zip"
-        description="Downloads tar/zip, and optionally verifies checksum and copies extracted swc.">                
-        
-        <mkdir dir="${download.dir}"/>        
-    	
-        <get src="${srcUrl}/${zipFile}" dest="${download.dir}/${zipFile}"/>
+	<target name="download-zip"
+		description="Downloads tar/zip, and optionally verifies checksum and copies extracted swc.">                
+		
+		<mkdir dir="${download.dir}"/>        
+		
+		<get src="${srcUrl}/${zipFile}" dest="${download.dir}/${zipFile}"/>
 
-        <condition property="zip.compressed">
-            <matches string="${zipFile}" pattern="^*.zip$"/>      
-        </condition>
+		<condition property="zip.compressed">
+			<matches string="${zipFile}" pattern="^*.zip$"/>      
+		</condition>
  
-        <antcall target="untar-file"/>
-        <antcall target="unzip-file"/>
-        
-        <antcall target="check-sum">
-            <param name="message" value="Checksum mismatch for ${download.dir}/${zipFile}"/>
-        </antcall>
-        
-        <condition property="destination.known">
-            <and>
-                <isset property="srcJarPath"/>
-                <isset property="destJarFile"/>
-            </and>
-        </condition> 
-        <antcall target="copy-downloaded-swc"/>
-     </target> 
+		<antcall target="untar-file"/>
+		<antcall target="unzip-file"/>
+		
+		<antcall target="check-sum">
+			<param name="message" value="Checksum mismatch for ${download.dir}/${zipFile}"/>
+		</antcall>
+		
+		<condition property="destination.known">
+			<and>
+				<isset property="srcJarPath"/>
+				<isset property="destJarFile"/>
+			</and>
+		</condition> 
+		<antcall target="copy-downloaded-swc"/>
+	 </target> 
 	
-    <target name="untar-file" unless="zip.compressed" description="Untars zipFile">
-        <untar src="${download.dir}/${zipFile}" dest="${download.dir}/temp" compression="gzip"/> 
-    </target>
-    
-    <target name="unzip-file" if="zip.compressed" description="Unzips zipFile">
-        <unzip src="${download.dir}/${zipFile}" dest="${download.dir}/temp"/>    
-    </target>
-    
-    <target name="check-sum" if="md5" 
-        description="Verifies MD5 checksum, and fails if checksum doesn't match">
-        
-        <checksum file="${download.dir}/${zipFile}" algorithm="MD5" property="${we.failed}"/>
-        <antcall target="fail-with-message">
-            <param name="message" value="${message}"/>
-        </antcall>
-    </target>
+	<target name="untar-file" unless="zip.compressed" description="Untars zipFile">
+		<untar src="${download.dir}/${zipFile}" dest="${download.dir}/temp" compression="gzip"/> 
+	</target>
 	
-    <target name="copy-downloaded-swc" if="destination.known">
-        <mkdir dir="${lib.dir}"/>
-        <copy file="${download.dir}/temp/${srcJarPath}" toFile="${destJarFile}" verbose="true"/>
-    </target>
+	<target name="unzip-file" if="zip.compressed" description="Unzips zipFile">
+		<unzip src="${download.dir}/${zipFile}" dest="${download.dir}/temp"/>    
+	</target>
 	
-    <target name="fail-with-message" if="we.failed" 
-            description="Conditionally fails with the specified message">                
-        <fail message="${message}"/>
-    </target>
+	<target name="check-sum" if="md5" 
+		description="Verifies MD5 checksum, and fails if checksum doesn't match">
+		
+		<checksum file="${download.dir}/${zipFile}" algorithm="MD5" property="${we.failed}"/>
+		<antcall target="fail-with-message">
+			<param name="message" value="${message}"/>
+		</antcall>
+	</target>
+	
+	<target name="copy-downloaded-swc" if="destination.known">
+		<mkdir dir="${lib.dir}"/>
+		<copy file="${download.dir}/temp/${srcJarPath}" toFile="${destJarFile}" verbose="true"/>
+	</target>
+	
+	<target name="fail-with-message" if="we.failed" 
+			description="Conditionally fails with the specified message">                
+		<fail message="${message}"/>
+	</target>
 	
 	<!--
 		asx
@@ -233,21 +233,21 @@
 				<available file="${lib.dir}/floxy.swc"/>
 			</and>
 		</condition>
-	</target>        
+	</target>
 	
-   <!--
+	<!--
 		hamcrest-as3  
-	-->	    
+	-->
 	<target name="hamcrest-swc" depends="hamcrest-swc-check" 
 		unless="hamcrest.swc.exists" 
 		description="Downloads and copies hamcrest to the lib directory.">
 		<echo message="Obtaining lib/hamcrest-as3-flex-1.1.3.swc"/>
 		<antcall target="download-zip">
-		  <param name="srcUrl" value="https://cloud.github.com/downloads/drewbourne/hamcrest-as3"/>
-		  <param name="zipFile" value="hamcrest-as3-flex-1.1.3.zip"/>
-		  <param name="srcJarPath" value="hamcrest-as3-flex-1.1.3/hamcrest-as3-flex-1.1.3.swc"/>
-		  <param name="md5" value="b73fe1bb5f443993adcf8b274f6a48b2"/>
-		  <param name="destJarFile" value="${lib.dir}/hamcrest-as3-flex-1.1.3.swc"/>
+			<param name="srcUrl" value="https://cloud.github.com/downloads/drewbourne/hamcrest-as3"/>
+			<param name="zipFile" value="hamcrest-as3-flex-1.1.3.zip"/>
+			<param name="srcJarPath" value="hamcrest-as3-flex-1.1.3/hamcrest-as3-flex-1.1.3.swc"/>
+			<param name="md5" value="b73fe1bb5f443993adcf8b274f6a48b2"/>
+			<param name="destJarFile" value="${lib.dir}/hamcrest-as3-flex-1.1.3.swc"/>
 		</antcall>
 		<delete dir="${download.dir}/temp/hamcrest-as3-flex-1.1.3"/>
 		
@@ -279,11 +279,11 @@
 		description="Downloads and copies mockolate to the lib directory.">
 		<echo message="Obtaining lib/mockolate-0.9.5.swc"/>
 		<antcall target="download-zip">
-		  <param name="srcUrl" value="http://cloud.github.com/downloads/drewbourne/mockolate"/>
-		  <param name="zipFile" value="mockolate-0.9.5.zip"/>
-		  <param name="srcJarPath" value="mockolate-0.9.5/mockolate-0.9.5.swc"/>
-		  <param name="md5" value="b73fe1bb5f443993adcf8b274f6a48b2"/>
-		  <param name="destJarFile" value="${lib.dir}/mockolate-0.9.5.swc"/>
+			<param name="srcUrl" value="http://cloud.github.com/downloads/drewbourne/mockolate"/>
+			<param name="zipFile" value="mockolate-0.9.5.zip"/>
+			<param name="srcJarPath" value="mockolate-0.9.5/mockolate-0.9.5.swc"/>
+			<param name="md5" value="b73fe1bb5f443993adcf8b274f6a48b2"/>
+			<param name="destJarFile" value="${lib.dir}/mockolate-0.9.5.swc"/>
 		</antcall>
 		<delete dir="${download.dir}/temp/mockolate-0.9.5"/>
 		
diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml
index 549deb0..1da63a7 100644
--- a/FlexUnit4UIListener/build.xml
+++ b/FlexUnit4UIListener/build.xml
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,36 +16,36 @@
   limitations under the License.
 -->
 <project name="FlexUnit4UIListener" basedir="." default="package">
-   <import file="${basedir}/../utils.xml" />
-   <property environment="env" />
-
-   <!-- Configuration -->
-   <property name="build.artifactId" value="flexunit-uilistener" />
-   <property name="build.namespace" value="http://www.adobe.com/2009/flexUnitUIRunner" />
-   <property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
-   <property name="build.packaging" value="swc" />
-   <property name="build.deploy.name" value="FlexUnit UI Listener" />
-   <property name="build.deploy.description" value="Listener used to show a UI report for FlexUnit test results." />
-
-   <!-- Existing -->
-   <property name="src.loc" location="${basedir}/src" />
-   <property name="lib.loc" location="${basedir}/libs" />
-
-   <!-- Generated -->
-   <property name="dist.loc" location="${basedir}/target" />
-   <property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
-   <property name="bin.loc" location="${basedir}/target/bin" />
-   <property name="doc.loc" location="${basedir}/target/docs" />
-
-   <!-- Setup Flex Ant Resources -->
-   <available file="${env.FLEX_HOME}/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${env.FLEX_HOME}"/>
-   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
-      type="file" 
-      property="FLEX_HOME"
-      value="${basedir}/../../flex-sdk"/>
+	<import file="${basedir}/../utils.xml" />
+	<property environment="env" />
+
+	<!-- Configuration -->
+	<property name="build.artifactId" value="flexunit-uilistener" />
+	<property name="build.namespace" value="http://www.adobe.com/2009/flexUnitUIRunner" />
+	<property name="build.finalName" value="${build.artifactId}-${build.version}-${build.number}-${build.sdk}" />
+	<property name="build.packaging" value="swc" />
+	<property name="build.deploy.name" value="FlexUnit UI Listener" />
+	<property name="build.deploy.description" value="Listener used to show a UI report for FlexUnit test results." />
+
+	<!-- Existing -->
+	<property name="src.loc" location="${basedir}/src" />
+	<property name="lib.loc" location="${basedir}/libs" />
+
+	<!-- Generated -->
+	<property name="dist.loc" location="${basedir}/target" />
+	<property name="apache-maven.loc" location="${dist.loc}/apache-maven" />
+	<property name="bin.loc" location="${basedir}/target/bin" />
+	<property name="doc.loc" location="${basedir}/target/docs" />
+
+	<!-- Setup Flex Ant Resources -->
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
@@ -53,130 +53,130 @@
 		</classpath>
 	</taskdef>
 	
-   <target name="clean">
-      <delete dir="${dist.loc}" failonerror="false" />
-      <delete failonerror="false">
-         <fileset dir="${lib.loc}" />
-      </delete>
-   </target>
-
-   <target name="init">
-      <mkdir dir="${lib.loc}" />
-      <mkdir dir="${dist.loc}" />
-      <mkdir dir="${apache-maven.loc}" />
-      <mkdir dir="${bin.loc}" />
-      <mkdir dir="${doc.loc}" />
-
-      <!-- Copy required dependencies -->
-      <copy todir="${lib.loc}" overwrite="true" failonerror="false">
-         <fileset dir="${basedir}/../FlexUnit4/target">
-            <include name="flexunit*as3*.swc" />
-         </fileset>
-      </copy>
-
-      <!-- Create properties file from .flexLibProperties -->
-      <xslt in="${basedir}/.flexLibProperties" out="${bin.loc}/flexLib.properties" style="${basedir}/flexLibProperties.xsl" />
-   </target>
-
-   <target name="identify-sdk">
-      <java jar="${FLEX_HOME}/lib/compc.jar" fork="true" failonerror="true" outputproperty="build.sdk.version">
-         <arg line="-version" />
-      </java>
-
-      <echo message="Found: ${build.sdk.version}" />
-
-      <condition property="build.isFlex4">
-         <contains string="${build.sdk.version}" substring="Version 4." casesensitive="false" />
-      </condition>
-   </target>
-
-   <target name="compile" depends="init,identify-sdk,compile-flex3,compile-flex4" />
-
-   <target name="compile-flex3" unless="build.isFlex4">
-      <!-- Pull in class file list for compc -->
-      <property file="${bin.loc}/flexLib.properties" />
-
-      <!-- Compile swc -->
-      <compc output="${bin.loc}/${build.finalName}.${build.packaging}" include-classes="${src.class-list}">
-         <source-path path-element="${src.loc}" />
-         <namespace uri="${build.namespace}" manifest="${src.loc}/FlexUnit4UIRunner-manifest.xml" />
-         <include-namespaces>http://www.adobe.com/2009/flexUnitUIRunner</include-namespaces>
-         <compiler.external-library-path dir="${lib.loc}" append="true">
-            <include name="*.swc" />
-         </compiler.external-library-path>
-         <compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
-            <include name="flex.swc" />
-            <include name="framework.swc" />
-            <include name="rpc.swc" />
-            <include name="utilities.swc" />
-         </compiler.external-library-path>
-         <compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
-         <compiler.headless-server>true</compiler.headless-server>
-      </compc>
-   </target>
-
-   <target name="compile-flex4" if="build.isFlex4">
-      <!-- Pull in class file list for compc -->
-      <property file="${bin.loc}/flexLib.properties" />
-
-      <!-- Compile swc -->
-      <java jar="${FLEX_HOME}/lib/compc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-compatibility-version=3.0.0" />
-         <arg line="-namespace http://www.adobe.com/2006/mxml '${FLEX_HOME}/frameworks/mxml-manifest.xml'" />
-         <arg line="-namespace ${build.namespace} ${src.loc}/FlexUnit4UIRunner-manifest.xml" />
-         <arg line="-include-namespaces ${build.namespace}" />
-         <arg line="-include-classes ${src.class-list}" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${bin.loc}/${build.finalName}.${build.packaging}'" />
-         <arg line="-external-library-path+='${lib.loc}'" />
-         <arg line="-external-library-path+='${FLEX_HOME}/frameworks/libs'" />
-         <arg line="-theme '${FLEX_HOME}/frameworks/themes/Halo/halo.swc'" />
-      </java>
-   </target>
-   
-   <target name="report" depends="compile,identify-sdk,report-flex3,report-flex4" if="build.report" />
-
-   <target name="report-flex3" unless="build.isFlex4">
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-sources '${src.loc}'" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-      </java>
-   </target>
-
-   <target name="report-flex4" if="build.isFlex4">
-      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
-         <jvmarg value="-Xmx256M" />
-         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
-         <arg line="-doc-sources '${src.loc}'" />
-         <arg line="-source-path+='${src.loc}'" />
-         <arg line="-output '${doc.loc}'" />
-         <arg line="-library-path+='${lib.loc}'" />
-         <arg line="-compatibility-version=3.0.0" />
-         <arg line="-theme '${FLEX_HOME}/frameworks/themes/Halo/halo.swc'" />
-      </java>
-   </target>
-
-   <target name="package" depends="report">
-      <copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
-   </target>
-   
-   <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
-      <!-- deploy to apache-maven repo -->
-      <apache-deploy
-         binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
-         todir="${apache-maven.loc}"
-         pomTemplate="${basedir}/../pom.template" 
-         artifact="${build.artifactId}" 
-         type="${build.packaging}" 
-         name="${build.deploy.name}" 
-         version="${build.version}" 
-         description="${build.deploy.description}">
-      </apache-deploy>
-   </target>
+	<target name="clean">
+		<delete dir="${dist.loc}" failonerror="false" />
+		<delete failonerror="false">
+			<fileset dir="${lib.loc}" />
+		</delete>
+	</target>
+
+	<target name="init">
+		<mkdir dir="${lib.loc}" />
+		<mkdir dir="${dist.loc}" />
+		<mkdir dir="${apache-maven.loc}" />
+		<mkdir dir="${bin.loc}" />
+		<mkdir dir="${doc.loc}" />
+
+		<!-- Copy required dependencies -->
+		<copy todir="${lib.loc}" overwrite="true" failonerror="false">
+			<fileset dir="${basedir}/../FlexUnit4/target">
+				<include name="flexunit*as3*.swc" />
+			</fileset>
+		</copy>
+
+		<!-- Create properties file from .flexLibProperties -->
+		<xslt in="${basedir}/.flexLibProperties" out="${bin.loc}/flexLib.properties" style="${basedir}/flexLibProperties.xsl" />
+	</target>
+
+	<target name="identify-sdk">
+		<java jar="${FLEX_HOME}/lib/compc.jar" fork="true" failonerror="true" outputproperty="build.sdk.version">
+			<arg line="-version" />
+		</java>
+
+		<echo message="Found: ${build.sdk.version}" />
+
+		<condition property="build.isFlex4">
+			<contains string="${build.sdk.version}" substring="Version 4." casesensitive="false" />
+		</condition>
+	</target>
+
+	<target name="compile" depends="init,identify-sdk,compile-flex3,compile-flex4" />
+
+	<target name="compile-flex3" unless="build.isFlex4">
+		<!-- Pull in class file list for compc -->
+		<property file="${bin.loc}/flexLib.properties" />
+
+		<!-- Compile swc -->
+		<compc output="${bin.loc}/${build.finalName}.${build.packaging}" include-classes="${src.class-list}">
+			<source-path path-element="${src.loc}" />
+			<namespace uri="${build.namespace}" manifest="${src.loc}/FlexUnit4UIRunner-manifest.xml" />
+			<include-namespaces>http://www.adobe.com/2009/flexUnitUIRunner</include-namespaces>
+			<compiler.external-library-path dir="${lib.loc}" append="true">
+				<include name="*.swc" />
+			</compiler.external-library-path>
+			<compiler.external-library-path dir="${FLEX_HOME}/frameworks/libs" append="true">
+				<include name="flex.swc" />
+				<include name="framework.swc" />
+				<include name="rpc.swc" />
+				<include name="utilities.swc" />
+			</compiler.external-library-path>
+			<compiler.verbose-stacktraces>true</compiler.verbose-stacktraces>
+			<compiler.headless-server>true</compiler.headless-server>
+		</compc>
+	</target>
+
+	<target name="compile-flex4" if="build.isFlex4">
+		<!-- Pull in class file list for compc -->
+		<property file="${bin.loc}/flexLib.properties" />
+
+		<!-- Compile swc -->
+		<java jar="${FLEX_HOME}/lib/compc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-compatibility-version=3.0.0" />
+			<arg line="-namespace http://www.adobe.com/2006/mxml '${FLEX_HOME}/frameworks/mxml-manifest.xml'" />
+			<arg line="-namespace ${build.namespace} ${src.loc}/FlexUnit4UIRunner-manifest.xml" />
+			<arg line="-include-namespaces ${build.namespace}" />
+			<arg line="-include-classes ${src.class-list}" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${bin.loc}/${build.finalName}.${build.packaging}'" />
+			<arg line="-external-library-path+='${lib.loc}'" />
+			<arg line="-external-library-path+='${FLEX_HOME}/frameworks/libs'" />
+			<arg line="-theme '${FLEX_HOME}/frameworks/themes/Halo/halo.swc'" />
+		</java>
+	</target>
+	
+	<target name="report" depends="compile,identify-sdk,report-flex3,report-flex4" if="build.report" />
+
+	<target name="report-flex3" unless="build.isFlex4">
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-sources '${src.loc}'" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+		</java>
+	</target>
+
+	<target name="report-flex4" if="build.isFlex4">
+		<java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+			<jvmarg value="-Xmx256M" />
+			<arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+			<arg line="-doc-sources '${src.loc}'" />
+			<arg line="-source-path+='${src.loc}'" />
+			<arg line="-output '${doc.loc}'" />
+			<arg line="-library-path+='${lib.loc}'" />
+			<arg line="-compatibility-version=3.0.0" />
+			<arg line="-theme '${FLEX_HOME}/frameworks/themes/Halo/halo.swc'" />
+		</java>
+	</target>
+
+	<target name="package" depends="report">
+		<copy file="${bin.loc}/${build.finalName}.${build.packaging}" todir="${dist.loc}" />
+	</target>
+	
+	<target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work.">
+		<!-- deploy to apache-maven repo -->
+		<apache-deploy
+			binaryFile="${bin.loc}/${build.finalName}.${build.packaging}"
+			todir="${apache-maven.loc}"
+			pomTemplate="${basedir}/../pom.template" 
+			artifact="${build.artifactId}" 
+			type="${build.packaging}" 
+			name="${build.deploy.name}" 
+			version="${build.version}" 
+			description="${build.deploy.description}">
+		</apache-deploy>
+	</target>
 </project>
\ No newline at end of file
diff --git a/FlexUnit4UIListener/src/design.xml b/FlexUnit4UIListener/src/design.xml
index f54a4e7..8584893 100644
--- a/FlexUnit4UIListener/src/design.xml
+++ b/FlexUnit4UIListener/src/design.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	contributor license agreements.  See the NOTICE file distributed with
+	this work for additional information regarding copyright ownership.
+	The ASF licenses this file to You under the Apache License, Version 2.0
+	(the "License"); you may not use this file except in compliance with
+	the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+			http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
 -->
 <design>
-   <namespaces>
-     <namespace prefix="flexUnitUIRunner" uri="http://www.adobe.com/2009/flexUnitUIRunner"/>
-   </namespaces>
-   
-   <categories>
-	   <category id="flexUnit" label="flexUnit" defaultExpand="true"/>
-   </categories>
-		
-   <components>
+	<namespaces>
+		<namespace prefix="flexUnitUIRunner" uri="http://www.adobe.com/2009/flexUnitUIRunner"/>
+	</namespaces>
+	
+	<categories>
+		<category id="flexUnit" label="flexUnit" defaultExpand="true"/>
+	</categories>
+	
+	<components>
 		<component name="org.flexunit.flexui.TestRunnerBase" namespace="flexUnitUIRunner" category="flexUnit"/>
-   </components>
+	</components>
 </design>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 512aff9..dc997fd 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+		http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,167 +29,167 @@ Reporting is something each project implements which we then have hooked into Hu
 to contribute to our CI process.
 -->
 <project name="FlexUnit4" basedir="." default="main">
-   <property environment="env" />
-
-   <!-- Version info -->
-   <property file="${basedir}/version.properties" />
-
-   <!-- Configuration -->
-   <property name="finalName" value="apache-flex-flexunit-${build.version}-${build.sdk}" />
-
-   <!-- Project locations -->
-   <property name="anttasks.loc" location="${basedir}/FlexUnit4AntTasks" />
-   <property name="core.loc" location="${basedir}/FlexUnit4" />
-   <property name="fluint.loc" location="${basedir}/FlexUnit4FluintExtensions" />
-   <property name="cilistener.loc" location="${basedir}/FlexUnit4CIListener" />
-   <property name="tests.loc" location="${basedir}/FlexUnit4Test" />
-   <property name="uilistener.loc" location="${basedir}/FlexUnit4UIListener" />
-   <property name="aircilistener.loc" location="${basedir}/FlexUnit4AirCIListener" />
-   <property name="flexcoverlistener.loc" location="${basedir}/FlexUnit4FlexCoverListener" />
-   <property name="turnkey.loc" location="${basedir}/FlexUnit4TurnKey" />
-   <property name="sampleCI.loc" location="${basedir}/FlexUnit4SampleCIProject" />
-   
-   <!-- xml namespace which is used to deploy the artifacts with maven -->
-   <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-            uri="antlib:org.apache.maven.artifact.ant"
-            classpath="lib/maven-ant-tasks-2.1.3.jar"/>
-   <taskdef resource="net/sf/antcontrib/antcontrib.properties"
-            classpath="lib/ant-contrib-1.0b3.jar"/>
-   
-    <!--
-        Optional jars but should be in place for a real release build.
-
-        For <rat> apache-rat-0.8.jar and apache-rat-tasks-0.8.jar should be in classpath.
-        See rat-report.
-    -->
-    <path id="anttask.classpath">
-        <fileset dir="${env.ANT_HOME}/lib">
-           <include name="**/apache-rat*.jar"/>
-        </fileset>
-        <fileset dir="${user.home}">
-           <include name=".ant/lib/**/apache-rat*.jar"/>
-        </fileset>
-    </path>
-
-   <!-- Cleans up all projects -->
-   <target name="clean">
-   	  <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" />
-
-      <!-- Ask each project to clean up -->
-      <ant dir="${anttasks.loc}" target="clean" inheritall="false" />
-      <ant dir="${core.loc}" target="clean" inheritall="false" />
-      <ant dir="${fluint.loc}" target="clean" inheritall="false" />
-      <ant dir="${cilistener.loc}" target="clean" inheritall="false" />
-      <ant dir="${tests.loc}" target="clean" inheritall="false" />
-      <ant dir="${uilistener.loc}" target="clean" inheritall="false" />
-      <ant dir="${aircilistener.loc}" target="clean" inheritall="false" />
-      <ant dir="${flexcoverlistener.loc}" target="clean" inheritall="false" />
+	<property environment="env" />
+
+	<!-- Version info -->
+	<property file="${basedir}/version.properties" />
+
+	<!-- Configuration -->
+	<property name="finalName" value="apache-flex-flexunit-${build.version}-${build.sdk}" />
+
+	<!-- Project locations -->
+	<property name="anttasks.loc" location="${basedir}/FlexUnit4AntTasks" />
+	<property name="core.loc" location="${basedir}/FlexUnit4" />
+	<property name="fluint.loc" location="${basedir}/FlexUnit4FluintExtensions" />
+	<property name="cilistener.loc" location="${basedir}/FlexUnit4CIListener" />
+	<property name="tests.loc" location="${basedir}/FlexUnit4Test" />
+	<property name="uilistener.loc" location="${basedir}/FlexUnit4UIListener" />
+	<property name="aircilistener.loc" location="${basedir}/FlexUnit4AirCIListener" />
+	<property name="flexcoverlistener.loc" location="${basedir}/FlexUnit4FlexCoverListener" />
+	<property name="turnkey.loc" location="${basedir}/FlexUnit4TurnKey" />
+	<property name="sampleCI.loc" location="${basedir}/FlexUnit4SampleCIProject" />
+	
+	<!-- xml namespace which is used to deploy the artifacts with maven -->
+	<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+			uri="antlib:org.apache.maven.artifact.ant"
+			classpath="lib/maven-ant-tasks-2.1.3.jar"/>
+	<taskdef resource="net/sf/antcontrib/antcontrib.properties"
+			classpath="lib/ant-contrib-1.0b3.jar"/>
+	
+	 <!--
+		  Optional jars but should be in place for a real release build.
+
+		  For <rat> apache-rat-0.8.jar and apache-rat-tasks-0.8.jar should be in classpath.
+		  See rat-report.
+	 -->
+	 <path id="anttask.classpath">
+		<fileset dir="${env.ANT_HOME}/lib">
+			<include name="**/apache-rat*.jar"/>
+		</fileset>
+		<fileset dir="${user.home}">
+			<include name=".ant/lib/**/apache-rat*.jar"/>
+		</fileset>
+	 </path>
+
+	<!-- Cleans up all projects -->
+	<target name="clean">
+		<ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" />
+
+		<!-- Ask each project to clean up -->
+		<ant dir="${anttasks.loc}" target="clean" inheritall="false" />
+		<ant dir="${core.loc}" target="clean" inheritall="false" />
+		<ant dir="${fluint.loc}" target="clean" inheritall="false" />
+		<ant dir="${cilistener.loc}" target="clean" inheritall="false" />
+		<ant dir="${tests.loc}" target="clean" inheritall="false" />
+		<ant dir="${uilistener.loc}" target="clean" inheritall="false" />
+		<ant dir="${aircilistener.loc}" target="clean" inheritall="false" />
+		<ant dir="${flexcoverlistener.loc}" target="clean" inheritall="false" />
 	  
-      <delete failonerror="false">
-        <fileset dir="${basedir}/out">
+		<delete failonerror="false">
+		<fileset dir="${basedir}/out">
 			<include name="*.zip" />
-        </fileset>
-        <fileset dir="${basedir}/out">
+		</fileset>
+		<fileset dir="${basedir}/out">
 			<include name="*.tar.gz" />
-        </fileset>
-        <fileset dir="${basedir}/out">
+		</fileset>
+		<fileset dir="${basedir}/out">
 			<include name="*.md5" />
-        </fileset>
-        <fileset dir="${basedir}/out">
+		</fileset>
+		<fileset dir="${basedir}/out">
 			<include name="*.asc" />
-        </fileset>
+		  </fileset>
 		<fileset dir="FlexUnit4Turnkey/export">
 			<include name="*.zip" />
 		</fileset>
-      </delete>
-   </target>
+		</delete>
+	</target>
 	
 	<target name="main" depends="anttasks,core,fluint,cilistener,flexcoverlistener,listeners" />
-   
-    <target name="thirdparty-downloads">
+	
+	 <target name="thirdparty-downloads">
 		<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />	
 		
-        <ant dir="${anttasks.loc}" target="thirdparty-downloads" inheritall="false" />
+		<ant dir="${anttasks.loc}" target="thirdparty-downloads" inheritall="false" />
 		<ant dir="${core.loc}" target="thirdparty-downloads" inheritall="false" />
-        <ant dir="${fluint.loc}" target="thirdparty-downloads" inheritall="false" />
-        <ant dir="${tests.loc}" target="thirdparty-downloads" inheritall="false" />
-        <ant dir="${flexcoverlistener.loc}" target="thirdparty-downloads" inheritall="false" />
-
-    </target>
-
-   <!-- Builds the FlexUnit4AntTasks project -->
-   <target name="anttasks">
-      <ant dir="${anttasks.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+		<ant dir="${fluint.loc}" target="thirdparty-downloads" inheritall="false" />
+		<ant dir="${tests.loc}" target="thirdparty-downloads" inheritall="false" />
+		<ant dir="${flexcoverlistener.loc}" target="thirdparty-downloads" inheritall="false" />
+
+	 </target>
+
+	<!-- Builds the FlexUnit4AntTasks project -->
+	<target name="anttasks">
+		<ant dir="${anttasks.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 
-   <!-- Builds the core FlexUnit4 project -->
-   <target name="core">
-      <ant dir="${core.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<!-- Builds the core FlexUnit4 project -->
+	<target name="core">
+		<ant dir="${core.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 	
 	<!-- Prepares and builds the FlexUnit4 Fluint Extensions -->
-   <target name="fluint" depends="core">
-      <ant dir="${fluint.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<target name="fluint" depends="core">
+		<ant dir="${fluint.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 	
-   <!-- Prepares and builds the FlexUnit4CIListener project -->
-   <target name="cilistener" depends="core">
-      <ant dir="${cilistener.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<!-- Prepares and builds the FlexUnit4CIListener project -->
+	<target name="cilistener" depends="core">
+		<ant dir="${cilistener.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 
-   <!-- Prepares and builds the FlexCover Listener project -->
-   <target name="flexcoverlistener" depends="core,cilistener">
-      <ant dir="${flexcoverlistener.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<!-- Prepares and builds the FlexCover Listener project -->
+	<target name="flexcoverlistener" depends="core,cilistener">
+		<ant dir="${flexcoverlistener.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 
-   <!-- Prepares and builds the FlexUnit4Test project -->
-   <target name="test" depends="anttasks,core,fluint,cilistener,flexcoverlistener" unless="build.skipTests">
-      <ant dir="${tests.loc}" target="test" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<!-- Prepares and builds the FlexUnit4Test project -->
+	<target name="test" depends="anttasks,core,fluint,cilistener,flexcoverlistener" unless="build.skipTests">
+		<ant dir="${tests.loc}" target="test" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 
-   <target name="listeners" depends="uilistener,aircilistener" />
+	<target name="listeners" depends="uilistener,aircilistener" />
 
-   <!-- Prepares and builds the FlexUnit4UIRunner project -->
-   <target name="uilistener" depends="core,fluint,cilistener">
-      <ant dir="${uilistener.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<!-- Prepares and builds the FlexUnit4UIRunner project -->
+	<target name="uilistener" depends="core,fluint,cilistener">
+		<ant dir="${uilistener.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 
-   <!-- Prepares and builds the Air CI Listener project -->
-   <target name="aircilistener" depends="core,fluint,cilistener">
-      <ant dir="${aircilistener.loc}" target="package" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-   </target>
+	<!-- Prepares and builds the Air CI Listener project -->
+	<target name="aircilistener" depends="core,fluint,cilistener">
+		<ant dir="${aircilistener.loc}" target="package" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+	</target>
 
 	<target name="package" depends="rat-report,allpackages">
 		<mkdir dir="${basedir}/out"/>
@@ -197,279 +197,276 @@ to contribute to our CI process.
 	
 	<target name="allpackages" depends="package-src-zip,package-bin-zip,package-src-gzip,package-bin-gzip" />
 	
-   <!-- Prepares and assembles the final source zip with all of the FlexUnit4 components and docs -->
-   <target name="package-src-zip" depends="test,listeners">
-      <zip destfile="${basedir}/out/${finalName}-src.zip">
-      	 <!-- Important Files -->
-      	 <zipfileset dir="${basedir}" includes="LICENSE,NOTICE,README,RELEASE_NOTES,build.xml,jenkins.xml,utils.xml,version.properties" />
-      	
-         <!-- Source -->
-         <zipfileset dir="${anttasks.loc}" excludes="**/target/**,**/lib/**,**/libs/**,**/in/**,**/*.swf" prefix="FlexUnit4AntTasks" />
-         <zipfileset dir="${core.loc}" excludes="**/target/**,**/lib/**,**/libs/**,**/in/**" prefix="FlexUnit4" />
-		 <zipfileset dir="${fluint.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4FluintExtensions" />
-         <zipfileset dir="${cilistener.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4CIListener" />
-         <zipfileset dir="${uilistener.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4UIListener" />
-         <zipfileset dir="${aircilistener.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4AirCIListener" />
-         <zipfileset dir="${flexcoverlistener.loc}" excludes="**/target/**,**/libs/**,**/in/*" prefix="FlexUnit4FlexCoverListener" />
-         	
-         <!-- Docs -->
-         <zipfileset dir="${core.loc}/target/docs" prefix="FlexUnit4/target/docs" />
-      	 <!--
-         <zipfileset dir="${anttasks.loc}/target/docs" prefix="FlexUnit4AntTasks/target/docs" />
-		 <zipfileset dir="${fluint.loc}/target/docs" prefix="FlexUnit4FluintExtensions/target/docs" />
-         <zipfileset dir="${cilistener.loc}/target/docs" prefix="FlexUnit4CIListener/target/doc" />
-         <zipfileset dir="${uilistener.loc}/target/docs" prefix="FlexUnit4UIListener/target/docs" />
-         <zipfileset dir="${aircilistener.loc}/target/docs" prefix="FlexUnit4AirCIListener/target/docs" />
-         <zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="FlexUnit4FlexCoverListener}/target/docs" />
-         -->
-      </zip>
-   </target>
+	<!-- Prepares and assembles the final source zip with all of the FlexUnit4 components and docs -->
+	<target name="package-src-zip" depends="test,listeners">
+		<zip destfile="${basedir}/out/${finalName}-src.zip">
+			<!-- Important Files -->
+			<zipfileset dir="${basedir}" includes="LICENSE,NOTICE,README,RELEASE_NOTES,build.xml,jenkins.xml,utils.xml,version.properties" />
+			
+			<!-- Source -->
+			<zipfileset dir="${anttasks.loc}" excludes="**/target/**,**/lib/**,**/libs/**,**/in/**,**/*.swf" prefix="FlexUnit4AntTasks" />
+			<zipfileset dir="${core.loc}" excludes="**/target/**,**/lib/**,**/libs/**,**/in/**" prefix="FlexUnit4" />
+		 	<zipfileset dir="${fluint.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4FluintExtensions" />
+			<zipfileset dir="${cilistener.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4CIListener" />
+			<zipfileset dir="${uilistener.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4UIListener" />
+			<zipfileset dir="${aircilistener.loc}" excludes="**/target/**,**/libs/**,**/in/**" prefix="FlexUnit4AirCIListener" />
+			<zipfileset dir="${flexcoverlistener.loc}" excludes="**/target/**,**/libs/**,**/in/*" prefix="FlexUnit4FlexCoverListener" />
+			
+			<!-- Docs -->
+			<zipfileset dir="${core.loc}/target/docs" prefix="FlexUnit4/target/docs" />
+			<!--
+			<zipfileset dir="${anttasks.loc}/target/docs" prefix="FlexUnit4AntTasks/target/docs" />
+			<zipfileset dir="${fluint.loc}/target/docs" prefix="FlexUnit4FluintExtensions/target/docs" />
+			<zipfileset dir="${cilistener.loc}/target/docs" prefix="FlexUnit4CIListener/target/doc" />
+			<zipfileset dir="${uilistener.loc}/target/docs" prefix="FlexUnit4UIListener/target/docs" />
+			<zipfileset dir="${aircilistener.loc}/target/docs" prefix="FlexUnit4AirCIListener/target/docs" />
+			<zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="FlexUnit4FlexCoverListener}/target/docs" />
+			-->
+		</zip>
+	</target>
 
-   <!-- Prepares and assembles the final source gzip with all of the FlexUnit4 components and docs -->
-   <target name="package-src-gzip" depends="package-src-zip">
-   	  <mkdir dir="${basedir}/out/temp"/>
-   	  <unzip src="${basedir}/out/${finalName}-src.zip" dest="${basedir}/out/temp" />
-      <tar compression="gzip" destfile="${basedir}/out/${finalName}-src.tar.gz">
-      	 <fileset dir="${basedir}/out/temp" />
-      </tar>
-   	  <delete dir="${basedir}/out/temp" />
-   </target>
+	<!-- Prepares and assembles the final source gzip with all of the FlexUnit4 components and docs -->
+	<target name="package-src-gzip" depends="package-src-zip">
+		<mkdir dir="${basedir}/out/temp"/>
+		<unzip src="${basedir}/out/${finalName}-src.zip" dest="${basedir}/out/temp" />
+		<tar compression="gzip" destfile="${basedir}/out/${finalName}-src.tar.gz">
+			<fileset dir="${basedir}/out/temp" />
+		</tar>
+		<delete dir="${basedir}/out/temp" />
+	</target>
 		
-   <!-- Prepares and assembles the final zip artifact with all of the FlexUnit4 components and docs -->
-   <target name="package-bin-zip" depends="test,listeners">
-      <zip destfile="${basedir}/out/${finalName}-bin.zip">
-     	 <!-- Important Files -->
-     	 <zipfileset dir="${basedir}" includes="LICENSE.bin,NOTICE.bin,README,RELEASE_NOTES" />
-      	
-         <!-- Docs -->
-      	 <zipfileset dir="${core.loc}/target/docs" prefix="docs/flexunit" />
-      	 <!--
-         <zipfileset dir="${anttasks.loc}/target/docs" prefix="docs/anttasks" />
-		 <zipfileset dir="${fluint.loc}/target/docs" prefix="docs/flexUnit4FluintExtensions" />
-         <zipfileset dir="${cilistener.loc}/target/docs" prefix="docs/cilistener" />
-         <zipfileset dir="${uilistener.loc}/target/docs" prefix="docs/uilistener" />
-         <zipfileset dir="${aircilistener.loc}/target/docs" prefix="docs/aircilistener" />
-         <zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="docs/flexcoverlistener" />
-         -->
-
-         <!-- Artifacts -->
-         <zipfileset dir="${anttasks.loc}/target" prefix="flexunit">
-            <include name="*.jar" />
-         </zipfileset>
-         <zipfileset dir="${core.loc}/target" prefix="flexunit">
-            <include name="flexunit*.swc" />
-         </zipfileset>
-		<zipfileset dir="${fluint.loc}/target" prefix="flexunit">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${cilistener.loc}/target" prefix="flexunit">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${flexcoverlistener.loc}/target" prefix="flexunit">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${uilistener.loc}/target" prefix="flexunit">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${aircilistener.loc}/target" prefix="flexunit">
-            <include name="*.swc" />
-         </zipfileset>
-         
-         <!-- Turnkey -->
-         <zipfileset dir="${turnkey.loc}" prefix="turnkey">
-         	<exclude name="**/export/**/*" />
-         </zipfileset>
-         <zipfileset dir="${core.loc}/target" prefix="turnkey/libs">
-            <include name="flexunit*flex*.swc" />
-         </zipfileset>
-		<zipfileset dir="${core.loc}/libs" prefix="turnkey/libs">
-            <include name="*.swc" />
+	<!-- Prepares and assembles the final zip artifact with all of the FlexUnit4 components and docs -->
+	<target name="package-bin-zip" depends="test,listeners">
+		<zip destfile="${basedir}/out/${finalName}-bin.zip">
+			<!-- Important Files -->
+			<zipfileset dir="${basedir}" includes="LICENSE.bin,NOTICE.bin,README,RELEASE_NOTES" />
+			
+			<!-- Docs -->
+			<zipfileset dir="${core.loc}/target/docs" prefix="docs/flexunit" />
+			<!--
+			<zipfileset dir="${anttasks.loc}/target/docs" prefix="docs/anttasks" />
+			<zipfileset dir="${fluint.loc}/target/docs" prefix="docs/flexUnit4FluintExtensions" />
+			<zipfileset dir="${cilistener.loc}/target/docs" prefix="docs/cilistener" />
+			<zipfileset dir="${uilistener.loc}/target/docs" prefix="docs/uilistener" />
+			<zipfileset dir="${aircilistener.loc}/target/docs" prefix="docs/aircilistener" />
+			<zipfileset dir="${flexcoverlistener.loc}/target/docs" prefix="docs/flexcoverlistener" />
+			-->
+
+			<!-- Artifacts -->
+			<zipfileset dir="${anttasks.loc}/target" prefix="flexunit">
+				<include name="*.jar" />
+			</zipfileset>
+			<zipfileset dir="${core.loc}/target" prefix="flexunit">
+				<include name="flexunit*.swc" />
+			</zipfileset>
+			<zipfileset dir="${fluint.loc}/target" prefix="flexunit">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${cilistener.loc}/target" prefix="flexunit">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${flexcoverlistener.loc}/target" prefix="flexunit">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${uilistener.loc}/target" prefix="flexunit">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${aircilistener.loc}/target" prefix="flexunit">
+				<include name="*.swc" />
+			</zipfileset>
+			
+			<!-- Turnkey -->
+			<zipfileset dir="${turnkey.loc}" prefix="turnkey">
+				<exclude name="**/export/**/*" />
+			</zipfileset>
+			<zipfileset dir="${core.loc}/target" prefix="turnkey/libs">
+				<include name="flexunit*flex*.swc" />
+			</zipfileset>
+			<zipfileset dir="${core.loc}/libs" prefix="turnkey/libs">
+				<include name="*.swc" />
  			<exclude name="fluint-1_2.swc" />
-         </zipfileset>
-		<zipfileset dir="${fluint.loc}/target" prefix="turnkey/libs">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${uilistener.loc}/target" prefix="turnkey/libs">
-            <include name="*.swc" />
-         </zipfileset>
-         
-         <!-- Sample CI project -->
-         <zipfileset dir="${sampleCI.loc}" prefix="sampleCIProject">
-            <exclude name="**/libs/**/*" />
-         </zipfileset>
-         <zipfileset dir="${anttasks.loc}/target" prefix="sampleCIProject/libs">
-            <include name="*.jar" />
-         </zipfileset>
-         <zipfileset dir="${core.loc}/target" prefix="sampleCIProject/libs">
-            <include name="flexunit*.swc" />
-         </zipfileset>
-		 <zipfileset dir="${fluint.loc}/target" prefix="sampleCIProject/libs">
-            <include name="fluint*.swc" />
-         </zipfileset>
-		 <zipfileset dir="${fluint.loc}/libs" prefix="sampleCIProject/libs">
-            <include name="fluint*.swc" />
-         </zipfileset>
-         <zipfileset dir="${cilistener.loc}/target" prefix="sampleCIProject/libs">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${uilistener.loc}/target" prefix="sampleCIProject/libs">
-            <include name="*.swc" />
-         </zipfileset>
-         <zipfileset dir="${aircilistener.loc}/target" prefix="sampleCIProject/libs">
-            <include name="*.swc" />
-         </zipfileset>
-      </zip>
-   </target>
+			</zipfileset>
+			<zipfileset dir="${fluint.loc}/target" prefix="turnkey/libs">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${uilistener.loc}/target" prefix="turnkey/libs">
+				<include name="*.swc" />
+			</zipfileset>
+			
+			<!-- Sample CI project -->
+			<zipfileset dir="${sampleCI.loc}" prefix="sampleCIProject">
+				<exclude name="**/libs/**/*" />
+			</zipfileset>
+			<zipfileset dir="${anttasks.loc}/target" prefix="sampleCIProject/libs">
+				<include name="*.jar" />
+			</zipfileset>
+			<zipfileset dir="${core.loc}/target" prefix="sampleCIProject/libs">
+				<include name="flexunit*.swc" />
+			</zipfileset>
+		 	<zipfileset dir="${fluint.loc}/target" prefix="sampleCIProject/libs">
+				<include name="fluint*.swc" />
+			</zipfileset>
+		 	<zipfileset dir="${fluint.loc}/libs" prefix="sampleCIProject/libs">
+				<include name="fluint*.swc" />
+			</zipfileset>
+			<zipfileset dir="${cilistener.loc}/target" prefix="sampleCIProject/libs">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${uilistener.loc}/target" prefix="sampleCIProject/libs">
+				<include name="*.swc" />
+			</zipfileset>
+			<zipfileset dir="${aircilistener.loc}/target" prefix="sampleCIProject/libs">
+				<include name="*.swc" />
+			</zipfileset>
+		</zip>
+	</target>
 	
-   <!-- Prepares and assembles the final gzip artifact with all of the FlexUnit4 components and docs -->
-   <target name="package-bin-gzip" depends="package-bin-zip,test,listeners">
-       <mkdir dir="${basedir}/out/temp"/>
-       <unzip src="${basedir}/out/${finalName}-bin.zip" dest="${basedir}/out/temp" />
-       <tar compression="gzip" destfile="${basedir}/out/${finalName}-bin.tar.gz">
-       	 <fileset dir="${basedir}/out/temp" />
-       </tar>
-       <delete dir="${basedir}/out/temp" />
-   </target>
-   
-   <target name="apache-maven" depends="thirdparty-downloads" description="Target used to generate bundles for deployment to Apaches Maven Repository.">
-      <ant dir="${anttasks.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-      <ant dir="${core.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-	  <ant dir="${fluint.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-      <ant dir="${cilistener.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-      <ant dir="${flexcoverlistener.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-      <ant dir="${uilistener.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-      <ant dir="${aircilistener.loc}" target="deploy" inheritall="false">
-         <propertyset>
-            <propertyref prefix="build" />
-         </propertyset>
-      </ant>
-      
-      <zip destfile="${basedir}/apache-maven-${finalName}.zip">
-         <zipfileset dir="${anttasks.loc}/target/apache-maven">
-            <include name="apache-maven-*.zip" />
-         </zipfileset>
-         <zipfileset dir="${core.loc}/target/apache-maven">
-            <include name="apache-maven-*.zip" />
-         </zipfileset>
-         <zipfileset dir="${cilistener.loc}/target/apache-maven">
-            <include name="apache-maven-*.zip" />
-         </zipfileset>
-         <zipfileset dir="${flexcoverlistener.loc}/target/apache-maven">
-            <include name="apache-maven-*.zip" />
-         </zipfileset>
-         <zipfileset dir="${uilistener.loc}/target/apache-maven">
-            <include name="apache-maven-*.zip" />
-         </zipfileset>
-         <zipfileset dir="${aircilistener.loc}/target/apache-maven">
-            <include name="apache-maven-*.zip" />
-         </zipfileset>
-      </zip>
-
-   </target>
-   
-   
-    <target name="rat-report" depends="rat-taskdef" if="have.rattasks"
-        description="Report on licenses in source kit.">
-
-        <property name="rat.dir" value="${basedir}"/>
-
-        <echo message="Checking files at ${rat.dir}, report is ${basedir}/rat.report"/>
-
-        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
-            reportFile="${basedir}/rat.report">
-            <fileset dir="${rat.dir}">
-				<!-- rat.report file -->
-				<exclude name="rat.report"/>
-				<!-- git files -->
-                <exclude name="**/.git/"/>
-				<exclude name="**/.gitignore"/>
-                <!-- generated source files that don't have Apache v2 license header -->
-                <exclude name="**/build.number"/>
-                <exclude name="**/.actionScriptProperties"/>
-                <exclude name="**/.flexProperties"/>
-				<exclude name="**/.flexLibProperties"/>
-                <exclude name="**/.project"/>
-                <exclude name="**/.fxpProperties"/>
-                <exclude name="**/.settings/**"/>
-                <exclude name="**/.idea/**"/>
-                <exclude name="**/*.iml"/>
-            	<exclude name="**/flexUnit1/**/*.as" />
-		<!--- BSD/MIT licences -->
-            	<exclude name="**/FlexUnit4UIListener/**/*.as" />
-                <exclude name="**/FlexUnit4UIListener/**/*.mxml" />
-                <exclude name="**/FlexUnit4CIListener/**/TestCaseReport.as" />
-                <exclude name="**/FlexUnit4CIListener/**/TestSuiteReport.as" />
-            	
-				<!-- NOTICE and LICENSE files -->
-            	<exclude name="**/*LICENSE*"/>
-            	<exclude name="**/*NOTICE*"/>
-            	<!-- Java docs and AS docs -->
-            	<exclude name="**/target/docs/**"/>
-                <!--          End of source files           -->
-                <!--          Start of binary files           -->
-                <!-- exclude media (png, ico) -->
-                <exclude name="**/*.ico"/>
-                <exclude name="**/*.png"/>
-                <!-- exclude fonts -->
-                <exclude name="**/*.ttf"/>
-                <!--          End of binary files           -->
-				        
-                <!--Exclude generated/downloaded doc and files -->
-                <exclude name="FlexUnit4/target/bin/" />
-                <exclude name="FlexUnit4/in/" />
-        		<exclude name="FlexUnit4UIListener/target/"/>
-                <exclude name="FlexUnit4Test/target/"/>
-            </fileset>
-        </rat:report>
-
-    </target>
-
-    <target name="rat-taskdef" description="Rat taskdef">
-        <available property="have.rattasks"
-            resource="org/apache/rat/anttasks/antlib.xml"
-            classpathref="anttask.classpath"/>
-
-        <antcall target="have-rattasks"/>
-        <antcall target="no-rattasks"/>
-    </target>
-
-    <target name="have-rattasks" if="have.rattasks">
-        <typedef resource="org/apache/rat/anttasks/antlib.xml"
-                 uri="antlib:org.apache.rat.anttasks"
-                 classpathref="anttask.classpath"/>
-    </target>
+	<!-- Prepares and assembles the final gzip artifact with all of the FlexUnit4 components and docs -->
+	<target name="package-bin-gzip" depends="package-bin-zip,test,listeners">
+		<mkdir dir="${basedir}/out/temp"/>
+		<unzip src="${basedir}/out/${finalName}-bin.zip" dest="${basedir}/out/temp" />
+		<tar compression="gzip" destfile="${basedir}/out/${finalName}-bin.tar.gz">
+			<fileset dir="${basedir}/out/temp" />
+		</tar>
+		<delete dir="${basedir}/out/temp" />
+	</target>
+	
+	<target name="apache-maven" depends="thirdparty-downloads" description="Target used to generate bundles for deployment to Apaches Maven Repository.">
+		<ant dir="${anttasks.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		<ant dir="${core.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		<ant dir="${fluint.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		<ant dir="${cilistener.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		<ant dir="${flexcoverlistener.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		<ant dir="${uilistener.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		<ant dir="${aircilistener.loc}" target="deploy" inheritall="false">
+			<propertyset>
+				<propertyref prefix="build" />
+			</propertyset>
+		</ant>
+		
+		<zip destfile="${basedir}/apache-maven-${finalName}.zip">
+			<zipfileset dir="${anttasks.loc}/target/apache-maven">
+				<include name="apache-maven-*.zip" />
+			</zipfileset>
+			<zipfileset dir="${core.loc}/target/apache-maven">
+				<include name="apache-maven-*.zip" />
+			</zipfileset>
+			<zipfileset dir="${cilistener.loc}/target/apache-maven">
+				<include name="apache-maven-*.zip" />
+			</zipfileset>
+			<zipfileset dir="${flexcoverlistener.loc}/target/apache-maven">
+				<include name="apache-maven-*.zip" />
+			</zipfileset>
+			<zipfileset dir="${uilistener.loc}/target/apache-maven">
+				<include name="apache-maven-*.zip" />
+			</zipfileset>
+			<zipfileset dir="${aircilistener.loc}/target/apache-maven">
+				<include name="apache-maven-*.zip" />
+			</zipfileset>
+		</zip>
+	</target>
+	
+	<target name="rat-report" depends="rat-taskdef" if="have.rattasks"
+			description="Report on licenses in source kit.">
+
+		<property name="rat.dir" value="${basedir}"/>
+
+		<echo message="Checking files at ${rat.dir}, report is ${basedir}/rat.report"/>
+
+		<rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+				reportFile="${basedir}/rat.report">
+			<fileset dir="${rat.dir}">
+			<!-- rat.report file -->
+			<exclude name="rat.report"/>
+			<!-- git files -->
+			<exclude name="**/.git/"/>
+			<exclude name="**/.gitignore"/>
+			<!-- generated source files that don't have Apache v2 license header -->
+			<exclude name="**/build.number"/>
+			<exclude name="**/.actionScriptProperties"/>
+			<exclude name="**/.flexProperties"/>
+			<exclude name="**/.flexLibProperties"/>
+			<exclude name="**/.project"/>
+			<exclude name="**/.fxpProperties"/>
+			<exclude name="**/.settings/**"/>
+			<exclude name="**/.idea/**"/>
+			<exclude name="**/*.iml"/>
+			<exclude name="**/flexUnit1/**/*.as" />
+			<!--- BSD/MIT licences -->
+			<exclude name="**/FlexUnit4UIListener/**/*.as" />
+			<exclude name="**/FlexUnit4UIListener/**/*.mxml" />
+			<exclude name="**/FlexUnit4CIListener/**/TestCaseReport.as" />
+			<exclude name="**/FlexUnit4CIListener/**/TestSuiteReport.as" />
+			
+			<!-- NOTICE and LICENSE files -->
+			<exclude name="**/*LICENSE*"/>
+			<exclude name="**/*NOTICE*"/>
+			<!-- Java docs and AS docs -->
+			<exclude name="**/target/docs/**"/>
+			<!--          End of source files           -->
+			<!--          Start of binary files           -->
+			<!-- exclude media (png, ico) -->
+			<exclude name="**/*.ico"/>
+			<exclude name="**/*.png"/>
+			<!-- exclude fonts -->
+			<exclude name="**/*.ttf"/>
+			<!--          End of binary files           -->
+						  
+			<!--Exclude generated/downloaded doc and files -->
+			<exclude name="FlexUnit4/target/bin/" />
+			<exclude name="FlexUnit4/in/" />
+			<exclude name="FlexUnit4UIListener/target/"/>
+				<exclude name="FlexUnit4Test/target/"/>
+			</fileset>
+		</rat:report>
+	 </target>
+
+	 <target name="rat-taskdef" description="Rat taskdef">
+		<available property="have.rattasks"
+				resource="org/apache/rat/anttasks/antlib.xml"
+				classpathref="anttask.classpath"/>
+
+		<antcall target="have-rattasks"/>
+		<antcall target="no-rattasks"/>
+	 </target>
+
+	 <target name="have-rattasks" if="have.rattasks">
+		<typedef resource="org/apache/rat/anttasks/antlib.xml"
+				uri="antlib:org.apache.rat.anttasks"
+				classpathref="anttask.classpath"/>
+	</target>
 
-    <target name="no-rattasks" unless="have.rattasks">
-        <echo message="Rat report not generated."/>
-        <echo message="rat jars (apache-rat-*.jar, apache-rat-tasks-*.jar)"/>
-        <echo message="not found in anttask.classpath"/>
-    </target>
-   
-   <target name="clean_as3">
-       <ant dir="FlexUnit4" target="clean_as3" />
-   </target>
+	 <target name="no-rattasks" unless="have.rattasks">
+		<echo message="Rat report not generated."/>
+		<echo message="rat jars (apache-rat-*.jar, apache-rat-tasks-*.jar)"/>
+		<echo message="not found in anttask.classpath"/>
+	 </target>
+	
+	<target name="clean_as3">
+		<ant dir="FlexUnit4" target="clean_as3" />
+	</target>
 </project>


(flex-flexunit) 04/05: optional env.properties file

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/flex-flexunit.git

commit bd20b2aa5db1ff2737d88836d826050682c00cb2
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Mon Mar 4 14:49:35 2024 -0800

    optional env.properties file
    
    And fix FLEX_HOME population
---
 .gitignore                           |  1 +
 FlexUnit4/build.xml                  | 15 ++++++------
 FlexUnit4AirCIListener/build.xml     | 15 ++++++------
 FlexUnit4CIListener/build.xml        | 15 ++++++------
 FlexUnit4FlexCoverListener/build.xml | 15 ++++++------
 FlexUnit4FluintExtensions/build.xml  | 15 ++++++------
 FlexUnit4Test/build.xml              | 15 ++++++------
 FlexUnit4UIListener/build.xml        | 15 ++++++------
 build.xml                            |  1 +
 env-template.properties              | 46 ++++++++++++++++++++++++++++++++++++
 10 files changed, 97 insertions(+), 56 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18916aa..0f04cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ FlexUnit4UIListener/target/*
 *.iml
 */.settings
 /lib/
+env.properties
\ No newline at end of file
diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index 72dffd9..d64ec0e 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -17,6 +17,7 @@
 -->
 <project name="FlexUnit4Core" basedir="." default="package">
 	<import file="${basedir}/../utils.xml" />
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -41,14 +42,12 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<property name="FLEX_COVER_HOME" location="${env.FLEX_COVER_HOME}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
diff --git a/FlexUnit4AirCIListener/build.xml b/FlexUnit4AirCIListener/build.xml
index bd5796c..16bb35c 100644
--- a/FlexUnit4AirCIListener/build.xml
+++ b/FlexUnit4AirCIListener/build.xml
@@ -17,6 +17,7 @@
 -->
 <project name="FlexUnit4AirCIListener" basedir="." default="package">
 	<import file="${basedir}/../utils.xml" />
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -37,14 +38,12 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4CIListener/build.xml b/FlexUnit4CIListener/build.xml
index 8141add..c245343 100644
--- a/FlexUnit4CIListener/build.xml
+++ b/FlexUnit4CIListener/build.xml
@@ -17,6 +17,7 @@
 -->
 <project name="FlexUnit4CIListener" basedir="." default="package">
 	<import file="${basedir}/../utils.xml" />
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -37,14 +38,12 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4FlexCoverListener/build.xml b/FlexUnit4FlexCoverListener/build.xml
index 2c4fe7c..255a319 100644
--- a/FlexUnit4FlexCoverListener/build.xml
+++ b/FlexUnit4FlexCoverListener/build.xml
@@ -17,6 +17,7 @@
 -->
 <project name="FlexUnit4FlexCoverListener" basedir="." default="package">
 	<import file="${basedir}/../utils.xml" />
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -37,14 +38,12 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4FluintExtensions/build.xml b/FlexUnit4FluintExtensions/build.xml
index 1e82d5d..eb4da5c 100644
--- a/FlexUnit4FluintExtensions/build.xml
+++ b/FlexUnit4FluintExtensions/build.xml
@@ -17,6 +17,7 @@
 -->
 <project name="FlexUnit4CIListener" basedir="." default="package">
 	<import file="${basedir}/../utils.xml" />
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -37,14 +38,12 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml
index b825ce1..f932de3 100644
--- a/FlexUnit4Test/build.xml
+++ b/FlexUnit4Test/build.xml
@@ -21,6 +21,7 @@
 	dependency which would be more difficult to manage from a build perspective.
 -->
 <project name="FlexUnit4Test" basedir="." default="test">
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -42,14 +43,12 @@
 	<property name="report.flexcover.loc" location="${basedir}/target/report/flexcover" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<property name="FLEX_COVER_VIEWER" location="${env.FLEX_COVER_VIEWER}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml
index 1da63a7..f21822a 100644
--- a/FlexUnit4UIListener/build.xml
+++ b/FlexUnit4UIListener/build.xml
@@ -17,6 +17,7 @@
 -->
 <project name="FlexUnit4UIListener" basedir="." default="package">
 	<import file="${basedir}/../utils.xml" />
+    <property file="${basedir}/../env.properties"/>
 	<property environment="env" />
 
 	<!-- Configuration -->
@@ -38,14 +39,12 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../../flex-sdk">
+		<available file="${basedir}/../../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/build.xml b/build.xml
index dc997fd..76eac85 100644
--- a/build.xml
+++ b/build.xml
@@ -29,6 +29,7 @@ Reporting is something each project implements which we then have hooked into Hu
 to contribute to our CI process.
 -->
 <project name="FlexUnit4" basedir="." default="main">
+    <property file="${basedir}/env.properties"/>
 	<property environment="env" />
 
 	<!-- Version info -->
diff --git a/env-template.properties b/env-template.properties
new file mode 100644
index 0000000..21afe58
--- /dev/null
+++ b/env-template.properties
@@ -0,0 +1,46 @@
+################################################################################
+##
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+
+# If you choose to use this file, rename it to env.properties and uncomment the
+# properties you wish to set.
+
+# For each of
+#
+#   FLEX_HOME
+#
+# you need to set an environment variable with that name or set the property here
+# prefixed with "env.".  If a property is set in this file, and the corresponding 
+# environment variable is also set, the property set here takes precedence over the 
+# corresponding environment variable.
+#
+# Use absolute file paths. 
+# 
+# This is a Java property file.  On Windows if you use the '\' file 
+# separator you must use "\\", but not escape spaces, for example,
+#
+#       env.FLEX_HOME=z:\\tools\\flex\\apache-flex-sdk-4.16.1
+#                      or
+#       env.FLEX_HOME=C:\\Program Files (x86)\\Adobe\\Adobe Flash Builder 4\\sdks\\4.1.0
+#
+# See the README file for more information about the different variables.
+
+#
+# Set this to the directory that contains the Apache Flex SDK.
+#
+#env.FLEX_HOME=


(flex-flexunit) 01/05: Auto-detect flex-sdk in same parent directory as flex-flexunit, if env.FLEX_HOME isn't set

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/flex-flexunit.git

commit 15a440168a2a001a791dbbec678d2d3ed2225e99
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Mon Mar 4 14:09:40 2024 -0800

    Auto-detect flex-sdk in same parent directory as flex-flexunit, if env.FLEX_HOME isn't set
    
    But only if lib/compc.jar exists in flex-sdk
---
 FlexUnit4/build.xml                        |  9 ++++++-
 FlexUnit4AirCIListener/build.xml           |  9 ++++++-
 FlexUnit4CIListener/build.xml              |  9 ++++++-
 FlexUnit4FlexCoverListener/build.xml       |  9 ++++++-
 FlexUnit4FluintExtensions/build.xml        |  9 ++++++-
 FlexUnit4SampleCIProject/build.air.xml     |  9 ++++++-
 FlexUnit4SampleCIProject/build.browser.xml | 41 +++++++++++++++++-------------
 FlexUnit4SampleCIProject/build.custom.xml  | 41 +++++++++++++++++-------------
 FlexUnit4SampleCIProject/build.xml         | 41 +++++++++++++++++-------------
 FlexUnit4Test/build.xml                    |  9 ++++++-
 FlexUnit4UIListener/build.xml              |  9 ++++++-
 11 files changed, 136 insertions(+), 59 deletions(-)

diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index 7bb3c3e..595b2ad 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -41,7 +41,14 @@
    <property name="doc.loc" location="${basedir}/target/docs" />
 
    <!-- Setup Flex Ant Resources -->
-   <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+   <available file="${env.FLEX_HOME}/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${env.FLEX_HOME}"/>
+   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${basedir}/../../flex-sdk"/>
    <property name="FLEX_COVER_HOME" location="${env.FLEX_COVER_HOME}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
diff --git a/FlexUnit4AirCIListener/build.xml b/FlexUnit4AirCIListener/build.xml
index d516848..99d7f5d 100644
--- a/FlexUnit4AirCIListener/build.xml
+++ b/FlexUnit4AirCIListener/build.xml
@@ -37,7 +37,14 @@
    <property name="doc.loc" location="${basedir}/target/docs" />
 
    <!-- Setup Flex Ant Resources -->
-   <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+   <available file="${env.FLEX_HOME}/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${env.FLEX_HOME}"/>
+   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4CIListener/build.xml b/FlexUnit4CIListener/build.xml
index 667d915..29e3a7f 100644
--- a/FlexUnit4CIListener/build.xml
+++ b/FlexUnit4CIListener/build.xml
@@ -37,7 +37,14 @@
    <property name="doc.loc" location="${basedir}/target/docs" />
 
    <!-- Setup Flex Ant Resources -->
-   <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+   <available file="${env.FLEX_HOME}/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${env.FLEX_HOME}"/>
+   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4FlexCoverListener/build.xml b/FlexUnit4FlexCoverListener/build.xml
index 844f9e3..2c4fe7c 100644
--- a/FlexUnit4FlexCoverListener/build.xml
+++ b/FlexUnit4FlexCoverListener/build.xml
@@ -37,7 +37,14 @@
 	<property name="doc.loc" location="${basedir}/target/docs" />
 
 	<!-- Setup Flex Ant Resources -->
-	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4FluintExtensions/build.xml b/FlexUnit4FluintExtensions/build.xml
index c574386..bf19f60 100644
--- a/FlexUnit4FluintExtensions/build.xml
+++ b/FlexUnit4FluintExtensions/build.xml
@@ -37,7 +37,14 @@
    <property name="doc.loc" location="${basedir}/target/docs" />
 
    <!-- Setup Flex Ant Resources -->
-   <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+   <available file="${env.FLEX_HOME}/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${env.FLEX_HOME}"/>
+   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4SampleCIProject/build.air.xml b/FlexUnit4SampleCIProject/build.air.xml
index f957f0a..abcb073 100644
--- a/FlexUnit4SampleCIProject/build.air.xml
+++ b/FlexUnit4SampleCIProject/build.air.xml
@@ -39,7 +39,14 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
 	<taskdef resource="flexUnitTasks.tasks">
 	   <classpath>
diff --git a/FlexUnit4SampleCIProject/build.browser.xml b/FlexUnit4SampleCIProject/build.browser.xml
index c886d5c..cdb517d 100644
--- a/FlexUnit4SampleCIProject/build.browser.xml
+++ b/FlexUnit4SampleCIProject/build.browser.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!-- 
 	This is intended to be a simple build file, created a suggestion for the necessary steps need to utilize the FlexUnit4 Ant task.
 	For the most detail when running this build, call "ant -v clean package".  The build uses a simple lifecycle of: 
@@ -39,7 +39,14 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
 	<taskdef resource="flexUnitTasks.tasks">
 	   <classpath>
diff --git a/FlexUnit4SampleCIProject/build.custom.xml b/FlexUnit4SampleCIProject/build.custom.xml
index db298d6..bb90d5c 100644
--- a/FlexUnit4SampleCIProject/build.custom.xml
+++ b/FlexUnit4SampleCIProject/build.custom.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!-- 
 	This is intended to be a simple build file, created a suggestion for the necessary steps need to utilize the FlexUnit4 Ant task.
 	For the most detail when running this build, call "ant -v clean package".  The build uses a simple lifecycle of: 
@@ -39,7 +39,14 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
 	<taskdef resource="flexUnitTasks.tasks">
 	   <classpath>
diff --git a/FlexUnit4SampleCIProject/build.xml b/FlexUnit4SampleCIProject/build.xml
index c586844..966b10f 100644
--- a/FlexUnit4SampleCIProject/build.xml
+++ b/FlexUnit4SampleCIProject/build.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!-- 
 	This is intended to be a simple build file, created a suggestion for the necessary steps need to utilize the FlexUnit4 Ant task.
 	For the most detail when running this build, call "ant -v clean package".  The build uses a simple lifecycle of: 
@@ -39,7 +39,14 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+	<available file="${env.FLEX_HOME}/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${env.FLEX_HOME}"/>
+	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
+		type="file" 
+		property="FLEX_HOME"
+		value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml
index 9c89a96..2fc183c 100644
--- a/FlexUnit4Test/build.xml
+++ b/FlexUnit4Test/build.xml
@@ -42,7 +42,14 @@
    <property name="report.flexcover.loc" location="${basedir}/target/report/flexcover" />
 
    <!-- Setup Flex Ant Resources -->
-   <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+   <available file="${env.FLEX_HOME}/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${env.FLEX_HOME}"/>
+   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${basedir}/../../flex-sdk"/>
    <property name="FLEX_COVER_VIEWER" location="${env.FLEX_COVER_VIEWER}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml
index 138158b..549deb0 100644
--- a/FlexUnit4UIListener/build.xml
+++ b/FlexUnit4UIListener/build.xml
@@ -38,7 +38,14 @@
    <property name="doc.loc" location="${basedir}/target/docs" />
 
    <!-- Setup Flex Ant Resources -->
-   <property name="FLEX_HOME" location="${env.FLEX_HOME}" />
+   <available file="${env.FLEX_HOME}/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${env.FLEX_HOME}"/>
+   <available file="${basedir}/../../flex-sdk/lib/compc.jar"
+      type="file" 
+      property="FLEX_HOME"
+      value="${basedir}/../../flex-sdk"/>
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>


(flex-flexunit) 05/05: .gitignore: rat.report and /out/

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/flex-flexunit.git

commit 2da1a1726b3efc8afc5752dd3ebfecbfd8f685e8
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Mon Mar 4 14:50:04 2024 -0800

    .gitignore: rat.report and /out/
---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0f04cd1..87aaef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,6 @@ FlexUnit4UIListener/target/*
 *.iml
 */.settings
 /lib/
-env.properties
\ No newline at end of file
+env.properties
+/out/
+rat.report


(flex-flexunit) 03/05: FlexUnit4SampleCIProject: this detection of FLEX_HOME shouldn't have changed

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/flex-flexunit.git

commit b78064ee3931ebe5dae52a6e9592122b2d5480ec
Author: Josh Tynjala <jo...@bowlerhat.dev>
AuthorDate: Mon Mar 4 14:47:38 2024 -0800

    FlexUnit4SampleCIProject: this detection of FLEX_HOME shouldn't have changed
---
 FlexUnit4SampleCIProject/build.air.xml     | 9 +--------
 FlexUnit4SampleCIProject/build.browser.xml | 9 +--------
 FlexUnit4SampleCIProject/build.custom.xml  | 9 +--------
 FlexUnit4SampleCIProject/build.xml         | 9 +--------
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/FlexUnit4SampleCIProject/build.air.xml b/FlexUnit4SampleCIProject/build.air.xml
index abcb073..f957f0a 100644
--- a/FlexUnit4SampleCIProject/build.air.xml
+++ b/FlexUnit4SampleCIProject/build.air.xml
@@ -39,14 +39,7 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
 	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
 	<taskdef resource="flexUnitTasks.tasks">
 	   <classpath>
diff --git a/FlexUnit4SampleCIProject/build.browser.xml b/FlexUnit4SampleCIProject/build.browser.xml
index cdb517d..75e8199 100644
--- a/FlexUnit4SampleCIProject/build.browser.xml
+++ b/FlexUnit4SampleCIProject/build.browser.xml
@@ -39,14 +39,7 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
 	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
 	<taskdef resource="flexUnitTasks.tasks">
 	   <classpath>
diff --git a/FlexUnit4SampleCIProject/build.custom.xml b/FlexUnit4SampleCIProject/build.custom.xml
index bb90d5c..513cc37 100644
--- a/FlexUnit4SampleCIProject/build.custom.xml
+++ b/FlexUnit4SampleCIProject/build.custom.xml
@@ -39,14 +39,7 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
 	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
 	<taskdef resource="flexUnitTasks.tasks">
 	   <classpath>
diff --git a/FlexUnit4SampleCIProject/build.xml b/FlexUnit4SampleCIProject/build.xml
index 966b10f..fd293b7 100644
--- a/FlexUnit4SampleCIProject/build.xml
+++ b/FlexUnit4SampleCIProject/build.xml
@@ -39,14 +39,7 @@
 
 	<!-- Setup Flex and FlexUnit ant tasks -->
 	<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
-	<available file="${env.FLEX_HOME}/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${env.FLEX_HOME}"/>
-	<available file="${basedir}/../../flex-sdk/lib/compc.jar"
-		type="file" 
-		property="FLEX_HOME"
-		value="${basedir}/../../flex-sdk"/>
+	<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
 	<taskdef resource="flexTasks.tasks" >
 		<classpath>
 			<pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>