incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1351482 - in /incubator/flex/trunk: ./ frameworks/ frameworks/javascript/FABridge/samples/ frameworks/javascript/FABridge/samples/srcview/ frameworks/javascript/FABridge/samples/srcview/source/ frameworks/javascript/FABridge/samples/srcvie...
Date Mon, 18 Jun 2012 20:54:45 GMT
Author: cframpton
Date: Mon Jun 18 20:54:43 2012
New Revision: 1351482

URL: http://svn.apache.org/viewvc?rev=1351482&view=rev
Log:
Add automation*, tool* and javascript projects into frameworks build.  What was formerly qtp is now tool because qtp is a product name.  VERSION -> 4.8.0.0.  Set ignore property on newly generated files.

Added:
    incubator/flex/trunk/frameworks/projects/automation_agent/bundles/ko_KR/automation_agent.properties
      - copied unchanged from r1351473, incubator/flex/trunk/frameworks/projects/automation_agent/bundles/ko_KR/src/automation_agent.properties
Removed:
    incubator/flex/trunk/frameworks/projects/automation_agent/bundles/ko_KR/src/
Modified:
    incubator/flex/trunk/   (props changed)
    incubator/flex/trunk/frameworks/build.xml
    incubator/flex/trunk/frameworks/javascript/FABridge/samples/   (props changed)
    incubator/flex/trunk/frameworks/javascript/FABridge/samples/srcview/   (props changed)
    incubator/flex/trunk/frameworks/javascript/FABridge/samples/srcview/source/   (props changed)
    incubator/flex/trunk/frameworks/javascript/FABridge/samples/srcview/source/fabridge/   (props changed)
    incubator/flex/trunk/frameworks/projects/automation/build.xml
    incubator/flex/trunk/frameworks/projects/automation/src/AutomationClasses.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ArrayPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AssetPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AutomationObjectPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ChartItemCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ColorPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DatePropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateRangePropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateScrollDetailPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DefaultPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/HitDataCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/IAutomationPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyCodePropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyModifierPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/RendererPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDetailPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDirectionPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TabObjectCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TriggerEventPropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_agent/   (props changed)
    incubator/flex/trunk/frameworks/projects/automation_agent/build.xml
    incubator/flex/trunk/frameworks/projects/automation_agent/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_air/   (props changed)
    incubator/flex/trunk/frameworks/projects/automation_air/build.xml
    incubator/flex/trunk/frameworks/projects/automation_air/src/mx/automation/codec/FilePropertyCodec.as
    incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_airspark/   (props changed)
    incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml
    incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml
    incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml
    incubator/flex/trunk/frameworks/projects/automation_spark/build.xml
    incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/automation/codec/SparkDropDownListBaseSelectedItemCodec.as
    incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as
    incubator/flex/trunk/frameworks/projects/tool/build.xml
    incubator/flex/trunk/frameworks/projects/tool/src/mx/core/Version.as
    incubator/flex/trunk/frameworks/projects/tool_air/   (props changed)
    incubator/flex/trunk/frameworks/projects/tool_air/build.xml
    incubator/flex/trunk/frameworks/projects/tool_air/src/mx/core/Version.as

Propchange: incubator/flex/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -8,4 +8,5 @@ lib
 out
 runtimes
 temp
+tempDoc
 rat*.log

Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Mon Jun 18 20:54:43 2012
@@ -102,23 +102,25 @@
         <antcall target="halo"/>
         <antcall target="wireframe"/>
         <antcall target="aeongraphical"/>
-        <!-- automation removed until sources donated to Apache -->
-        <!--
-            automation: tool was formerly qtp and tool_air was formerly qtp_air
-        -->
-        <!--
+        
+        <antcall target="compile-automation"/>
+    </target>
+
+    <!--
+        automation: tool was formerly qtp and tool_air was formerly qtp_air
+    -->
+    <target name="compile-automation" description="Builds all automation SWCs but not their resource bundles">
         <antcall target="automation_agent"/>
-        <antcall target="automation"/>
         <antcall target="automation_dmv"/>
+        <antcall target="tool"/>
+        <antcall target="automation"/>
+        <antcall target="tool_air"/>
         <antcall target="automation_spark"/>
+        <antcall target="automation_flashflexkit"/>
         <antcall target="automation_air"/>
         <antcall target="automation_airspark"/>
-        <antcall target="automation_flashflexkit"/>
-        <antcall target="tool"/>
-        <antcall target="tool_air"/>
-        -->
     </target>
-
+    
     <target name="other.locales" description ="Builds resource SWCs for all locales">
         <ant dir="${basedir}/projects/framework" target="other.locales"/>
         <ant dir="${basedir}/projects/mx" target="other.locales"/>
@@ -132,13 +134,10 @@
         <!--ant dir="${basedir}/projects/textLayout" target="other.locales"/-->
         <ant dir="${basedir}/projects/playerglobal" target="other.locales" />
         <ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
-        <!-- removed until sources donated to Apache -->
-        <!--
         <ant dir="${basedir}/projects/automation" target="other.locales"/>
         <ant dir="${basedir}/projects/automation_agent" target="other.locales"/>
         <ant dir="${basedir}/projects/tool" target="other.locales"/>
         <ant dir="${basedir}/projects/tool_air" target="other.locales"/>
-        -->
     </target>
     
     <target name="doc" >
@@ -174,7 +173,7 @@
         <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}"/>
     </target>
     
-    <target name="clean" depends="airsdk-clean" description="Cleans all SWCs and their resource bundles">
+    <target name="clean" depends="automation-clean,airsdk-clean" description="Cleans all SWCs and their resource bundles">
         <!-- Delete output from SWC projects -->
         <ant dir="${basedir}/projects/framework" target="clean"/>
         <ant dir="${basedir}/projects/mx" target="clean"/>
@@ -194,19 +193,7 @@
         <ant dir="${basedir}/projects/authoringsupport" target="clean"/>
         <ant dir="${basedir}/projects/charts" target="clean"/>
         <ant dir="${basedir}/projects/advancedgrids" target="clean"/>
-        <!-- not currently in Apache Flex -->
-        <!--
-        <ant dir="${basedir}/projects/automation_agent" target="clean"/>
-        <ant dir="${basedir}/projects/automation" target="clean"/>
-        <ant dir="${basedir}/projects/automation_air" target="clean"/>
-        <ant dir="${basedir}/projects/automation_dmv" target="clean"/>
-        <ant dir="${basedir}/projects/automation_flashflexkit" target="clean"/>
-        <ant dir="${basedir}/projects/automation_spark" target="clean"/>
-        <ant dir="${basedir}/projects/automation_airspark" target="clean"/>
-        <ant dir="${basedir}/projects/tool" target="clean"/>
-        <ant dir="${basedir}/projects/tool_air" target="clean"/>
         <ant dir="${basedir}/javascript" target="clean"/>
-        -->
         <ant dir="${basedir}/themes/AeonGraphical" target="clean"/>
         <!-- Delete empty folders -->
         <delete dir="${basedir}/locale">
@@ -223,6 +210,19 @@
         <delete file="winFonts.ser"/>
     </target>
     
+    <target name="automation-clean" description="Builds all automation SWCs but not their resource bundles">
+        <ant dir="${basedir}/projects/automation_agent" target="clean"/>
+        <ant dir="${basedir}/projects/automation" target="clean"/>
+        <ant dir="${basedir}/projects/automation_air" target="clean"/>
+        <ant dir="${basedir}/projects/automation_dmv" target="clean"/>
+        <ant dir="${basedir}/projects/automation_flashflexkit" target="clean"/>
+        <ant dir="${basedir}/projects/automation_spark" target="clean"/>
+        <ant dir="${basedir}/projects/automation_airspark" target="clean"/>
+        <ant dir="${basedir}/projects/tool" target="clean"/>
+        <ant dir="${basedir}/projects/tool_air" target="clean"/>
+    </target>
+
+
     <target name="airsdk-clean" description="Delete files copied from the AIR SDK">
         <!-- Delete AIR files and directories from 'prepare' target -->
         <delete file="${FLEX_HOME}/AIR SDK license.pdf"/>
@@ -335,10 +335,7 @@
     </target>
 
     <target name="javascript" description="Clean build of javascript examples">
-        <!-- not currently in Apache Flex -->
-        <!--
         <ant dir="${basedir}/javascript"/>
-        -->
     </target>
     
     <target name="automation" description="Clean build of automation swc">

Propchange: incubator/flex/trunk/frameworks/javascript/FABridge/samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1,2 @@
+fabridge
+*.swf

Propchange: incubator/flex/trunk/frameworks/javascript/FABridge/samples/srcview/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1,3 @@
+swfobject.js
+SourceTree.html
+fabridge.zip

Propchange: incubator/flex/trunk/frameworks/javascript/FABridge/samples/srcview/source/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1,4 @@
+FABridgeSample.js
+FABridgeSample.html
+*.swf
+SimpleSample.html

Propchange: incubator/flex/trunk/frameworks/javascript/FABridge/samples/srcview/source/fabridge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1,2 @@
+javascript
+swfobject

Modified: incubator/flex/trunk/frameworks/projects/automation/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation/build.xml Mon Jun 18 20:54:43 2012
@@ -31,7 +31,6 @@
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="Compiling frameworks/locale/@{locale}/automation_rb.swc"/>
-
 			<!-- Load the <compc> task. We can't do this at the <project> level -->
 			<!-- because targets that run before flexTasks.jar gets built would fail. -->
 			<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -39,7 +38,7 @@
 				   output="${FLEX_HOME}/frameworks/locale/@{locale}/automation_rb.swc"
 				   locale="@{locale}">
 				<jvmarg line="${compc.jvm.args}"/>
-				<target-player>11.1</target-player>
+				<target-player>${playerglobal.version}</target-player>
 				<include-resource-bundles bundle="automation"/>
 				<include-namespaces/>
 				<include-classes/>
@@ -146,7 +145,6 @@
 	
 	<target name="compile" description="Compiles automation.swc">
 		<echo message="Compiling frameworks/libs/automation/automation.swc"/>
-
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
 		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -168,7 +166,7 @@
 			   output="${FLEX_HOME}/frameworks/libs/automation/automation.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>AutomationClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
@@ -178,9 +176,9 @@
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
-				<include name="automation_agent.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/automation_agent.swc"/>
+				<include name="tool.swc"/>
+				<include name="tool_air.swc"/>
 			</external-library-path>
 			<locale/>
 			<accessible>true</accessible>

Modified: incubator/flex/trunk/frameworks/projects/automation/src/AutomationClasses.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/AutomationClasses.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/AutomationClasses.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/AutomationClasses.as Mon Jun 18 20:54:43 2012
@@ -34,7 +34,6 @@ package
  */
 internal class AutomationClasses
 {
-	import mx.automation.AutomationLicesneHandler;AutomationLicesneHandler;  
 	import mx.automation.delegates.containers.AccordionAutomationImpl; AccordionAutomationImpl;
 	import mx.automation.delegates.containers.ApplicationAutomationImpl; ApplicationAutomationImpl;
 	import mx.automation.delegates.containers.BoxAutomationImpl; BoxAutomationImpl;

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.as Mon Jun 18 20:54:43 2012
@@ -21,7 +21,7 @@ package mx.automation.codec
 { 
 	
 	import mx.automation.AutomationError;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	import mx.automation.IAutomationTabularData;
@@ -65,7 +65,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object,  
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -96,7 +96,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var message:String = resourceManager.getString(

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ArrayPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ArrayPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ArrayPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ArrayPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -21,8 +21,8 @@ package mx.automation.codec
 {
 	
 	import mx.automation.Automation;
-	import mx.automation.qtp.QTPPropertyDescriptor;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.ToolPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -80,7 +80,7 @@ package mx.automation.codec
 		
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var result:Array = [];
@@ -103,8 +103,8 @@ package mx.automation.codec
 				
 				for (var i:int = 0; i <n ; ++i)
 				{
-					var arrayPropertyDescriptor:QTPPropertyDescriptor= 
-						new QTPPropertyDescriptor(String(i),
+					var arrayPropertyDescriptor:ToolPropertyDescriptor= 
+						new ToolPropertyDescriptor(String(i),
 							pd.forDescription,
 							pd.forVerification,
 							"string",
@@ -129,7 +129,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			if (value != null && value.length != 0)
@@ -152,8 +152,8 @@ package mx.automation.codec
 				for (var i:int = 0; i < n; ++i)
 				{
 					arrayString[i] = arrayString[i].replace(/&#x3B;/g, ";");
-					var arrayPropertyDescriptor:QTPPropertyDescriptor= 
-						new QTPPropertyDescriptor(String(i),
+					var arrayPropertyDescriptor:ToolPropertyDescriptor= 
+						new ToolPropertyDescriptor(String(i),
 							pd.forDescription,
 							pd.forVerification,
 							"string",

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AssetPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AssetPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AssetPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AssetPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -55,7 +55,7 @@ package mx.automation.codec
 		
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, pd);
@@ -94,7 +94,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var message:String = resourceManager.getString(

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AutomationObjectPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AutomationObjectPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AutomationObjectPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/AutomationObjectPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -23,7 +23,7 @@ package mx.automation.codec
 	import mx.automation.AutomationClass;
 	import mx.automation.AutomationIDPart;
 	import mx.automation.Automation;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -61,7 +61,7 @@ package mx.automation.codec
 		 */
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, pd);
@@ -106,7 +106,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			if (value == null || value.length == 0)

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ChartItemCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ChartItemCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ChartItemCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ChartItemCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 { 
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	import mx.charts.HitData;
@@ -63,7 +63,7 @@ package mx.automation.codec
 		
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -79,7 +79,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{ 
 			if (relativeParent is Series)

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ColorPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ColorPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ColorPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ColorPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -52,7 +52,7 @@ package mx.automation.codec
 		 */
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -76,7 +76,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			obj[propertyDescriptor.name] = parseInt(String(value).substring(1), 16).toString();

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DatePropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DatePropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DatePropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DatePropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec 
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -64,7 +64,7 @@ package mx.automation.codec 
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -87,7 +87,7 @@ package mx.automation.codec 
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			obj[propertyDescriptor.name] =  new Date(Date.parse(String(value)));

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateRangePropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateRangePropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateRangePropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateRangePropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 { 
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager; 
 	import mx.automation.IAutomationObject;
 	
@@ -66,7 +66,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -97,7 +97,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var message:String = resourceManager.getString(

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateScrollDetailPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateScrollDetailPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateScrollDetailPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DateScrollDetailPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 { 
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor; 
+	import mx.automation.tool.IToolPropertyDescriptor; 
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -53,7 +53,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:int = 0;
@@ -82,7 +82,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var details:Array = 

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DefaultPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DefaultPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DefaultPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/DefaultPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec 
 { 
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.Automation;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
@@ -75,7 +75,7 @@ package mx.automation.codec 
 		 */ 
 		public function encode(automationManager:IAutomationManager,
 							   obj:Object, 
-							   pd:IQTPPropertyDescriptor,
+							   pd:IToolPropertyDescriptor,
 							   relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, pd);
@@ -95,7 +95,7 @@ package mx.automation.codec 
 		public function decode(automationManager:IAutomationManager,
 							   obj:Object, 
 							   value:Object,
-							   pd:IQTPPropertyDescriptor,
+							   pd:IToolPropertyDescriptor,
 							   relativeParent:IAutomationObject):void
 		{
 			obj[pd.name] = getValue(automationManager, obj, value, pd, true);
@@ -106,7 +106,7 @@ package mx.automation.codec 
 		 */ 
 		public function getMemberFromObject(automationManager:IAutomationManager,
 											obj:Object, 
-											pd:IQTPPropertyDescriptor):Object
+											pd:IToolPropertyDescriptor):Object
 		{
 			var part:Object;
 			var component:Object;
@@ -148,13 +148,13 @@ package mx.automation.codec 
 		private function getValue(automationManager:IAutomationManager,
 								  obj:Object, 
 								  val:Object,
-								  pd:IQTPPropertyDescriptor,
+								  pd:IToolPropertyDescriptor,
 								  useASType:Boolean = false):Object
 		{
 			if (val == null)
 				return null;
 			
-			var type:String = useASType && pd.asType ? pd.asType : pd.QTPtype;
+			var type:String = useASType && pd.asType ? pd.asType : pd.Tooltype;
 			
 			switch (type)
 			{

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/HitDataCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/HitDataCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/HitDataCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/HitDataCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	import mx.charts.HitData; 
@@ -62,7 +62,7 @@ package mx.automation.codec
 		
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -82,7 +82,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			if (relativeParent is Series)

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/IAutomationPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/IAutomationPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/IAutomationPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/IAutomationPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec 
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor; 
+	import mx.automation.tool.IToolPropertyDescriptor; 
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -55,7 +55,7 @@ package mx.automation.codec 
 		 */
 		function encode(automationManager:IAutomationManager,
 						obj:Object, 
-						propertyDescriptor:IQTPPropertyDescriptor,
+						propertyDescriptor:IToolPropertyDescriptor,
 						relativeParent:IAutomationObject):Object;
 		
 		/**
@@ -84,7 +84,7 @@ package mx.automation.codec 
 		function decode(automationManager:IAutomationManager,
 						obj:Object, 
 						value:Object,
-						propertyDescriptor:IQTPPropertyDescriptor,
+						propertyDescriptor:IToolPropertyDescriptor,
 						relativeParent:IAutomationObject):void;
 		
 	}

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyCodePropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyCodePropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyCodePropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyCodePropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -21,7 +21,7 @@ package mx.automation.codec
 {
 	
 	import flash.ui.Keyboard;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject; 
 	
@@ -54,7 +54,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, pd);
@@ -71,7 +71,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			if (value is String)

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyModifierPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyModifierPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyModifierPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/KeyModifierPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor; 
+	import mx.automation.tool.IToolPropertyDescriptor; 
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -52,7 +52,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:int = 0;
@@ -75,7 +75,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			if ("ctrlKey" in obj)

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.as Mon Jun 18 20:54:43 2012
@@ -21,7 +21,7 @@ package mx.automation.codec
 {
 	
 	import mx.automation.AutomationError; 
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	import mx.automation.IAutomationTabularData;
@@ -63,7 +63,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -80,7 +80,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var message:String = resourceManager.getString(

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/RendererPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/RendererPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/RendererPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/RendererPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -25,7 +25,7 @@ package mx.automation.codec
 	import mx.automation.IAutomationClass;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	
 	[ResourceBundle("automation_agent")]
 	
@@ -61,7 +61,7 @@ package mx.automation.codec
 		 */
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, pd);
@@ -94,7 +94,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			if ((!value) || value.length == 0)

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDetailPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDetailPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDetailPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDetailPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -52,7 +52,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:int = 0;
@@ -102,7 +102,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var details:Array = 

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDirectionPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDirectionPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDirectionPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/ScrollDirectionPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -20,7 +20,7 @@
 package mx.automation.codec
 {
 	
-	import mx.automation.qtp.IQTPPropertyDescriptor; 
+	import mx.automation.tool.IToolPropertyDescriptor; 
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -52,7 +52,7 @@ package mx.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:int = 0;
@@ -77,7 +77,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var directions:Array = 

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TabObjectCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TabObjectCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TabObjectCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TabObjectCodec.as Mon Jun 18 20:54:43 2012
@@ -22,7 +22,7 @@ package mx.automation.codec
 	
 	import mx.automation.AutomationIDPart;
 	import mx.automation.Automation;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	import mx.automation.codec.AutomationObjectPropertyCodec;
@@ -71,7 +71,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										pd:IQTPPropertyDescriptor,
+										pd:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TriggerEventPropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TriggerEventPropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TriggerEventPropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/automation/codec/TriggerEventPropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -22,7 +22,7 @@ package mx.automation.codec
 	
 	import flash.events.KeyboardEvent;
 	import flash.events.MouseEvent;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.automation.IAutomationManager;
 	import mx.automation.IAutomationObject;
 	
@@ -43,7 +43,7 @@ package mx.automation.codec
 		
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -57,7 +57,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			obj[propertyDescriptor.name] = 

Modified: incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation/src/mx/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.8.0.0";
+mx_internal static const VERSION:String = "4.6.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/automation_agent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/automation_agent/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_agent/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_agent/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_agent/build.xml Mon Jun 18 20:54:43 2012
@@ -19,8 +19,10 @@
 -->
 <project name="automation_agent" default="main" basedir=".">
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property file="${FLEX_HOME}/env.properties"/>
+    <property environment="env"/>
 	<property file="${FLEX_HOME}/build.properties"/>
-	<property name="local.playerglobal.version" value="11.1"/>
 
 	<property name="compc.jvm.args" value="-Dassert -ea -DAS3 -DAVMPLUS -Xms32m -Xmx384m -Dsun.io.useCanonCaches=false"/> 
 	
@@ -31,8 +33,8 @@
 	    
 	<target name="clean" depends="bundles-clean">
 		<delete file="bundles.properties"/>
-		<delete file="${FLEX_HOME}/frameworks/libs/automation_agent.swc"/>
-		<delete file="${FLEX_HOME}/frameworks/libs/automation_agent.swc.incr"/>
+		<delete file="${FLEX_HOME}/frameworks/libs/automation/automation_agent.swc"/>
+		<delete file="${FLEX_HOME}/frameworks/libs/automation/automation_agent.swc.incr"/>
         <fileset dir="${FLEX_HOME}/frameworks/locale">
             <include name="*/automation_agent_rb.swc"/>
             <include name="*/automation_agent_rb.swc.incr"/>
@@ -40,7 +42,7 @@
 	</target>
 	
    <target name="compile" description="Compiles automation_dmv.swc">
-        <echo message="Compiling frameworks/libs/automation_agent.swc"/>
+        <echo message="Compiling frameworks/libs/automation/automation_agent.swc"/>
         <!-- Load the <compc> task. We can't do this at the <project> level -->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
         <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -59,19 +61,21 @@
         -->
         
         <compc fork="true"
-               output="${FLEX_HOME}/frameworks/libs/automation_agent.swc"
+               output="${FLEX_HOME}/frameworks/libs/automation/automation_agent.swc"
         	   resource-bundle-list="${basedir}/bundles.properties">
             <jvmarg line="${compc.jvm.args}"/>
-            <target-player>${local.playerglobal.version}</target-player>
+            <target-player>${playerglobal.version}</target-player>
             <include-classes>AutomationAgentClasses</include-classes>
             <source-path path-element="${basedir}/src"/>
             <source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
             <library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="${playerglobal.version}/playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
-                </external-library-path>
+            </external-library-path>
             <locale/>
             <accessible>true</accessible>
         </compc>
@@ -105,9 +109,9 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
 			<include-libraries/>
 			<library-path/>
-            <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
-			</external-library-path>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="${playerglobal.version}/playerglobal.swc"/>
+            </external-library-path>
 		</compc>
 	</target>
 	

Modified: incubator/flex/trunk/frameworks/projects/automation_agent/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_agent/src/mx/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_agent/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_agent/src/mx/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.0.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/automation_air/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/automation_air/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_air/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_air/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_air/build.xml Mon Jun 18 20:54:43 2012
@@ -17,11 +17,10 @@
   limitations under the License.
 
 -->
-
 <project name="automation_air" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-
+    
     <property file="${FLEX_HOME}/env.properties"/>
     <property environment="env"/>
 	<property file="${FLEX_HOME}/build.properties"/>
@@ -32,8 +31,6 @@
 		
 	<target name="compile" description="Compiles automation_air.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_air.swc"/>
-		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" level="info"/>
-
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
 		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -55,7 +52,7 @@
 			   output="${FLEX_HOME}/frameworks/libs/automation/automation_air.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>AutomationAirClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
@@ -68,10 +65,10 @@
                 <include name="mx/mx.swc"/>
 		        <include name="textLayout.swc"/>
 				<include name="air/airframework.swc"/>
-				<include name="automation/automation.swc"/>
-				<include name="automation_agent.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/automation/automation.swc"/>
+				<include name="automation/automation_agent.swc"/>
+				<include name="automation/tool.swc"/>
+				<include name="automation/tool_air.swc"/>
 			</external-library-path>
 			<locale/>
 			<accessible>true</accessible>

Modified: incubator/flex/trunk/frameworks/projects/automation_air/src/mx/automation/codec/FilePropertyCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_air/src/mx/automation/codec/FilePropertyCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_air/src/mx/automation/codec/FilePropertyCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_air/src/mx/automation/codec/FilePropertyCodec.as Mon Jun 18 20:54:43 2012
@@ -24,7 +24,7 @@ package mx.automation.codec
 	
 	import mx.automation.IAutomationManager; 
 	import mx.automation.IAutomationObject;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	
 	/**
 	 * Translates between internal Flex color and automation-friendly version
@@ -54,7 +54,7 @@ package mx.automation.codec
 		 */
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			var val:Object = getMemberFromObject(automationManager, obj, propertyDescriptor);
@@ -78,7 +78,7 @@ package mx.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			var fileObj:File = new File();

Modified: incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_air/src/mx/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.8.0.0";
+mx_internal static const VERSION:String = "4.6.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/automation_airspark/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml Mon Jun 18 20:54:43 2012
@@ -38,16 +38,13 @@
 				   output="${FLEX_HOME}/frameworks/locale/@{locale}/automation_airspark_rb.swc"
 				   locale="@{locale}">
 				<jvmarg line="${compc.jvm.args}"/>
-				<target-player>11.1</target-player>
+				<target-player>${playerversion.global}</target-player>
 				
 				<include-namespaces/>
 				<include-classes/>
 				<source-path path-element="${basedir}/bundles/@{locale}"/>
 				<include-libraries/>
 				<library-path/>
-                <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                    <include name="${playerglobal.version}/playerglobal.swc"/>
-                </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 					<include name="framework.swc"/>
    					<include name="mx/mx.swc"/>
@@ -126,7 +123,7 @@
 			   output="${FLEX_HOME}/frameworks/libs/automation/automation_airspark.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>AutomationAirSparkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
@@ -143,9 +140,9 @@
 				<include name="automation/automation.swc"/>
 				<include name="automation/automation_spark.swc"/>
 				<include name="automation/automation_air.swc"/>
-				<include name="automation_agent.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/automation_agent.swc"/>
+				<include name="automation/tool.swc"/>
+				<include name="automation/tool_air.swc"/>
 			</external-library-path>
 			<locale/>
 			<accessible>true</accessible>
@@ -190,9 +187,9 @@
 				<include name="automation/automation.swc"/>
 				<include name="automation/automation_spark.swc"/>
 				<include name="automation/automation_air.swc"/>
-				<include name="automation_agent.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/automation_agent.swc"/>
+				<include name="automation/qtp.swc"/>
+				<include name="automation/qtp_air.swc"/>
 			</external-library-path>
 		</asdoc>
 

Modified: incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml Mon Jun 18 20:54:43 2012
@@ -54,7 +54,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/automation/automation_dmv.swc">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>AutomationDMVClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
@@ -69,9 +69,9 @@
 				<include name="rpc.swc"/>
 				<include name="charts.swc"/>
 				<include name="advancedgrids.swc"/>
-				<include name="automation_agent.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/automation_agent.swc"/>
+				<include name="automation/tool.swc"/>
+				<include name="automation/tool_air.swc"/>
 				</external-library-path>
 			<locale/>
 			<accessible>true</accessible>

Modified: incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml Mon Jun 18 20:54:43 2012
@@ -70,7 +70,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/automation/automation_flashflexkit.swc">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>AutomationFlashFlexKitClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
@@ -80,10 +80,10 @@
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="rpc.swc"/>
-				<include name="automation_agent.swc"/>
+				<include name="automation/automation_agent.swc"/>
 				<include name="automation/automation.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/tool.swc"/>
+				<include name="automation/tool_air.swc"/>
 			</external-library-path>
 			 <external-library-path dir="${FLEX_HOME}/frameworks/projects/flash-integration/libs">
 			 <include name="flash-integration.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/build.xml Mon Jun 18 20:54:43 2012
@@ -33,7 +33,6 @@
 	
 	<target name="compile" description="Compiles automation_spark.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_spark.swc"/>
-
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
 		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -55,7 +54,7 @@
 			   output="${FLEX_HOME}/frameworks/libs/automation/automation_spark.swc">
 			<jvmarg line="${compc.jvm.args}"/>
 			<namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest_automation_spark.xml"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>AutomationSparkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
@@ -70,9 +69,9 @@
 				<include name="rpc.swc"/>
 				<include name="osmf.swc"/>
 				<include name="automation/automation.swc"/>
-				<include name="automation_agent.swc"/>
-				<include name="qtp.swc"/>
-				<include name="qtp_air.swc"/>
+				<include name="automation/automation_agent.swc"/>
+				<include name="automation/tool.swc"/>
+				<include name="automation/tool_air.swc"/>
 			</external-library-path>
 			<locale/>
 			<accessible>true</accessible>

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/src/mx/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.8.0.0";
+mx_internal static const VERSION:String = "4.6.0.0";

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/automation/codec/SparkDropDownListBaseSelectedItemCodec.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/automation/codec/SparkDropDownListBaseSelectedItemCodec.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/automation/codec/SparkDropDownListBaseSelectedItemCodec.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/automation/codec/SparkDropDownListBaseSelectedItemCodec.as Mon Jun 18 20:54:43 2012
@@ -25,7 +25,7 @@ package spark.automation.codec
 	import mx.automation.IAutomationObject;
 	import mx.automation.IAutomationTabularData;
 	import mx.automation.codec.DefaultPropertyCodec;
-	import mx.automation.qtp.IQTPPropertyDescriptor;
+	import mx.automation.tool.IToolPropertyDescriptor;
 	import mx.core.mx_internal;
 	
 	import spark.components.DropDownList;
@@ -68,7 +68,7 @@ package spark.automation.codec
 		 */ 
 		override public function encode(automationManager:IAutomationManager,
 										obj:Object, 
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):Object
 		{
 			// get the selected item
@@ -92,7 +92,7 @@ package spark.automation.codec
 		override public function decode(automationManager:IAutomationManager,
 										obj:Object, 
 										value:Object,
-										propertyDescriptor:IQTPPropertyDescriptor,
+										propertyDescriptor:IToolPropertyDescriptor,
 										relativeParent:IAutomationObject):void
 		{
 			// we expect this codec to be used for getting the property details.

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/src/spark/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.8.0.0";
+mx_internal static const VERSION:String = "4.6.0.0";

Modified: incubator/flex/trunk/frameworks/projects/tool/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/tool/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/tool/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/tool/build.xml Mon Jun 18 20:54:43 2012
@@ -20,8 +20,10 @@
 <project name="tool" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-    <property file="${FLEX_HOME}/build.properties"/>
-    <property name="local.playerglobal.version" value="11.1"/>
+
+    <property file="${FLEX_HOME}/env.properties"/>
+    <property environment="env"/>
+	<property file="${FLEX_HOME}/build.properties"/>
 	
     <target name="main" depends="clean,compile" description="Clean build of tool.swc"/>
     
@@ -58,15 +60,17 @@
         <compc fork="true"
                output="${FLEX_HOME}/frameworks/libs/tool.swc">
             <jvmarg line="${compc.jvm.args}"/>
-            <target-player>${local.playerglobal.version}</target-player>
+            <target-player>${playerglobal.version}</target-player>
             <include-classes>ToolClasses</include-classes>
             <source-path path-element="${basedir}/src"/>
             <source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
             <source-path path-element="${FLEX_HOME}/frameworks/projects/automation_spark/src"/>
             <library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="${playerglobal.version}/playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
-                <include name="automation_agent.swc"/>
+                <include name="automation/automation_agent.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="advancedgrids.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/tool/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/tool/src/mx/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/tool/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/tool/src/mx/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";

Propchange: incubator/flex/trunk/frameworks/projects/tool_air/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 18 20:54:43 2012
@@ -0,0 +1 @@
+bundles.properties

Modified: incubator/flex/trunk/frameworks/projects/tool_air/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/tool_air/build.xml?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/tool_air/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/tool_air/build.xml Mon Jun 18 20:54:43 2012
@@ -20,7 +20,11 @@
 <project name="tool_air" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-    <property file="${FLEX_HOME}/build.properties"/>
+
+    <property file="${FLEX_HOME}/env.properties"/>
+    <property environment="env"/>
+	<property file="${FLEX_HOME}/build.properties"/>
+	
     <property name="local.playerglobal.version" value="11"/>
 
 	<target name="main" depends="clean,compile" description="Clean build of tool_air.swc"/>
@@ -40,6 +44,8 @@
 
 	<target name="compile">
 		<echo message="Compiling tool_air.swc"/>
+		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc" level="info"/>
+		
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
 		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -61,7 +67,7 @@
 			   output="${FLEX_HOME}/frameworks/libs/tool_air.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>${local.playerglobal.version}</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<include-classes>ToolAIRClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
@@ -69,20 +75,20 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation_spark/src"/>
 			
 			<library-path/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="air/airglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="advancedgrids.swc"/>
 				<include name="charts.swc"/>
 				<include name="spark.swc"/>
 				<include name="textLayout.swc"/>
+				<include name="automation/automation_agent.swc"/>
 				<include name="automation/automation_dmv.swc"/>
 				<include name="datavisualization.swc"/>
-			</external-library-path>
-			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-				<include name="automation_agent.swc"/>
-			</external-library-path>
+            </external-library-path>
 			<locale/>
 			<accessible>true</accessible>
 		</compc>

Modified: incubator/flex/trunk/frameworks/projects/tool_air/src/mx/core/Version.as
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/tool_air/src/mx/core/Version.as?rev=1351482&r1=1351481&r2=1351482&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/tool_air/src/mx/core/Version.as (original)
+++ incubator/flex/trunk/frameworks/projects/tool_air/src/mx/core/Version.as Mon Jun 18 20:54:43 2012
@@ -23,4 +23,4 @@ import mx.core.mx_internal;
  *  @private
  *  Version string for this class.
  */
-mx_internal static const VERSION:String = "4.6.0.0";
+mx_internal static const VERSION:String = "4.8.0.0";



Mime
View raw message