Return-Path: 
 <commits-return-6752-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 51E1A10EFC
	for <apmail-flex-commits-archive@www.apache.org>;
 Mon, 16 Sep 2013 21:13:04 +0000 (UTC)
Received: (qmail 4289 invoked by uid 500); 16 Sep 2013 21:12:01 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 3909 invoked by uid 500); 16 Sep 2013 21:11:32 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 2783 invoked by uid 99); 16 Sep 2013 21:11:00 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Sep 2013 21:11:00 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 317A4906173; Mon, 16 Sep 2013 21:11:00 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: czadra@apache.org
To: commits@flex.apache.org
Date: Mon, 16 Sep 2013 21:12:13 -0000
Message-Id: <33fcd59eca0e4e6b8773fbc0d22f08ef@git.apache.org>
In-Reply-To: <d1acb7d081fb45c1acd27a377070e88e@git.apache.org>
References: <d1acb7d081fb45c1acd27a377070e88e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [77/79] [abbrv] Merge branch 'refs/heads/FlexUnitTutorial' into
 FlexUnitTutorial2

http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/9b92b2f8/FlexUnit4AntTasks/build.xml
----------------------------------------------------------------------
diff --cc FlexUnit4AntTasks/build.xml
index a929fdf,7bb004e..cba9382
--- a/FlexUnit4AntTasks/build.xml
+++ b/FlexUnit4AntTasks/build.xml
@@@ -1,20 -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.
++-->
  <project name="FlexUnitAntTasks" basedir="." default="package">
     <import file="${basedir}/../utils.xml" />
  

http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/9b92b2f8/FlexUnit4FlexCoverListener/build.xml
----------------------------------------------------------------------
diff --cc FlexUnit4FlexCoverListener/build.xml
index 03572d6,daee11b..90aa9b0
--- a/FlexUnit4FlexCoverListener/build.xml
+++ b/FlexUnit4FlexCoverListener/build.xml
@@@ -1,20 -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.
++-->
  <project name="FlexUnit4FlexCoverListener" basedir="." default="package">
  	<import file="${basedir}/../utils.xml" />
  	<property environment="env" />

http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/9b92b2f8/FlexUnit4Test/build.xml
----------------------------------------------------------------------
diff --cc FlexUnit4Test/build.xml
index 65d065d,d731580..9c89a96
--- a/FlexUnit4Test/build.xml
+++ b/FlexUnit4Test/build.xml
@@@ -1,20 -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.
++-->
  <!--
     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

http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/9b92b2f8/README
----------------------------------------------------------------------
diff --cc README
index 4b89781,fe9c096..3c05b2b
--- a/README
+++ b/README
@@@ -1,132 -1,22 +1,131 @@@
 -h2. FlexUnit: a unit testing framework for Flex and ActionScript 3.0
 +Apache Flex (FlexUnit)
 +==================
  
 -FlexUnit is a unit testing framework for Flex and ActionScript 3.0 applications and libraries. It mimics the functionality of JUnit, a Java unit testing framework, and comes with a graphical test runner.
 +Apache Flex (FlexUnit) is a unit testing framework for Apache Flex and ActionScript 3.0 
 +applications and libraries. It mimics the functionality of JUnit, a Java 
 +unit testing framework, and comes with a graphical test runner.
  
 -h3. Features
 +Getting the latest sources via git
 +==================================
  
 -Some of FlexUnits features include:
 -* Support for Flex or ActionScript 3
 -* Mark tests with Metadata
 -* Async testing support
 -* Exception Handling
 -* Theories, Datapoints and Assumptions
 +    You can always checkout the latest source via git using the following
 +    command:
 +	
 +	 git clone https://git-wip-us.apache.org/repos/asf/flex-flexunit.git flexunit
 +	 cd flexunit
 +	 git checkout develop
  
 -A complete list of features can be found on "the FlexUnit homepage":http://flexunit.org
 +    For further information visit http://flex.apache.org/download-source.html
  
 -h3. Documentation
 +Building Apache Flex (FlexUnit)
 +=========================
  
 -Documentation for FlexUnit can be found at "docs.flexunit.org":http://docs.flexunit.org
 +    Apache Flex (FlexUnit) requires some build tools which must be installed
 +    prior to building FlexUnit and it depends on some external software which
 +    are downloaded as part of the build process.  Some of these have different licenses.
 +    See the Software Dependencies section for more information on the external software
 +    dependencies.
 +	
 +Install Prerequisites
 +---------------------
  
 -h3. Code
 +    Before building FlexUnit you must install the following software and set the
 +    corresponding environment variables using absolute file paths.  Relative file paths
 +    will result in build errors.
 +    
 +	==================================================================================
 +    SOFTWARE                                    ENVIRONMENT VARIABLE (absolute paths)
 +    ==================================================================================
 +    
 +    Java SDK 1.6 or greater (*1)                JAVA_HOME
 +        (for Java 1.7 see note at (*2))
 +        
 +    Ant 1.7.1 or greater (*1)                   ANT_HOME
 +        (for Java 1.7 see note at (*2))
 +    
 +    Apache Flex (*3)                            FLEX_HOME 
 +    
 +    ==================================================================================
 +	
 +	*1) The bin directories for ANT_HOME and JAVA_HOME should be added to your PATH.
 +        
 +        On Windows, set PATH to
 +            
 +            PATH=%PATH%;%ANT_HOME%\bin;%JAVA_HOME%\bin
 +            
 +        On the Mac (bash), set PATH to
 +            
 +            export PATH="$PATH:$ANT_HOME/bin:$JAVA_HOME/bin"
 +            
 +         On Linux make sure you path include ANT_HOME and JAVA_HOME.
  
 -The code for FlexUnit can be found on "Apache Git Repository":https://git-wip-us.apache.org/repos/asf/flex-flexunit.git
 +    *2)  If you are using Java SDK 1.7 or greater on a Mac you must use Ant 1.8 or 
 +         greater. If you use Java 1.7 with Ant 1.7, ant reports the java version as 1.6 
 +         so the JVM args for the data model (-d32/-d64) will not be set correctly and
 +         you will get compile errors.
 +        
 +    *3) FLEX_HOME should be set to a valid Apache Flex installation.
 +	
 +	
 +Software Dependencies
 +---------------------
 +
 +    Apache Flex (FlexUnit) uses third-party code that will be downloaded as part of the Apache
 +    Flex (FlexUnit) build.  
 +
 +    When you have all the prerequisites in place and the environment variables set, 
 +    (see Install Prerequisites above), use
 +
 +        cd <flexunit.dir>
 +        ant thirdparty-downloads
 +			
 +    The Apache Version 2.0 license is in the LICENSE file.
 +    
 +    The following dependencies have licenses which are, or are compatible with, the Apache 
 +    Version 2.0 license.  You will not be prompted to acknowledge the download.  
 +	
 +		(jars)
 +		ant -  http://search.maven.org/remotecontent?filepath=org/apache/ant/ant/1.7.1/ant-1.7.1.jar (Apache 2.0 License)
 +		ant-contrib - http://search.maven.org/remotecontent?filepath=ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar (Apache 2.0 License)
 +		ant-launcher -  http://search.maven.org/remotecontent?filepath=org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar (Apache 2.0 License)
 +		ant-testutil -  http://search.maven.org/remotecontent?filepath=org/apache/ant/ant-testutil/1.7.1/ant-testutil-1.7.1.jar	(Apache 2.0 License)
 +		maven-ant-tasks  - http://search.maven.org/remotecontent?filepath=org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar (Apache 2.0 License)
 +		dom4j - http://search.maven.org/remotecontent?filepath=dom4j/dom4j/1.6.1/dom4j-1.6.1.jar (BSD License)
 +		jaxen - http://search.maven.org/remotecontent?filepath=jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar (BSD License)
 +		
 +		(swcs)
 +		coverageagent - https://flexcover.googlecode.com/files/flexcover-0.90.zip (MIT License)
 +		fluint - https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/fluint-1_2.swc (MIT License)
 +		mockolate - http://cloud.github.com/downloads/drewbourne/hamcrest-as3/hamcrest-as3-flex-1.1.3.zip (MIT License)	
 +		mock-as - https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/mock-as3.swc (BSD License)	
 +		hamcrest - http://cloud.github.com/downloads/drewbourne/hamcrest-as3/mockolate-0.9.5.zip (BSD License)
 +		flexunit1lib - https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/FlexUnit1Lib.swc (BSD License)
 +		
 +	The following dependencies have licenses which Apache considers to be reciprocal
 +    licenses so you will be prompted to acknowledge the license before the software is
 +    downloaded to your system.
 +	
 +		(jars)
 +		junit - http://search.maven.org/remotecontent?filepath=junit/junit/3.8.1/junit-3.8.1.jar (License - CPL 1.0)
 +		saxon9he - http://search.maven.org/remotecontent?filepath=net/sf/saxon/Saxon-HE/9.4/Saxon-HE-9.4.jar (License - MPL 1.1)
 +
 +
 +Building Apache Flex (FlexUnit)
 +-----------------------------------------------
 +
 +    When you have all the prerequisites in place and the environment variables set, 
 +    (see Install Prerequisites above), use
 +
 +        cd <flexunit.dir>
 +        ant
 +    
 +    build Apache Flex (FlexUnit).
 +	�
 +	To clean the build use
 +    
 +        ant clean 
 +		
 +Thanks for using Apache Flex (FlexUnit).  Enjoy!
 +
 +                                          The Apache Flex Project
 +                                          <http://flex.apache.org>
-