You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/08/08 11:54:44 UTC

[3/3] git commit: [flex-utilities] [refs/heads/develop] - Updated name spaces to more modern ones

Updated name spaces to more modern ones


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/812a8b67
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/812a8b67
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/812a8b67

Branch: refs/heads/develop
Commit: 812a8b67450cead1cb34b6e8dfed5b7cb89caf58
Parents: 60726c6
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Aug 8 19:54:21 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Aug 8 19:54:21 2014 +1000

----------------------------------------------------------------------
 TourDeFlex/TourDeFlex3/src/SourceTab.mxml       | 13 ++--
 .../src/charts/BubbleChartExample.mxml          | 14 ++--
 .../src/charts/CandlestickChartExample.mxml     | 26 ++++----
 .../src/charts/Column_BarChartExample.mxml      | 26 ++++----
 .../src/charts/DateTimeAxisExample.mxml         |  6 +-
 .../src/charts/GridLinesExample.mxml            |  6 +-
 .../src/charts/HLOCChartExample.mxml            | 12 ++--
 .../src/charts/Line_AreaChartExample.mxml       | 26 ++++----
 .../TourDeFlex3/src/charts/LogAxisExample.mxml  |  6 +-
 .../TourDeFlex3/src/charts/PieChartExample.mxml | 37 ++++++-----
 .../src/charts/PlotChartExample.mxml            | 26 ++++----
 .../src/charts/SeriesInterpolateExample.mxml    | 12 ++--
 .../src/charts/SeriesSlideExample.mxml          | 12 ++--
 .../src/charts/SeriesZoomExample.mxml           | 12 ++--
 .../src/containers/AccordionExample.mxml        |  2 +-
 .../src/containers/DividedBoxExample.mxml       |  2 +-
 .../TourDeFlex3/src/containers/FormExample.mxml | 48 +++++++-------
 .../src/containers/GridLayoutExample.mxml       |  2 +-
 .../TourDeFlex3/src/containers/HBoxExample.mxml |  2 +-
 .../src/containers/HDividedBoxExample.mxml      |  2 +-
 .../SimpleApplicationControlBarExample.mxml     |  6 +-
 .../src/containers/SimpleBoxExample.mxml        |  2 +-
 .../src/containers/SimpleCanvasExample.mxml     |  2 +-
 .../src/containers/SimpleControlBarExample.mxml |  2 +-
 .../src/containers/SimplePanelExample.mxml      |  6 +-
 .../containers/SimpleTitleWindowExample.mxml    |  6 +-
 .../src/containers/TabNavigatorExample.mxml     |  2 +-
 .../src/containers/TileLayoutExample.mxml       |  2 +-
 .../src/containers/TitleWindowApp.mxml          |  6 +-
 .../TourDeFlex3/src/containers/VBoxExample.mxml |  2 +-
 .../src/containers/VDividedBoxExample.mxml      |  2 +-
 .../src/containers/ViewStackExample.mxml        |  2 +-
 .../src/controls/AdvancedDataGridExample.mxml   | 10 +--
 .../src/controls/ButtonBarExample.mxml          | 18 ++---
 .../TourDeFlex3/src/controls/ButtonExample.mxml |  6 +-
 .../src/controls/CheckBoxExample.mxml           |  6 +-
 .../src/controls/ColorPickerExample.mxml        |  2 +-
 .../src/controls/DateChooserExample.mxml        | 10 +--
 .../src/controls/DateFieldExample.mxml          | 10 +--
 .../src/controls/HScrollBarExample.mxml         |  6 +-
 .../src/controls/HorizontalListExample.mxml     | 20 +++---
 .../TourDeFlex3/src/controls/LabelExample.mxml  |  6 +-
 .../src/controls/LinkBarExample.mxml            |  2 +-
 .../src/controls/LinkButtonExample.mxml         |  6 +-
 TourDeFlex/TourDeFlex3/src/controls/Local.mxml  |  2 +-
 .../src/controls/MenuBarExample.mxml            |  6 +-
 .../src/controls/NumericStepperExample.mxml     |  2 +-
 .../src/controls/OLAPDataGridExample.mxml       | 70 ++++++++++----------
 .../src/controls/PopUpButtonExample.mxml        |  6 +-
 .../src/controls/PopUpButtonMenuExample.mxml    | 20 +++---
 .../src/controls/RadioButtonExample.mxml        |  6 +-
 .../src/controls/RadioButtonGroupExample.mxml   |  6 +-
 .../src/controls/RichTextEditorExample.mxml     |  2 +-
 .../TourDeFlex3/src/controls/SimpleAlert.mxml   |  6 +-
 .../src/controls/SimpleComboBox.mxml            |  6 +-
 .../src/controls/SimpleDataGrid.mxml            | 56 ++++++++--------
 .../TourDeFlex3/src/controls/SimpleHRule.mxml   |  6 +-
 .../TourDeFlex3/src/controls/SimpleImage.mxml   |  2 +-
 .../src/controls/SimpleImageHSlider.mxml        |  6 +-
 .../src/controls/SimpleImageVSlider.mxml        |  6 +-
 .../TourDeFlex3/src/controls/SimpleList.mxml    | 36 +++++-----
 .../TourDeFlex3/src/controls/SimpleLoader.mxml  |  2 +-
 .../src/controls/SimpleMenuExample.mxml         | 20 +++---
 .../src/controls/SimpleProgressBar.mxml         |  6 +-
 .../TourDeFlex3/src/controls/SimpleVRule.mxml   |  2 +-
 .../TourDeFlex3/src/controls/SpacerExample.mxml |  2 +-
 .../TourDeFlex3/src/controls/TabBarExample.mxml |  6 +-
 .../src/controls/TextAreaExample.mxml           |  2 +-
 .../TourDeFlex3/src/controls/TextExample.mxml   |  2 +-
 .../src/controls/TextInputExample.mxml          |  2 +-
 .../src/controls/TileListExample.mxml           | 20 +++---
 .../src/controls/ToggleButtonBarExample.mxml    | 18 ++---
 .../TourDeFlex3/src/controls/TreeExample.mxml   | 38 ++++++-----
 .../src/controls/VScrollBarExample.mxml         |  6 +-
 .../src/controls/VideoDisplayExample.mxml       |  2 +-
 .../TourDeFlex3/src/core/RepeaterExample.mxml   |  6 +-
 .../src/core/SimpleApplicationExample.mxml      |  6 +-
 .../src/effects/AddItemActionEffectExample.mxml | 58 ++++++++--------
 .../effects/AnimatePropertyEffectExample.mxml   | 14 ++--
 .../src/effects/BlurEffectExample.mxml          | 18 ++---
 .../src/effects/CompositeEffectExample.mxml     |  6 +-
 .../src/effects/DefaultListEffectExample.mxml   | 18 ++---
 .../effects/DefaultTileListEffectExample.mxml   | 18 ++---
 .../src/effects/DissolveEffectExample.mxml      | 10 +--
 .../src/effects/FadeEffectExample.mxml          | 12 ++--
 .../src/effects/GlowEffectExample.mxml          | 24 ++++---
 .../src/effects/IrisEffectExample.mxml          |  8 ++-
 .../src/effects/MoveEffectExample.mxml          | 10 +--
 .../src/effects/ParallelEffectExample.mxml      | 24 ++++---
 .../src/effects/PauseEffectExample.mxml         | 20 +++---
 .../src/effects/ResizeEffectExample.mxml        |  8 ++-
 .../src/effects/RotateEffectExample.mxml        | 14 ++--
 .../src/effects/SequenceEffectExample.mxml      | 20 +++---
 .../src/effects/SimpleEffectExample.mxml        | 12 ++--
 .../src/effects/SimpleTweenEffectExample.mxml   | 16 +++--
 .../src/effects/SoundEffectExample.mxml         |  6 +-
 .../src/effects/WipeDownExample.mxml            |  8 ++-
 .../src/effects/WipeLeftExample.mxml            |  8 ++-
 .../src/effects/WipeRightExample.mxml           |  8 ++-
 .../TourDeFlex3/src/effects/WipeUpExample.mxml  |  8 ++-
 .../src/effects/ZoomEffectExample.mxml          | 10 +--
 TourDeFlex/TourDeFlex3/src/explorer.mxml        | 16 +++--
 .../formatters/CurrencyFormatterExample.mxml    | 22 +++---
 .../src/formatters/DateFormatterExample.mxml    | 16 +++--
 .../src/formatters/NumberFormatterExample.mxml  | 18 ++---
 .../src/formatters/PhoneFormatterExample.mxml   | 18 ++---
 .../src/formatters/SimpleFormatterExample.mxml  | 10 +--
 .../SwitchSymbolFormatterExample.mxml           | 10 +--
 .../src/formatters/ZipCodeFormatterExample.mxml | 14 ++--
 TourDeFlex/TourDeFlex3/src/loaderPanel.mxml     |  6 +-
 .../printing/AdvancedPrintDataGridExample.mxml  |  6 +-
 .../src/printing/FormPrintFooter.mxml           |  8 +--
 .../src/printing/FormPrintHeader.mxml           |  4 +-
 .../TourDeFlex3/src/printing/FormPrintView.mxml |  8 +--
 .../src/printing/PrintDataGridExample.mxml      |  6 +-
 .../TourDeFlex3/src/states/StatesExample.mxml   |  2 +-
 .../src/states/TransitionExample.mxml           |  2 +-
 .../validators/CreditCardValidatorExample.mxml  | 22 +++---
 .../validators/CurrencyValidatorExample.mxml    | 14 ++--
 .../src/validators/DateValidatorExample.mxml    | 30 +++++----
 .../src/validators/EmailValidatorExample.mxml   | 14 ++--
 .../src/validators/NumberValidatorExample.mxml  | 18 ++---
 .../validators/PhoneNumberValidatorExample.mxml | 14 ++--
 .../src/validators/RegExValidatorExample.mxml   | 18 ++---
 .../src/validators/SimpleValidatorExample.mxml  | 14 ++--
 .../SocialSecurityValidatorExample.mxml         | 14 ++--
 .../src/validators/StringValidatorExample.mxml  | 22 +++---
 .../src/validators/ZipCodeValidatorExample.mxml | 14 ++--
 TourDeFlex/TourDeFlex3/src/viewsource.mxml      |  8 +--
 129 files changed, 835 insertions(+), 709 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/SourceTab.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/SourceTab.mxml b/TourDeFlex/TourDeFlex3/src/SourceTab.mxml
index f713c12..b9450cf 100755
--- a/TourDeFlex/TourDeFlex3/src/SourceTab.mxml
+++ b/TourDeFlex/TourDeFlex3/src/SourceTab.mxml
@@ -17,9 +17,9 @@
       limitations under the License.
   -->
 
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" width="100%" height="100%">
+<mx:VBox xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx" width="100%" height="100%">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
         import mx.rpc.events.ResultEvent;
@@ -31,6 +31,7 @@
             label = file.substring(file.lastIndexOf("/")+1);
             srv.url = file;
             srv.send();
+			ta.verticalScrollPosition = 19; // at end of header
         }
 
         private function resultHandler(event:ResultEvent):void
@@ -47,10 +48,12 @@
         }
 
         ]]>
-    </mx:Script>
-
-    <mx:HTTPService id="srv" useProxy="false" resultFormat="text" result="resultHandler(event)" fault="faultHandler(event)"/>
+    </fx:Script>
 
+	<fx:Declarations>
+    	<mx:HTTPService id="srv" useProxy="false" resultFormat="text" result="resultHandler(event)" fault="faultHandler(event)"/>
+	</fx:Declarations>
+	
     <mx:TextArea id= "ta" color="#0000A0" fontFamily="Courier" editable="false" wordWrap="false" width="100%" height="100%"/>
 
 </mx:VBox>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/BubbleChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/BubbleChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/BubbleChartExample.mxml
index a6bb939..8c90a2b 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/BubbleChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/BubbleChartExample.mxml
@@ -17,8 +17,8 @@
   -->
 
 <!-- Simple example to demonstrate the BubbleChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-    <mx:Script>
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+    <fx:Script>
         <![CDATA[        
         import mx.collections.ArrayCollection;
 
@@ -30,11 +30,13 @@
             { Month: "Apr", Profit: 1800, Expenses: 1200, Amount: 900 },
             { Month: "May", Profit: 2400, Expenses: 575, Amount: 500 } ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <!-- Define custom color and line style for the bubbles. -->
-    <mx:SolidColor id="sc1" color="blue" alpha=".3"/>
-    <mx:SolidColorStroke id="stroke1" color="blue" weight="1"/>
+	<fx:Declarations>
+		<!-- Define custom color and line style for the bubbles. -->
+    	<mx:SolidColor id="sc1" color="blue" alpha=".3"/>
+    	<mx:SolidColorStroke id="stroke1" color="blue" weight="1"/>
+	</fx:Declarations>
 
     <mx:Panel title="BubbleChart Control Example" height="100%" width="100%">
         <mx:BubbleChart id="bubblechart" 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/CandlestickChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/CandlestickChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/CandlestickChartExample.mxml
index 6957606..665bc26 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/CandlestickChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/CandlestickChartExample.mxml
@@ -17,8 +17,8 @@
   -->
 
 <!-- Simple example to demonstrate the CandlestickChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-    <mx:Script>
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+    <fx:Script>
         <![CDATA[          
         import mx.collections.ArrayCollection;
 
@@ -35,17 +35,19 @@
             { Date: "4-Aug", Open: 37.98,  High: 37.98, Low: 36.56, Close:36.69},                       
             { Date: "5-Aug", Open: 36.61,  High: 37, Low: 36.48, Close:36.86} ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <!-- Define custom colors for the candles. -->
-    <mx:SolidColor id="up" color="green" alpha=".8"/>
-    <mx:SolidColor id="down" color="red" alpha=".8"/>
-
-    <!-- Define custom Stroke for the candle wick. -->
-    <mx:SolidColorStroke id="wick" color="black" weight="2"/>
-
-    <!-- Define custom Stroke for the candle box. -->
-    <mx:SolidColorStroke id="box" color="black" weight="1"/>
+	<fx:Declarations>
+	    <!-- Define custom colors for the candles. -->
+	    <mx:SolidColor id="up" color="green" alpha=".8"/>
+	    <mx:SolidColor id="down" color="red" alpha=".8"/>
+	
+	    <!-- Define custom Stroke for the candle wick. -->
+	    <mx:SolidColorStroke id="wick" color="black" weight="2"/>
+	
+	    <!-- Define custom Stroke for the candle box. -->
+	    <mx:SolidColorStroke id="box" color="black" weight="1"/>
+	</fx:Declarations>
 
     <mx:Panel title="CandlestickChart Control Example" height="100%" width="100%">
         <mx:CandlestickChart id="candlestickchart" 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/Column_BarChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/Column_BarChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/Column_BarChartExample.mxml
index 3b329d8..b6cad9a 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/Column_BarChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/Column_BarChartExample.mxml
@@ -17,8 +17,8 @@
   -->
 
 <!-- Simple example to demonstrate the ColumnChart and BarChart controls. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-    <mx:Script>
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+    <fx:Script>
         <![CDATA[          
         import mx.collections.ArrayCollection;
 
@@ -28,17 +28,19 @@
             { Country: "China", Gold: 32, Silver:17, Bronze: 14 },
             { Country: "Russia", Gold: 27, Silver:27, Bronze: 38 } ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <!-- Define custom colors for use as fills. -->
-    <mx:SolidColor id="sc1" color="yellow" alpha=".8"/>
-    <mx:SolidColor id="sc2" color="0xCCCCCC" alpha=".6"/>
-    <mx:SolidColor id="sc3" color="0xFFCC66" alpha=".6"/>
-
-    <!-- Define custom Strokes for the columns. -->
-    <mx:SolidColorStroke id="s1" color="yellow" weight="2"/>
-    <mx:SolidColorStroke id="s2" color="0xCCCCCC" weight="2"/>
-    <mx:SolidColorStroke id="s3" color="0xFFCC66" weight="2"/>
+	<fx:Declarations>
+	    <!-- Define custom colors for use as fills. -->
+	    <mx:SolidColor id="sc1" color="yellow" alpha=".8"/>
+	    <mx:SolidColor id="sc2" color="0xCCCCCC" alpha=".6"/>
+	    <mx:SolidColor id="sc3" color="0xFFCC66" alpha=".6"/>
+	
+	    <!-- Define custom Strokes for the columns. -->
+	    <mx:SolidColorStroke id="s1" color="yellow" weight="2"/>
+	    <mx:SolidColorStroke id="s2" color="0xCCCCCC" weight="2"/>
+	    <mx:SolidColorStroke id="s3" color="0xFFCC66" weight="2"/>
+	</fx:Declarations>
 
     <mx:Panel title="ColumnChart and BarChart Controls Example" 
         height="100%" width="100%" layout="horizontal">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/DateTimeAxisExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/DateTimeAxisExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/DateTimeAxisExample.mxml
index 535f9a3..29d06da 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/DateTimeAxisExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/DateTimeAxisExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the DateTimeAxis class. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
             import mx.collections.ArrayCollection;
@@ -43,7 +43,7 @@
                 return newDate;
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="DateTimeAxis Example" height="100%" width="100%">
     

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/GridLinesExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/GridLinesExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/GridLinesExample.mxml
index 7f77f75..659cff2 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/GridLinesExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/GridLinesExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the GridLines class. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
         import mx.collections.ArrayCollection;
@@ -32,7 +32,7 @@
             { Month: "Apr", Profit: 1800, Expenses: 1200, Amount: 900 },
             { Month: "May", Profit: 2400, Expenses: 575, Amount: 500 } ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="GridLines Example" height="100%" width="100%">
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/HLOCChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/HLOCChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/HLOCChartExample.mxml
index 7495966..46598c8 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/HLOCChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/HLOCChartExample.mxml
@@ -17,8 +17,8 @@
   -->
 
 <!-- Simple example to demonstrate the HLOCChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-    <mx:Script>
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+    <fx:Script>
         <![CDATA[          
         import mx.collections.ArrayCollection;
 
@@ -35,10 +35,12 @@
             { Date: "4-Aug", Open: 37.98,  High: 37.98, Low: 36.56, Close:36.69},                       
             { Date: "5-Aug", Open: 36.61,  High: 37, Low: 36.48, Close:36.86} ]); 
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <!-- Define custom Stroke for the wick and ticks. -->
-    <mx:SolidColorStroke id="s1" color="0x000000" weight="5" joints="bevel" caps="square"/>
+	<fx:Declarations>
+    	<!-- Define custom Stroke for the wick and ticks. -->
+   		<mx:SolidColorStroke id="s1" color="0x000000" weight="5" joints="bevel" caps="square"/>
+	</fx:Declarations>
 
     <mx:Panel title="HLOCChart Control Example" height="100%" width="100%">
         <mx:HLOCChart id="hlocchart" height="100%" width="100%"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/Line_AreaChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/Line_AreaChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/Line_AreaChartExample.mxml
index 8da78df..06c94aa 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/Line_AreaChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/Line_AreaChartExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the LineChart and AreaChart controls. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
         import mx.collections.ArrayCollection;
@@ -32,17 +32,19 @@
             { Month: "Apr", Profit: 1800, Expenses: 1200, Amount: 900 },
             { Month: "May", Profit: 2400, Expenses: 575, Amount: 500 } ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <!-- Define custom colors for use as fills in the AreaChart control. -->
-    <mx:SolidColor id="sc1" color="blue" alpha=".3"/>
-    <mx:SolidColor id="sc2" color="red" alpha=".3"/>
-    <mx:SolidColor id="sc3" color="green" alpha=".3"/>
-
-    <!-- Define custom Strokes. -->
-    <mx:SolidColorStroke id = "s1" color="blue" weight="2"/>
-    <mx:SolidColorStroke id = "s2" color="red" weight="2"/>
-    <mx:SolidColorStroke id = "s3" color="green" weight="2"/>
+	<fx:Declarations>
+	    <!-- Define custom colors for use as fills in the AreaChart control. -->
+	    <mx:SolidColor id="sc1" color="blue" alpha=".3"/>
+	    <mx:SolidColor id="sc2" color="red" alpha=".3"/>
+	    <mx:SolidColor id="sc3" color="green" alpha=".3"/>
+	
+	    <!-- Define custom Strokes. -->
+	    <mx:SolidColorStroke id = "s1" color="blue" weight="2"/>
+	    <mx:SolidColorStroke id = "s2" color="red" weight="2"/>
+	    <mx:SolidColorStroke id = "s3" color="green" weight="2"/>
+	</fx:Declarations>
 
     <mx:Panel title="LineChart and AreaChart Controls Example" 
         height="100%" width="100%" layout="horizontal">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/LogAxisExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/LogAxisExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/LogAxisExample.mxml
index 2bf06ff..d3bf38a 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/LogAxisExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/LogAxisExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the LogAxis class. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
         import mx.collections.ArrayCollection;
@@ -32,7 +32,7 @@
             { Month: "Apr", Profit: 1800, Expenses: 1200, Amount: 900 },
             { Month: "May", Profit: 2400, Expenses: 575, Amount: 500 } ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="LogAxis Example" height="100%" width="100%">
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/PieChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/PieChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/PieChartExample.mxml
index a6f1abf..3acef1c 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/PieChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/PieChartExample.mxml
@@ -17,8 +17,8 @@
   -->
 
 <!-- Simple example to demonstrate the PieChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-    <mx:Script>
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+    <fx:Script>
         <![CDATA[          
         import mx.collections.ArrayCollection;
 
@@ -33,22 +33,23 @@
             return data.Country + ": " + '\n' + "Total Gold: " + data.Gold + '\n' + temp + "%";
         }
         ]]>
-    </mx:Script>
-
-    <!-- Define custom colors for use as pie wedge fills. -->
-    <mx:SolidColor id="sc1" color="blue" alpha=".6"/>
-    <mx:SolidColor id="sc2" color="red" alpha=".6"/>
-    <mx:SolidColor id="sc3" color="0x663300" alpha=".6"/>
-
-    <!-- This Stroke is used for the callout lines. -->
-    <mx:SolidColorStroke id="callouts" weight="2" color="0x999999" alpha=".8" caps="square"/>
-    
-    <!-- This Stroke is used to separate the wedges in the pie. -->
-    <mx:SolidColorStroke id="radial" weight="1" color="0xFFFFCC" alpha=".3"/>
-
-    <!-- This Stroke is used for the outer border of the pie. -->
-    <mx:SolidColorStroke id="pieborder" color="0x000000" weight="2" alpha=".5"/>
+    </fx:Script>
 
+	<fx:Declarations>
+	    <!-- Define custom colors for use as pie wedge fills. -->
+	    <mx:SolidColor id="sc1" color="blue" alpha=".6"/>
+	    <mx:SolidColor id="sc2" color="red" alpha=".6"/>
+	    <mx:SolidColor id="sc3" color="0x663300" alpha=".6"/>
+	
+	    <!-- This Stroke is used for the callout lines. -->
+	    <mx:SolidColorStroke id="callouts" weight="2" color="0x999999" alpha=".8" caps="square"/>
+	    
+	    <!-- This Stroke is used to separate the wedges in the pie. -->
+	    <mx:SolidColorStroke id="radial" weight="1" color="0xFFFFCC" alpha=".3"/>
+	
+	    <!-- This Stroke is used for the outer border of the pie. -->
+	    <mx:SolidColorStroke id="pieborder" color="0x000000" weight="2" alpha=".5"/>
+	</fx:Declarations>
 
     <mx:Panel title="Olympics 2004 Medals Tally Panel" height="100%" width="100%">
         <mx:PieChart id="chart" 
@@ -74,7 +75,7 @@
                 >
                     <!-- Clear the drop shadow filters from the chart. -->
                     <mx:filters>
-                        <mx:Array/>
+                        <fx:Array/>
                     </mx:filters>
                 </mx:PieSeries>
             </mx:series>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/PlotChartExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/PlotChartExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/PlotChartExample.mxml
index 21ebd3a..0378e1a 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/PlotChartExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/PlotChartExample.mxml
@@ -17,8 +17,8 @@
   -->
 
 <!-- Simple example to demonstrate the PlotChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-    <mx:Script>
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+    <fx:Script>
         <![CDATA[
         import mx.collections.ArrayCollection;
 
@@ -28,17 +28,19 @@
             { Month: "Feb", Profit: 1000, Expenses: 200, Amount: 600 },
             { Month: "Mar", Profit: 1500, Expenses: 500, Amount: 300 } ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <!-- Define custom colors for use as plot point fills. -->
-    <mx:SolidColor id="sc1" color="blue" alpha=".3"/>
-    <mx:SolidColor id="sc2" color="red" alpha=".3"/>
-    <mx:SolidColor id="sc3" color="green" alpha=".3"/>
-
-    <!-- Define custom Strokes. -->
-    <mx:SolidColorStroke id="s1" color="blue" weight="1"/>
-    <mx:SolidColorStroke id="s2" color="red" weight="1"/>
-    <mx:SolidColorStroke id="s3" color="green" weight="1"/>
+	<fx:Declarations>
+	    <!-- Define custom colors for use as plot point fills. -->
+	    <mx:SolidColor id="sc1" color="blue" alpha=".3"/>
+	    <mx:SolidColor id="sc2" color="red" alpha=".3"/>
+	    <mx:SolidColor id="sc3" color="green" alpha=".3"/>
+	
+	    <!-- Define custom Strokes. -->
+	    <mx:SolidColorStroke id="s1" color="blue" weight="1"/>
+	    <mx:SolidColorStroke id="s2" color="red" weight="1"/>
+	    <mx:SolidColorStroke id="s3" color="green" weight="1"/>
+	</fx:Declarations>
 
     <mx:Panel title="PlotChart Control Example" height="100%" width="100%">
         <mx:PlotChart id="plot" 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/SeriesInterpolateExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/SeriesInterpolateExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/SeriesInterpolateExample.mxml
index 566140a..11896e5 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/SeriesInterpolateExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/SeriesInterpolateExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the CandlestickChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
           
         import mx.collections.ArrayCollection;
@@ -50,10 +50,12 @@
             { Date: "4-Aug", Open: 21.67,  High: 22.82, Low: 21.67, Close:22.34},
             { Date: "5-Aug", Open: 22.44,  High: 22.85, Low: 22.12, Close:22.31} ]);
         ]]>
-    </mx:Script>
-
-    <mx:SeriesInterpolate id="interpolateIn" duration="1000"/>
+    </fx:Script>
 
+	<fx:Declarations>
+    	<mx:SeriesInterpolate id="interpolateIn" duration="1000"/>
+	</fx:Declarations>
+	
     <mx:Panel title="CandlestickChart Control Example" height="100%" width="100%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/SeriesSlideExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/SeriesSlideExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/SeriesSlideExample.mxml
index c36427b..64578ce 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/SeriesSlideExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/SeriesSlideExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the CandlestickChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
           
         import mx.collections.ArrayCollection;
@@ -50,10 +50,12 @@
             { Date: "4-Aug", Open: 21.67,  High: 22.82, Low: 21.67, Close:22.34},
             { Date: "5-Aug", Open: 22.44,  High: 22.85, Low: 22.12, Close:22.31} ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
     
-    <mx:SeriesSlide id="slideIn" duration="1000" direction="up"/>
-    <mx:SeriesSlide id="slideOut" duration="1000" direction="down"/>
+	<fx:Declarations>
+    	<mx:SeriesSlide id="slideIn" duration="1000" direction="up"/>
+    	<mx:SeriesSlide id="slideOut" duration="1000" direction="down"/>
+	</fx:Declarations>
 
     <mx:Panel title="CandlestickChart Control Example" height="100%" width="100%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/charts/SeriesZoomExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/charts/SeriesZoomExample.mxml b/TourDeFlex/TourDeFlex3/src/charts/SeriesZoomExample.mxml
index 5a35d63..f0a72a6 100755
--- a/TourDeFlex/TourDeFlex3/src/charts/SeriesZoomExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/charts/SeriesZoomExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the CandlestickChart control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
           
         import mx.collections.ArrayCollection;
@@ -50,10 +50,12 @@
             { Date: "4-Aug", Open: 21.67,  High: 22.82, Low: 21.67, Close:22.34},
             { Date: "5-Aug", Open: 22.44,  High: 22.85, Low: 22.12, Close:22.31} ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
     
-    <mx:SeriesZoom id="zoomIn" duration="1000"/>
-    <mx:SeriesZoom id="zoomOut" duration="1000"/>
+	<fx:Declarations>
+    	<mx:SeriesZoom id="zoomIn" duration="1000"/>
+    	<mx:SeriesZoom id="zoomOut" duration="1000"/>
+	</fx:Declarations>
 
     <mx:Panel title="CandlestickChart Control Example" height="100%" width="100%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/AccordionExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/AccordionExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/AccordionExample.mxml
index d693dff..5bb5967 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/AccordionExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/AccordionExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the Accordion layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="Accordion Container Example" height="90%" width="90%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/DividedBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/DividedBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/DividedBoxExample.mxml
index 4a28b9a..fed477a 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/DividedBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/DividedBoxExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the DividedBox layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="DividedBox Container Example" height="95%" width="95%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/FormExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/FormExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/FormExample.mxml
index b929234..3211912 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/FormExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/FormExample.mxml
@@ -17,20 +17,31 @@
   -->
 
 <!-- Simple example to demonstrate Form layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
-
-    <mx:Model id="checkModel">
-        <User>
-            <FirstName>{fname.text}</FirstName>
-            <DOB>{dob.text}</DOB>
-            <Email>{email.text}</Email>
-            <Age>{age.text}</Age>
-            <SSN>{ssn.text}</SSN>
-            <Zip>{zip.text}</Zip>
-            <Phone>{phone.text}</Phone>
-        </User>
-    </mx:Model>
-
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
+
+	<fx:Declarations>
+	    <fx:Model id="checkModel">
+	        <User>
+	            <FirstName>{fname.text}</FirstName>
+	            <DOB>{dob.text}</DOB>
+	            <Email>{email.text}</Email>
+	            <Age>{age.text}</Age>
+	            <SSN>{ssn.text}</SSN>
+	            <Zip>{zip.text}</Zip>
+	            <Phone>{phone.text}</Phone>
+	        </User>
+	    </fx:Model>
+		
+	    <mx:StringValidator source="{fname}" property="text" minLength="4" maxLength="12"/>
+	    <mx:PhoneNumberValidator source="{phone}" property="text"/>
+	    <mx:DateValidator source="{dob}" property="text"/>
+	    <mx:EmailValidator source="{email}" property="text"/>
+	    <mx:NumberValidator source="{age}" property="text" integerError="Enter Integer value"
+	        minValue="18" maxValue="100" domain="int"/>
+	    <mx:SocialSecurityValidator source="{ssn}" property="text"/>
+	    <mx:ZipCodeValidator source="{zip}" property="text"/>
+	</fx:Declarations>
+	
     <mx:Panel title="Form Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">
 
@@ -71,13 +82,4 @@
 
     </mx:Panel>
 
-    <mx:StringValidator source="{fname}" property="text" minLength="4" maxLength="12"/>
-    <mx:PhoneNumberValidator source="{phone}" property="text"/>
-    <mx:DateValidator source="{dob}" property="text"/>
-    <mx:EmailValidator source="{email}" property="text"/>
-    <mx:NumberValidator source="{age}" property="text" integerError="Enter Integer value"
-        minValue="18" maxValue="100" domain="int"/>
-    <mx:SocialSecurityValidator source="{ssn}" property="text"/>
-    <mx:ZipCodeValidator source="{zip}" property="text"/>
-
 </mx:Application>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/GridLayoutExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/GridLayoutExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/GridLayoutExample.mxml
index c80e72a..ee9277c 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/GridLayoutExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/GridLayoutExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the Grid layout container.-->
-<mx:Application borderStyle="none" xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application borderStyle="none" xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
     
     <mx:Panel title="Grid Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/HBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/HBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/HBoxExample.mxml
index fa4010c..81295b4 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/HBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/HBoxExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the HBox layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="HBox Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/HDividedBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/HDividedBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/HDividedBoxExample.mxml
index 82a7528..cc87bcb 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/HDividedBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/HDividedBoxExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the HDividedBox layout -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="HDividedBox Container Example" width="90%" height="90%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/SimpleApplicationControlBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/SimpleApplicationControlBarExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/SimpleApplicationControlBarExample.mxml
index 36175ad..a7eaaa2 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/SimpleApplicationControlBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/SimpleApplicationControlBarExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the ApplicationControlBar container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" 
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx"
     paddingLeft="10" paddingRight="10" paddingBottom="10" 
     backgroundColor="0xCCCCCC">
 
@@ -25,7 +25,7 @@
         <mx:Label text="Docked" color="blue"/>
 
         <mx:MenuBar id="myMenuBar" labelField="@label">
-            <mx:XMLList>
+            <fx:XMLList>
                 <menuitem label="MenuItem A" >
                     <menuitem label="SubMenuItem A-1" type="check"/>
                     <menuitem label="SubMenuItem A-2" type="check"/>
@@ -37,7 +37,7 @@
                     <menuitem label="SubMenuItem D-2" type="radio" groupName="one"/>
                     <menuitem label="SubMenuItem D-3" type="radio" groupName="one"/>
                 </menuitem>
-            </mx:XMLList>
+            </fx:XMLList>
         </mx:MenuBar>
     </mx:ApplicationControlBar>
 	

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/SimpleBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/SimpleBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/SimpleBoxExample.mxml
index bd9931a..2382b9a 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/SimpleBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/SimpleBoxExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the Box layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="Box Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/SimpleCanvasExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/SimpleCanvasExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/SimpleCanvasExample.mxml
index 786f222..4273d60 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/SimpleCanvasExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/SimpleCanvasExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the Canvas layout container.-->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="Canvas Container Example" height="95%" width="95%" 
         paddingTop="5" paddingLeft="5" paddingRight="5" paddingBottom="5">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/SimpleControlBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/SimpleControlBarExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/SimpleControlBarExample.mxml
index 2de393f..a60819f 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/SimpleControlBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/SimpleControlBarExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the ControlBar container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="ControlBar Container Example"  width="75%" height="75%" 
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/SimplePanelExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/SimplePanelExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/SimplePanelExample.mxml
index 0e93794..adcaa17 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/SimplePanelExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/SimplePanelExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate Panel layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
        
             private function showProperties():void  {
@@ -29,7 +29,7 @@
 				  "Height: " + panel.height ;
 	        }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel id="panel" title="Panel Container Example" status="Active" 
             height="75%" width="75%" 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/SimpleTitleWindowExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/SimpleTitleWindowExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/SimpleTitleWindowExample.mxml
index e7a7b7d..58d1467 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/SimpleTitleWindowExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/SimpleTitleWindowExample.mxml
@@ -20,10 +20,10 @@
      The TitleWindowApp application displays this component. 
      You cannot run it independently. -->
      
-<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
+<mx:TitleWindow xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx"
     title="Title Window" x="168" y="86">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[       
             import mx.managers.PopUpManager;
             import mx.controls.Text;
@@ -37,7 +37,7 @@
                 PopUpManager.removePopUp(this);
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:HBox>
         <mx:Label text="Enter Name: "/>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/TabNavigatorExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/TabNavigatorExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/TabNavigatorExample.mxml
index 13af960..49ee2d9 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/TabNavigatorExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/TabNavigatorExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the TabNavigator layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="TabNavigator Container Example" height="90%" width="90%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/TileLayoutExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/TileLayoutExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/TileLayoutExample.mxml
index c1ec262..b71b823 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/TileLayoutExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/TileLayoutExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the Tile layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="Tile Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/TitleWindowApp.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/TitleWindowApp.mxml b/TourDeFlex/TourDeFlex3/src/containers/TitleWindowApp.mxml
index 9137cf3..fd0e43c 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/TitleWindowApp.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/TitleWindowApp.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Main application to demonstrate TitleWindow layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
        
             import mx.managers.PopUpManager;
@@ -49,7 +49,7 @@
                 login.loginName=returnedName;
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="TitleWindow Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/VBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/VBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/VBoxExample.mxml
index 2468456..8441e94 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/VBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/VBoxExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the VBox layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="VBox Container Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/VDividedBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/VDividedBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/VDividedBoxExample.mxml
index 61ab612..4b7ea88 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/VDividedBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/VDividedBoxExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the VDividedBox layout -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="VDividedBox Container Example" width="90%" height="90%" 
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/containers/ViewStackExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/containers/ViewStackExample.mxml b/TourDeFlex/TourDeFlex3/src/containers/ViewStackExample.mxml
index 366a980..0e87625 100755
--- a/TourDeFlex/TourDeFlex3/src/containers/ViewStackExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/containers/ViewStackExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the ViewStack layout container. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
      <mx:Panel title="ViewStack Container Example" height="95%" width="95%" 
          paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/AdvancedDataGridExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/AdvancedDataGridExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/AdvancedDataGridExample.mxml
index 7ec634e..e262695 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/AdvancedDataGridExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/AdvancedDataGridExample.mxml
@@ -16,9 +16,9 @@
       limitations under the License.
   -->
 
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
             import mx.collections.ArrayCollection;
                   
@@ -42,7 +42,7 @@
                   Territory_Rep:"Jane Grove", Actual:44913, Estimate:45000}
             ]);
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="AdvancedDataGrid Control Example"
         height="75%" width="75%" layout="horizontal"
@@ -52,14 +52,14 @@
             width="100%" height="100%" 
             initialize="gc.refresh();">        
             <mx:dataProvider>
-                <mx:GroupingCollection id="gc" source="{dpFlat}">
+                <mx:GroupingCollection2 id="gc" source="{dpFlat}">
                     <mx:grouping>
                         <mx:Grouping>
                             <mx:GroupingField name="Region"/>
                             <mx:GroupingField name="Territory"/>
                         </mx:Grouping>
                     </mx:grouping>
-                </mx:GroupingCollection>
+                </mx:GroupingCollection2>
             </mx:dataProvider>        
             
             <mx:columns>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
index 2a0e80a..1af7ca5 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the ButtonBar control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
             import mx.events.ItemClickEvent;
@@ -31,7 +31,7 @@
     		        "\n" + "Selected button label: " + event.label;
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="ButtonBar Control Example" height="75%" width="75%"
         paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10">
@@ -43,12 +43,12 @@
 
         <mx:ButtonBar itemClick="clickHandler(event);">
             <mx:dataProvider>
-                <mx:Array>
-                    <mx:String>Flex SDK</mx:String>
-                    <mx:String>Flex JS</mx:String>
-                    <mx:String>Falcon</mx:String>
-                    <mx:String>Falcon JX</mx:String>
-                </mx:Array>
+                <fx:Array>
+                    <fx:String>Flex SDK</fx:String>
+                    <fx:String>Flex JS</fx:String>
+                    <fx:String>Falcon</fx:String>
+                    <fx:String>Falcon JX</fx:String>
+                </fx:Array>
             </mx:dataProvider>
         </mx:ButtonBar>
     </mx:Panel>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/ButtonExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/ButtonExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/ButtonExample.mxml
index a2cc34a..87927ae 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/ButtonExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/ButtonExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the Button control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
             import flash.events.Event;
@@ -31,7 +31,7 @@
             }
 
       ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="Button Control Example"
         height="75%" width="75%" layout="horizontal"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/CheckBoxExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/CheckBoxExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/CheckBoxExample.mxml
index fca4622..6e864bb 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/CheckBoxExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/CheckBoxExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the CheckBox control -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
            import mx.controls.Alert;         
@@ -53,7 +53,7 @@
 		        }
 	       }    
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="CheckBox Control Example" 
         height="75%" width="75%" layout="horizontal"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/ColorPickerExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/ColorPickerExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/ColorPickerExample.mxml
index afc7561..db6e034 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/ColorPickerExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/ColorPickerExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the ColorPicker control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="ColorPicker Control Example" height="75%" width="75%" 
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/DateChooserExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/DateChooserExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/DateChooserExample.mxml
index 432c1f3..d8f4bce 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/DateChooserExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/DateChooserExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate DateChooser control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
             // Event handler function to write the selected
@@ -32,9 +32,11 @@
                         '/' + (date.getMonth()+1).toString() + '/' + date.getDate();
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <mx:DateFormatter id="df"/>
+	<fx:Declarations>
+    	<mx:DateFormatter id="df"/>
+	</fx:Declarations>
     
     <mx:Panel title="DateChooser Control Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/DateFieldExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/DateFieldExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/DateFieldExample.mxml
index 6528d53..3113e05 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/DateFieldExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/DateFieldExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the DateField control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
       <![CDATA[
 
          // Event handler for the DateField change event.
@@ -31,9 +31,11 @@
                     '/' + (date.getMonth()+1).toString() + '/' + date.getDate();
          }
       ]]>
-    </mx:Script>
+    </fx:Script>
  
- <mx:DateFormatter id="df"/>
+	<fx:Declarations>
+ 		<mx:DateFormatter id="df"/>
+	</fx:Declarations>
 
     <mx:Panel title="DateField Control Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/HScrollBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/HScrollBarExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/HScrollBarExample.mxml
index 1101928..faf2d86 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/HScrollBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/HScrollBarExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the HScrollBar control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
  
-     <mx:Script>
+     <fx:Script>
         <![CDATA[
     
             import mx.events.ScrollEvent;
@@ -35,7 +35,7 @@
                     "The minimum scroll position: " + event.currentTarget.minScrollPosition ;
             }
         ]]>
-    </mx:Script> 
+    </fx:Script> 
   
     <mx:Panel id="panel" title="HScrollBar Control Example" height="75%" width="75%" 
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/HorizontalListExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/HorizontalListExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/HorizontalListExample.mxml
index 45db0ec..ce2452c 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/HorizontalListExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/HorizontalListExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the HorizontalList Control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
              
              [Bindable]
@@ -42,7 +42,7 @@
 	         [Embed(source="assets/ApacheFlexLogo.png")]
              public var logo5:Class;
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="HorizontalList Control Example" height="75%" width="75%" 
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">
@@ -52,13 +52,13 @@
 
         <mx:HorizontalList id="CameraSelection" height="250" columnCount="3" columnWidth="125">
             <mx:dataProvider>
-                <mx:Array>
-                    <mx:Object label="Logo 1" icon="{logo1}"/>
-                    <mx:Object label="Logo 2" icon="{logo2}"/>
-                    <mx:Object label="Logo 3" icon="{logo3}"/>
-                    <mx:Object label="Logo 4" icon="{logo4}"/>
-                    <mx:Object label="Logo 5" icon="{logo5}"/>
-                </mx:Array>
+                <fx:Array>
+                    <fx:Object label="Logo 1" icon="{logo1}"/>
+                    <fx:Object label="Logo 2" icon="{logo2}"/>
+                    <fx:Object label="Logo 3" icon="{logo3}"/>
+                    <fx:Object label="Logo 4" icon="{logo4}"/>
+                    <fx:Object label="Logo 5" icon="{logo5}"/>
+                </fx:Array>
             </mx:dataProvider>
         </mx:HorizontalList>
         

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/LabelExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/LabelExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/LabelExample.mxml
index 84f2152..cf637f1 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/LabelExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/LabelExample.mxml
@@ -16,10 +16,10 @@
       limitations under the License.
   -->
 
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
 <!-- Simple example to demonstrate the Label control -->
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
       
             private var htmlData:String="<br>This label displays <b>bold</b> and <i>italic</i> HTML-formatted text.";
@@ -34,7 +34,7 @@
                 simpleLabel.text="This Label displays plain text.";
             }         
         ]]>
-    </mx:Script>
+    </fx:Script>
 
   <mx:Panel title="Label Control Example" height="75%" width="75%" 
       paddingTop="10" paddingLeft="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/LinkBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/LinkBarExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/LinkBarExample.mxml
index 9feea95..14ae256 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/LinkBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/LinkBarExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the LinkBar control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
  
     <mx:Panel title="LinkBar Control Example" 
         height="75%" width="75%" horizontalAlign="center"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/LinkButtonExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/LinkButtonExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/LinkButtonExample.mxml
index 5eb1102..333b866 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/LinkButtonExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/LinkButtonExample.mxml
@@ -17,11 +17,11 @@
   -->
 
 <!-- Simple example to demonstrate the LinkButton control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         import mx.controls.Alert;
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="LinkButton Control Example" 
         height="75%" width="75%" horizontalAlign="center"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/Local.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/Local.mxml b/TourDeFlex/TourDeFlex3/src/controls/Local.mxml
index 5b600f3..b721148 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/Local.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/Local.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Flex application loaded by the SWFLoader control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" height="75" width="350">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx" height="75" width="350">
 
     <mx:Label color="blue" text="The Label control of the embedded application."/>
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/MenuBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/MenuBarExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/MenuBarExample.mxml
index 5e5e0e4..5970681 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/MenuBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/MenuBarExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the MenuBar control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="initCollections();" >
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx" creationComplete="initCollections();" >
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
 
             import mx.events.MenuEvent;
@@ -62,7 +62,7 @@
                 }        
             }
          ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="MenuBar Control Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/NumericStepperExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/NumericStepperExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/NumericStepperExample.mxml
index e9cfff1..ccdfe5b 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/NumericStepperExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/NumericStepperExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the NumericStepper control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel title="NumericStepper Control Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
index a823e5e..9879b83 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
@@ -16,10 +16,10 @@
       limitations under the License.
   -->
 
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx"
         creationComplete="creationCompleteHandler();">
 
-    <mx:Script>
+    <fx:Script>
       <![CDATA[
         import mx.rpc.AsyncResponder;
         import mx.rpc.AsyncToken;
@@ -161,39 +161,41 @@
             myOLAPDG.dataProvider= result as OLAPResult;            
         }        
       ]]>
-    </mx:Script>
+    </fx:Script>
 
-    <mx:OLAPCube name="FlatSchemaCube" 
-        dataProvider="{flatData}" 
-        id="myMXMLCube"
-        complete="runQuery(event);">
-         
-        <mx:OLAPDimension name="CustomerDim">
-            <mx:OLAPAttribute name="Customer" dataField="customer"/>
-            <mx:OLAPHierarchy name="CustomerHier" hasAll="true">
-                <mx:OLAPLevel attributeName="Customer"/>
-            </mx:OLAPHierarchy>
-        </mx:OLAPDimension>
-        
-        <mx:OLAPDimension name="ProductDim">
-            <mx:OLAPAttribute name="Product" dataField="product"/>
-            <mx:OLAPHierarchy name="ProductHier" hasAll="true">
-                <mx:OLAPLevel attributeName="Product"/>
-            </mx:OLAPHierarchy>
-        </mx:OLAPDimension>
-    
-        <mx:OLAPDimension name="QuarterDim">
-            <mx:OLAPAttribute name="Quarter" dataField="quarter"/>
-            <mx:OLAPHierarchy name="QuarterHier" hasAll="true">
-                <mx:OLAPLevel attributeName="Quarter"/>
-            </mx:OLAPHierarchy> 
-        </mx:OLAPDimension>
-        
-        <mx:OLAPMeasure name="Revenue" 
-            dataField="revenue" 
-            aggregator="SUM"/>
-    </mx:OLAPCube>
-    
+	<fx:Declarations>
+	    <mx:OLAPCube name="FlatSchemaCube" 
+	        dataProvider="{flatData}" 
+	        id="myMXMLCube"
+	        complete="runQuery(event);">
+	         
+	        <mx:OLAPDimension name="CustomerDim">
+	            <mx:OLAPAttribute name="Customer" dataField="customer"/>
+	            <mx:OLAPHierarchy name="CustomerHier" hasAll="true">
+	                <mx:OLAPLevel attributeName="Customer"/>
+	            </mx:OLAPHierarchy>
+	        </mx:OLAPDimension>
+	        
+	        <mx:OLAPDimension name="ProductDim">
+	            <mx:OLAPAttribute name="Product" dataField="product"/>
+	            <mx:OLAPHierarchy name="ProductHier" hasAll="true">
+	                <mx:OLAPLevel attributeName="Product"/>
+	            </mx:OLAPHierarchy>
+	        </mx:OLAPDimension>
+	    
+	        <mx:OLAPDimension name="QuarterDim">
+	            <mx:OLAPAttribute name="Quarter" dataField="quarter"/>
+	            <mx:OLAPHierarchy name="QuarterHier" hasAll="true">
+	                <mx:OLAPLevel attributeName="Quarter"/>
+	            </mx:OLAPHierarchy> 
+	        </mx:OLAPDimension>
+	        
+	        <mx:OLAPMeasure name="Revenue" 
+	            dataField="revenue" 
+	            aggregator="SUM"/>
+	    </mx:OLAPCube>
+    </fx:Declarations>
+		
     <mx:Panel title="OLAPCube Control Example"
         height="75%" width="75%" layout="horizontal"
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonExample.mxml
index 71ae054..fe58768 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the PopUpButton control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-	<mx:Script>
+	<fx:Script>
 		<![CDATA[
 
 			import mx.controls.*;
@@ -49,7 +49,7 @@
 			}
 
 		]]>
-	</mx:Script>
+	</fx:Script>
 
     <mx:Panel title="PopUpButton Control Example" height="75%" width="75%" 
         paddingTop="10" paddingBottom="10" paddingRight="10" paddingLeft="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonMenuExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonMenuExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonMenuExample.mxml
index caf6ce7..869de96 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonMenuExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/PopUpButtonMenuExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- PopUpMenuButton control example. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
             import mx.events.*;
             import mx.controls.*;
@@ -30,14 +30,16 @@
                     + "  \n menu item index within parent menu: " + event.index);
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 	
-    <!-- A an data provider in E4X format. -->
-    <mx:XMLList id="treeDP2">
-        <node label="Inbox"/>
-        <node label="Calendar"/>
-        <node label="Deleted Items"/>
-    </mx:XMLList>
+	<fx:Declarations>
+	    <!-- A an data provider in E4X format. -->
+	    <fx:XMLList id="treeDP2">
+	        <node label="Inbox"/>
+	        <node label="Calendar"/>
+	        <node label="Deleted Items"/>
+	    </fx:XMLList>
+	</fx:Declarations>
 
     <mx:Panel title="PopUpMenuButton Control Example" height="100%" width="100%" 
         paddingTop="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/RadioButtonExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/RadioButtonExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/RadioButtonExample.mxml
index 58ed479..6763717 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/RadioButtonExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/RadioButtonExample.mxml
@@ -17,11 +17,11 @@
   -->
 
 <!-- Simple example to demonstrate RadioButton control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         import mx.controls.Alert;
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="RadioButton Control Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/RadioButtonGroupExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/RadioButtonGroupExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/RadioButtonGroupExample.mxml
index 9d7d22c..95bcbd8 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/RadioButtonGroupExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/RadioButtonGroupExample.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate RadioButtonGroup control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
 	    <![CDATA[
 	
 	    import mx.controls.Alert;
@@ -41,7 +41,7 @@
 			} 
 		}
 	    ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="RadioButtonGroup Control Example" height="75%" width="75%" 
         paddingTop="10" paddingLeft="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/RichTextEditorExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/RichTextEditorExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/RichTextEditorExample.mxml
index 5196c19..21bb12c 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/RichTextEditorExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/RichTextEditorExample.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the RichTextEditor control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" 
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx"
     horizontalAlign="center" verticalAlign="middle">
 
     <mx:RichTextEditor id="rte" title="RichTextEditor" height="75%" text="Enter text into the RichTextEditor control, then click a button to display your text as plain text, or as HTML-formatted text."/>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/SimpleAlert.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/SimpleAlert.mxml b/TourDeFlex/TourDeFlex3/src/controls/SimpleAlert.mxml
index b140682..b6f112d 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/SimpleAlert.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/SimpleAlert.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the Alert control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
             import mx.controls.Alert;
             import mx.events.CloseEvent;
@@ -54,7 +54,7 @@
                 Alert.noLabel = "No";                
             }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="Alert Control Example" width="75%" horizontalAlign="center" paddingTop="10">
       <mx:Text width="100%" color="blue" textAlign="center"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/SimpleComboBox.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/SimpleComboBox.mxml b/TourDeFlex/TourDeFlex3/src/controls/SimpleComboBox.mxml
index 1ff2fde..82f95b0 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/SimpleComboBox.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/SimpleComboBox.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the ComboBox control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
             import mx.collections.ArrayCollection;
 
@@ -34,7 +34,7 @@
                 myData.text = "Data: " +  ComboBox(event.target).selectedItem.data;
             }     
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel title="ComboBox Control Example" 
         height="75%" width="75%" layout="horizontal"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/SimpleDataGrid.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/SimpleDataGrid.mxml b/TourDeFlex/TourDeFlex3/src/controls/SimpleDataGrid.mxml
index 29db6be..72b42a6 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/SimpleDataGrid.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/SimpleDataGrid.mxml
@@ -17,34 +17,36 @@
   -->
 
 <!-- DataGrid control example. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:XMLList id="employees">
-        <employee>
-            <name>Christina Coenraets</name>
-            <phone>555-219-2270</phone>
-            <email>ccoenraets@fictitious.com</email>
-            <active>true</active>
-        </employee>
-        <employee>
-            <name>Joanne Wall</name>
-            <phone>555-219-2012</phone>
-            <email>jwall@fictitious.com</email>
-            <active>true</active>
-        </employee>
-        <employee>
-            <name>Maurice Smith</name>
-            <phone>555-219-2012</phone>
-            <email>maurice@fictitious.com</email>
-            <active>false</active>
-        </employee>
-        <employee>
-            <name>Mary Jones</name>
-            <phone>555-219-2000</phone>
-            <email>mjones@fictitious.com</email>
-            <active>true</active>
-        </employee>
-    </mx:XMLList>
+	<fx:Declarations>
+	    <fx:XMLList id="employees">
+	        <employee>
+	            <name>Christina Coenraets</name>
+	            <phone>555-219-2270</phone>
+	            <email>ccoenraets@fictitious.com</email>
+	            <active>true</active>
+	        </employee>
+	        <employee>
+	            <name>Joanne Wall</name>
+	            <phone>555-219-2012</phone>
+	            <email>jwall@fictitious.com</email>
+	            <active>true</active>
+	        </employee>
+	        <employee>
+	            <name>Maurice Smith</name>
+	            <phone>555-219-2012</phone>
+	            <email>maurice@fictitious.com</email>
+	            <active>false</active>
+	        </employee>
+	        <employee>
+	            <name>Mary Jones</name>
+	            <phone>555-219-2000</phone>
+	            <email>mjones@fictitious.com</email>
+	            <active>true</active>
+	        </employee>
+	    </fx:XMLList>
+	</fx:Declarations>
 
     <mx:Panel title="DataGrid Control Example" height="100%" width="100%" 
         paddingTop="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/SimpleHRule.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/SimpleHRule.mxml b/TourDeFlex/TourDeFlex3/src/controls/SimpleHRule.mxml
index da9c97d..c4a1a8a 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/SimpleHRule.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/SimpleHRule.mxml
@@ -17,9 +17,11 @@
   -->
 
 <!-- Simple example to demonstrate the HRule control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-	<mx:WipeLeft id="myWL"/>
+	<fx:Declarations>
+		<mx:WipeLeft id="myWL"/>
+	</fx:Declarations>	
 
     <mx:Panel title="HRule Control Example" id="myPanel" 
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/SimpleImage.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/SimpleImage.mxml b/TourDeFlex/TourDeFlex3/src/controls/SimpleImage.mxml
index e030386..7c25b36 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/SimpleImage.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/SimpleImage.mxml
@@ -17,7 +17,7 @@
   -->
 
 <!-- Simple example to demonstrate the Image control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
     <mx:Panel id="myPanel" title="Image Control Example" 
         height="75%" width="75%" horizontalAlign="center"

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/812a8b67/TourDeFlex/TourDeFlex3/src/controls/SimpleImageHSlider.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/SimpleImageHSlider.mxml b/TourDeFlex/TourDeFlex3/src/controls/SimpleImageHSlider.mxml
index 130195d..212dafb 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/SimpleImageHSlider.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/SimpleImageHSlider.mxml
@@ -17,9 +17,9 @@
   -->
 
 <!-- Simple example to demonstrate the HSlider control. -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml">
+<mx:Application xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:mx="library://ns.adobe.com/flex/mx">
 
-    <mx:Script>
+    <fx:Script>
         <![CDATA[
    
           private var imageWidth:Number=0;
@@ -32,7 +32,7 @@
 	         logo.height=uint(imageHeight*hSlider.value/100);
 	      }
         ]]>
-    </mx:Script>
+    </fx:Script>
 
     <mx:Panel id="panel" title="HSlider Control Example" height="100%" width="95%" 
         paddingTop="10" paddingBottom="10" paddingLeft="10" paddingRight="10">