You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/04/15 23:43:50 UTC

[45/55] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - refactor classes into more swcs and get AS build running (JS build will be fixed in later commit)

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/IInputParser.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/IInputParser.as b/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/IInputParser.as
new file mode 100644
index 0000000..1cbe76a
--- /dev/null
+++ b/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/IInputParser.as
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.collections.parsers
+{
+    /**
+     *  The IInputParser interface is the basic interface for parsing
+     *  data from a server or database into an array of items.
+     * 
+     *  This interface is generally used in a LazyCollection.
+     *  @see org.apache.flex.net.dataConverters.LazyCollection.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public interface IInputParser
+	{
+        /**
+         *  Take the input string (could be serialized data set,
+         *  XML, or JSON) and return an array of serialized data
+         *  items.
+         * 
+         *  @param s Serialized data set, XML or JSON.
+         *  @return An Array of serialized data items.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		function parseItems(s:String):Array;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/JSONInputParser.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/JSONInputParser.as b/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/JSONInputParser.as
new file mode 100644
index 0000000..c15c359
--- /dev/null
+++ b/frameworks/projects/Collections/as/src/org/apache/flex/collections/parsers/JSONInputParser.as
@@ -0,0 +1,54 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.collections.parsers
+{
+    /**
+     *  The JSONInputParser class parses a JSON structure
+     *  into an array of JSON sub-structures.  It assumes
+     *  the input JSON format is an array without sub-arrays.
+     *  A more complex parser might be needed for more complex
+     *  JSON structures.  
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class JSONInputParser implements IInputParser
+	{        
+        /**
+         *  @copy org.apache.flex.net.IInputParser#parseItems
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */        
+		public function parseItems(s:String):Array
+        {
+            var c:int = s.indexOf("[");
+            if (c != -1)
+            {
+                var c2:int = s.lastIndexOf("]");
+                s = s.substring(c + 1, c2);
+            }
+            return s.split("},");
+        }
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/as/src/org/apache/flex/data/ICollection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/as/src/org/apache/flex/data/ICollection.as b/frameworks/projects/Collections/as/src/org/apache/flex/data/ICollection.as
deleted file mode 100644
index 7bab12b..0000000
--- a/frameworks/projects/Collections/as/src/org/apache/flex/data/ICollection.as
+++ /dev/null
@@ -1,43 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.data
-{
-    /**
-     *  The ICollection interface is the basic interface for an iterable collection
-     *  of data items.  Other extension may offer the ability to modify the collection
-     *  and dispatch change events.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface ICollection
-	{
-        /**
-         *  Get the item at a particular index.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function getItemAt(index:int):Object
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/as/src/org/apache/flex/data/IStringCollection.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/as/src/org/apache/flex/data/IStringCollection.as b/frameworks/projects/Collections/as/src/org/apache/flex/data/IStringCollection.as
deleted file mode 100644
index af60b68..0000000
--- a/frameworks/projects/Collections/as/src/org/apache/flex/data/IStringCollection.as
+++ /dev/null
@@ -1,43 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.data
-{
-    /**
-     *  The IStringCollection interface is the basic interface for an iterable collection
-     *  of strings.  Other extension may offer the ability to modify the collection
-     *  and dispatch change events.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IStringCollection
-	{
-        /**
-         *  Get the string at a particular index.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function getItemAt(index:int):String
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/basic-manifest.xml b/frameworks/projects/Collections/basic-manifest.xml
new file mode 100644
index 0000000..2b2f0e5
--- /dev/null
+++ b/frameworks/projects/Collections/basic-manifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+
+<componentPackage>
+
+    <component id="LazyCollection" class="org.apache.flex.collections.LazyCollection"/>
+    <component id="JSONInputParser" class="org.apache.flex.collections.parsers.JSONInputParser"/>
+    <component id="JSONItemConverter" class="org.apache.flex.collections.converters.JSONItemConverter"/>
+
+</componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
new file mode 100644
index 0000000..394b4ed
--- /dev/null
+++ b/frameworks/projects/Collections/build.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+
+<project name="Collections" default="main" basedir=".">
+    <property name="FLEXJS_HOME" location="../../.."/>
+    
+    <property file="${FLEXJS_HOME}/env.properties"/>
+    <property environment="env"/>
+    <property file="${FLEXJS_HOME}/build.properties"/>
+    <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+    <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
+
+    <target name="main" depends="clean,compile,test" description="Clean build of Collections.swc">
+    </target>
+
+    <target name="test" unless="is.jenkins">
+        <!-- no tests yet
+         <ant dir="as/tests" />
+         -->
+    </target>
+    
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset dir="${FLEXJS_HOME}/frameworks/libs">
+                <include name="Collections.swc"/>
+            </fileset>
+        </delete>
+    </target>
+    
+    <path id="lib.path">
+      <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+    </path>
+
+    <target name="compile" description="Compiles .as files into .swc">
+        <echo message="Compiling libs/Collections.swc"/>
+        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
+        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
+
+        <!-- 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" classpathref="lib.path"/>
+        <!--
+            Link in the classes (and their dependencies) for the MXML tags
+            listed in this project's manifest.xml.
+            Also link the additional classes (and their dependencies)
+            listed in CollectionsClasses.as,
+            because these aren't referenced by the manifest classes.
+            Keep the standard metadata when compiling.
+            Include the appropriate CSS files and assets in the SWC.
+            Don't include any resources in the SWC.
+            Write a bundle list of referenced resource bundles
+            into the file bundles.properties in this directory.
+        -->
+        <compc fork="true"
+               output="${FLEXJS_HOME}/frameworks/libs/Collections.swc">
+            <jvmarg line="${compc.jvm.args}"/>
+            <load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
+        </compc>
+    </target>
+
+</project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Collections/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/compile-config.xml b/frameworks/projects/Collections/compile-config.xml
new file mode 100644
index 0000000..57a6cdf
--- /dev/null
+++ b/frameworks/projects/Collections/compile-config.xml
@@ -0,0 +1,76 @@
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<flex-config>
+
+    <compiler>
+        <accessible>false</accessible>
+        
+        <external-library-path>
+            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+            <path-element>../../libs/Core.swc</path-element>
+        </external-library-path>
+        
+		<mxml>
+			<children-as-data>true</children-as-data>
+		</mxml>
+		<binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+		<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
+		<binding-value-change-event-type>valueChange</binding-value-change-event-type>
+
+        <keep-as3-metadata>
+          <name>Bindable</name>
+          <name>Managed</name>
+          <name>ChangeEvent</name>
+          <name>NonCommittingChangeEvent</name>
+          <name>Transient</name>
+        </keep-as3-metadata>
+	  
+        <locale/>
+        
+        <library-path/>
+
+        <namespaces>
+            <namespace>
+                <uri>library://ns.apache.org/flexjs/basic</uri>
+                <manifest>basic-manifest.xml</manifest>
+            </namespace>
+        </namespaces>
+        
+        <source-path>
+            <path-element>as/src</path-element>
+        </source-path>
+        
+        <warn-no-constructor>false</warn-no-constructor>
+    </compiler>
+    
+    <include-file>
+    </include-file>
+
+    <include-classes>
+        <class>CollectionsClasses</class>
+    </include-classes>
+    
+    <include-namespaces>
+        <uri>library://ns.apache.org/flexjs/basic</uri>
+    </include-namespaces>  
+        
+    <target-player>${playerglobal.version}</target-player>
+	
+
+</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/basic-manifest.xml b/frameworks/projects/Core/as/basic-manifest.xml
deleted file mode 100644
index e96f6c4..0000000
--- a/frameworks/projects/Core/as/basic-manifest.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-
-
-<componentPackage>
-
-    <component id="Application" class="org.apache.flex.core.Application"/>
-    <component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
-    <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
-    <component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
-    <component id="ConstantBinding" class="org.apache.flex.binding.ConstantBinding"/>
-    <component id="SimpleBinding" class="org.apache.flex.binding.SimpleBinding"/>
-    <component id="Button" class="org.apache.flex.html.Button"/>
-    <component id="CloseButton" class="org.apache.flex.html.CloseButton"/>
-    <component id="ButtonBar" class="org.apache.flex.html.ButtonBar"/>
-    <component id="DropDownList" class="org.apache.flex.html.DropDownList"/>
-    <component id="DropDownListList" class="org.apache.flex.html.supportClasses.DropDownListList"/>
-    <component id="Image" class="org.apache.flex.html.Image"/>
-    <component id="Label" class="org.apache.flex.html.Label"/>
-    <component id="MultilineLabel" class="org.apache.flex.html.MultilineLabel"/>
-    <component id="ImageAndTextButton" class="org.apache.flex.html.ImageAndTextButton"/>
-    <component id="TextButton" class="org.apache.flex.html.TextButton"/>
-    <component id="ToggleTextButton" class="org.apache.flex.html.ToggleTextButton"/>
-    <component id="TextInput" class="org.apache.flex.html.TextInput"/>
-    <component id="TextArea" class="org.apache.flex.html.TextArea"/>
-    <component id="List" class="org.apache.flex.html.List"/>
-    <component id="SimpleList" class="org.apache.flex.html.SimpleList"/>
-    <component id="CheckBox" class="org.apache.flex.html.CheckBox"/>
-    <component id="RadioButton" class="org.apache.flex.html.RadioButton"/>
-    <component id="ComboBox" class="org.apache.flex.html.ComboBox"/>
-    <component id="HTTPService" class="org.apache.flex.net.HTTPService"/>
-    <component id="LazyCollection" class="org.apache.flex.net.dataConverters.LazyCollection"/>
-    <component id="JSONInputParser" class="org.apache.flex.net.JSONInputParser"/>
-    <component id="JSONItemConverter" class="org.apache.flex.net.JSONItemConverter"/>
-    <component id="ViewSourceContextMenuOption" class="org.apache.flex.utils.ViewSourceContextMenuOption"/>
-    <component id="BinaryUploader" class="org.apache.flex.net.BinaryUploader"/>
-    <component id="Container" class="org.apache.flex.html.Container"/>
-    <component id="ScrollingContainerView" class="org.apache.flex.html.beads.ScrollingContainerView"/>
-    <component id="HContainer" class="org.apache.flex.html.HContainer"/>
-    <component id="VContainer" class="org.apache.flex.html.VContainer"/>
-    <component id="Panel" class="org.apache.flex.html.Panel"/>
-    <component id="PanelView" class="org.apache.flex.html.beads.PanelView"/>
-    <component id="PanelWithControlBar" class="org.apache.flex.html.PanelWithControlBar"/>
-    <component id="ControlBar" class="org.apache.flex.html.ControlBar"/>
-    <component id="TitleBar" class="org.apache.flex.html.TitleBar"/>
-    <component id="TitleBarModel" class="org.apache.flex.html.beads.models.TitleBarModel"/>
-    <component id="ToolTip" class="org.apache.flex.html.ToolTip"/>
-    <component id="NonVirtualBasicLayout" class="org.apache.flex.html.beads.layouts.NonVirtualBasicLayout"/>
-    <component id="NonVirtualBasicScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualBasicScrollingLayout"/>
-    <component id="NonVirtualVerticalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout"/>
-    <component id="NonVirtualHorizontalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout"/>
-    <component id="NonVirtualVerticalScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout"/>
-    <component id="NonVirtualHorizontalScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout"/>
-    <component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
-    <component id="ListView" class="org.apache.flex.html.beads.ListView"/>
-    <component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState"/>
-    <component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView"/>
-    
-    <component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
-    <component id="Alert" class="org.apache.flex.html.Alert"/>
-    <component id="Spinner" class="org.apache.flex.html.Spinner"/>
-    <component id="Slider" class="org.apache.flex.html.Slider"/>
-    <component id="SolidBackgroundBead" class="org.apache.flex.html.beads.SolidBackgroundBead"/>
-    <component id="ViewBaseDataBinding" class="org.apache.flex.core.ViewBaseDataBinding"/>
-    <component id="NumericStepper" class="org.apache.flex.html.NumericStepper" />
-    <component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/>
-    <component id="StringItemRenderer" class="org.apache.flex.html.supportClasses.StringItemRenderer"/>
-    <component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer"/>
-    <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer"/>
-    <component id="ScrollBar" class="org.apache.flex.html.supportClasses.ScrollBar"/>
-    <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead" />
-    <component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead" />
-    <component id="TextPromptBead" class="org.apache.flex.html.accessories.TextPromptBead" />
-    <component id="MixinManager" class="org.apache.flex.utils.MixinManager" />
-    <component id="HRule" class="org.apache.flex.html.HRule" />
-    <component id="Spacer" class="org.apache.flex.html.Spacer" />
-    <component id="MXMLDragInitiator" class="org.apache.flex.core.MXMLDragInitiator" />
-    <component id="CallLaterBead" class="org.apache.flex.core.CallLaterBead" />
-    <component id="ImageAndTextButtonView" class="org.apache.flex.html.beads.ImageAndTextButtonView" />
-
-    <component id="Map" class="org.apache.flex.maps.google.Map" />
-
-	<component id="Circle" class="org.apache.flex.core.graphics.Circle" />
-	<component id="Ellipse" class="org.apache.flex.core.graphics.Ellipse" />
-	<component id="Path" class="org.apache.flex.core.graphics.Path" />
-	<component id="Rect" class="org.apache.flex.core.graphics.Rect" />
-	<component id="GraphicsContainer" class="org.apache.flex.core.graphics.GraphicsContainer" />
-    <component id="GradientEntry" class="org.apache.flex.core.graphics.GradientEntry" />
-    <component id="LinearGradient" class="org.apache.flex.core.graphics.LinearGradient" />
-    <component id="SolidColor" class="org.apache.flex.core.graphics.SolidColor" />
-    <component id="SolidColorStroke" class="org.apache.flex.core.graphics.SolidColorStroke" />
-
-</componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/build.xml b/frameworks/projects/Core/as/build.xml
deleted file mode 100644
index 6a911c9..0000000
--- a/frameworks/projects/Core/as/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-
-
-<project name="flexjsui" default="main" basedir=".">
-    <property name="FLEXJS_HOME" location="../../../.."/>
-    
-    <property file="${FLEXJS_HOME}/env.properties"/>
-    <property environment="env"/>
-    <property file="${FLEXJS_HOME}/build.properties"/>
-    <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
-    <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-
-    <target name="main" depends="clean,compile,test" description="Clean build of FlexJSUI.swc">
-    </target>
-
-    <target name="test" unless="is.jenkins">
-        <ant dir="tests" />
-    </target>
-    
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset dir="${FLEXJS_HOME}/frameworks/as/libs">
-                <include name="FlexJSUI.swc"/>
-            </fileset>
-        </delete>
-    </target>
-    
-    <path id="lib.path">
-      <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
-    </path>
-
-    <target name="compile" description="Compiles FlexJSUI.swc">
-        <echo message="Compiling libs/FlexJSUI.swc"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
-        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-
-        <!-- 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" classpathref="lib.path"/>
-        <!--
-            Link in the classes (and their dependencies) for the MXML tags
-            listed in this project's manifest.xml.
-            Also link the additional classes (and their dependencies)
-            listed in FlexJSUIClasses.as,
-            because these aren't referenced by the manifest classes.
-            Keep the standard metadata when compiling.
-            Include the appropriate CSS files and assets in the SWC.
-            Don't include any resources in the SWC.
-            Write a bundle list of referenced resource bundles
-            into the file bundles.properties in this directory.
-        -->
-        <compc fork="true"
-               output="${FLEXJS_HOME}/frameworks/as/libs/FlexJSUI.swc">
-            <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="compile-config.xml" />
-            <arg value="+playerglobal.version=${playerglobal.version}" />
-            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
-        </compc>
-    </target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/compile-config.xml b/frameworks/projects/Core/as/compile-config.xml
deleted file mode 100644
index 7da5476..0000000
--- a/frameworks/projects/Core/as/compile-config.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<flex-config>
-
-    <compiler>
-        <accessible>false</accessible>
-        
-        <external-library-path>
-            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
-        </external-library-path>
-        
-		<mxml>
-			<children-as-data>true</children-as-data>
-		</mxml>
-		<binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
-		<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
-		<binding-value-change-event-type>valueChange</binding-value-change-event-type>
-
-        <keep-as3-metadata>
-          <name>Bindable</name>
-          <name>Managed</name>
-          <name>ChangeEvent</name>
-          <name>NonCommittingChangeEvent</name>
-          <name>Transient</name>
-        </keep-as3-metadata>
-	  
-        <locale/>
-        
-        <library-path/>
-
-        <namespaces>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>basic-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.adobe.com/flex/mx</uri>
-                <manifest>mx-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/html5</uri>
-                <manifest>html5-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/jquery</uri>
-                <manifest>jquery-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/createjs</uri>
-                <manifest>createjs-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/cordova</uri>
-                <manifest>cordova-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/svg</uri>
-                <manifest>svg-manifest.xml</manifest>
-            </namespace>			
-        </namespaces>
-        
-        <source-path>
-            <path-element>src</path-element>
-        </source-path>
-        
-        <warn-no-constructor>false</warn-no-constructor>
-    </compiler>
-    
-    <include-file>
-        <name>defaults.css</name>
-        <path>defaults.css</path>
-    </include-file>
-
-    <include-classes>
-        <class>FlexJSUIClasses</class>
-    </include-classes>
-    
-    <include-namespaces>
-        <uri>library://ns.apache.org/flexjs/basic</uri>
-        <uri>library://ns.adobe.com/flex/mx</uri>
-        <uri>library://ns.apache.org/flexjs/html5</uri>
-        <uri>library://ns.apache.org/flexjs/jquery</uri>
-        <uri>library://ns.apache.org/flexjs/cordova</uri>
-        <uri>library://ns.apache.org/flexjs/createjs</uri>
-		<uri>library://ns.apache.org/flexjs/svg</uri>
-    </include-namespaces>  
-        
-    <target-player>${playerglobal.version}</target-player>
-	
-
-</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/defaults.css b/frameworks/projects/Core/as/defaults.css
deleted file mode 100644
index e59fb94..0000000
--- a/frameworks/projects/Core/as/defaults.css
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-@namespace "library://ns.apache.org/flexjs/basic";
-@namespace h5 "library://ns.apache.org/flexjs/html5";
-@namespace jq "library://ns.apache.org/flexjs/jquery";
-@namespace createjs "library://ns.apache.org/flexjs/createjs";
-@namespace svg "library://ns.apache.org/flexjs/svg";
-
-/* Global style declaration */
-*
-{
-    font-family: "Arial";
-    font-size: 12px;
-}
-
-*:active
-{
-    font-family: "Arial";
-    font-size: 12px;
-}
-
-*:hover
-{
-    font-family: "Arial";
-    font-size: 12px;
-}
-
-.flexjs *, . flexjs *:before, . flexjs *:after {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-Button
-{
-	background-color: #d8d8d8;
-	border: 1px solid #000000;
-	padding: 4px;
-}
-
-Button:hover
-{
-	background-color: #9fa0a1;
-	border: 1px solid #000000;
-	padding: 4px;
-}
-
-Button:active
-{
-	background-color: #929496;
-	border: 1px solid #000000;
-	padding: 4px;
-}
-
-ButtonBar
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.ButtonBarView");			
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
-    IDataGroup: ClassReference("org.apache.flex.html.supportClasses.NonVirtualDataGroup");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer");
-
-    border-style: none;
-}
-
-ButtonBarButtonItemRenderer
-{
-    width: 80;
-    height: 30;
-}
-
-Container
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
-}
-
-ControlBar
-{
-    background-color: #CECECE;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-}
-
-HContainer
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
-}
-
-ImageButton
-{
-    border-style: none;
-}
-
-VContainer
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout");
-}
-
-List
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");			
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
-    IDataGroup: ClassReference("org.apache.flex.html.supportClasses.NonVirtualDataGroup");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
-}
-
-Map
-{
-    IBeadView: ClassReference("org.apache.flex.maps.google.beads.MapView");
-}
-
-Panel
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.PanelView");
-    
-    background-color: #FFFFFF;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-}
-
-PanelWithControlBar
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.PanelWithControlBarView");
-    
-    background-color: #FFFFFF;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-}
-
-SimpleList
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.ListView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
-    IDataGroup: ClassReference("org.apache.flex.html.supportClasses.NonVirtualDataGroup");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
-}
-
-StringItemRenderer
-{
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
-    height: 16;
-}
-
-TitleBar
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TitleBarModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TitleBarView");
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TitleBarMeasurementBead");
-    background-color: #FFFFFF;
-}
-
-ToolTip
-{
-    background-color: #FFFFCC;
-}
-
-/* Global Style Declaration */
-global
-{
-    IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl");
-    IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer");
-    effectTimerInterval: 10;
-}
-
-@media -flex-flash
-{
-
-Alert
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.AlertView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    
-    background-color: #FFFFFF;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-}
-
-Button
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
-}
-
-CheckBox
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
-}
-
-CloseButton
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
-}
-
-ComboBox
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
-    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
-}
-
-Container
-{
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-}
-
-ControlBar
-{
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");    
-}
-
-DropDownList
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
-    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
-}
-
-DropDownListList
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
-}
-
-Image
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.ImageView");
-}
-
-ImageButton
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
-}
-
-ImageAndTextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageAndTextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.ImageAndTextButtonView");
-}
-
-Label
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
-	iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
-}
-
-List
-{
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
-}
-
-MultilineLabel
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
-}
-
-NumericStepper
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
-    
-    padding: 0px;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-    background-color: #FFFFFF;
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
-}
-
-Panel
-{
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");    
-}
-
-PanelWithControlBar
-{
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-}
-
-RadioButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
-}
-
-ScrollBar
-{
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.ScrollBarView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
-}
-
-SimpleAlert
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    
-    background-color: #FFFFFF;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-}
-
-Slider
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
-    iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
-    iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
-    iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
-    iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
-}
-
-Spinner
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.SpinnerView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
-}
-
-TextArea
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
-    width: 135;
-    height: 20;
-}
-
-TextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
-}
-
-TextFieldItemRenderer
-{
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
-    height: 16;
-}
-
-TextInput
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
-	width: 135;
-	height: 20;
-}
-
-TitleBar
-{
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    background-color: #FFFFFF;
-}
-
-ToggleTextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
-}
-
-/* HTML5 */
-
-h5|TextButton
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
-}
-
-h5|TextInput
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
-}
-
-h5|CheckBox
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
-}
-
-h5|RadioButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
-}
-
-h5|List
-{
-	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-}
-
-h5|DropDownList
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
-}
-
-h5|ComboBox
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
-    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
-}
-
-/* jQuery */
-
-jq|TextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextButtonView");
-}
-
-
-jq|CheckBox
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
-}
-
-jq|RadioButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
-}
-
-/* createjs */
-
-createjs|TextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextButtonView");
-}
-
-createjs|CheckBox
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
-}
-
-/* SVG */
-
-svg|TextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
-}
-
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/mx-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/mx-manifest.xml b/frameworks/projects/Core/as/mx-manifest.xml
deleted file mode 100644
index 6654ace..0000000
--- a/frameworks/projects/Core/as/mx-manifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-
-
-<componentPackage>
-
-    <component id="State" class="mx.states.State"/>
-
-</componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/src/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/CoreClasses.as b/frameworks/projects/Core/as/src/CoreClasses.as
index 2886df2..b0b7fe8 100644
--- a/frameworks/projects/Core/as/src/CoreClasses.as
+++ b/frameworks/projects/Core/as/src/CoreClasses.as
@@ -25,127 +25,67 @@ package
  *  beyond those that are found by dependecy analysis starting
  *  from the classes specified in manifest.xml.
  */
-internal class FlexJSUIClasses
+internal class CoreClasses
 {	
-	import org.apache.cordova.camera.Camera; Camera;
-	import org.apache.cordova.Application; Application;
-	import org.apache.cordova.Weinre; Weinre;
-	
-	import org.apache.flex.charts.core.CartesianChart; CartesianChart;
-	import org.apache.flex.charts.core.ChartBase; ChartBase;
-	import org.apache.flex.charts.core.IAxisBead; IAxisBead;
-	import org.apache.flex.charts.core.IAxisGroup; IAxisGroup;
-	import org.apache.flex.charts.core.IChart; IChart;
-	import org.apache.flex.charts.core.ICartesianChartLayout; ICartesianChartLayout;
-	import org.apache.flex.charts.core.IChartDataGroup; IChartDataGroup;
-	import org.apache.flex.charts.core.IChartSeries; IChartSeries;
-	import org.apache.flex.charts.core.IHorizontalAxisBead; IHorizontalAxisBead;
-	import org.apache.flex.charts.core.IVerticalAxisBead; IVerticalAxisBead;
-	import org.apache.flex.charts.core.IChartItemRenderer; IChartItemRenderer;
-	import org.apache.flex.charts.core.IConnectedItemRenderer; IConnectedItemRenderer;
-	import org.apache.flex.charts.core.PolarChart; PolarChart;
-	import org.apache.flex.charts.supportClasses.ChartAxisGroup; ChartAxisGroup;
-	import org.apache.flex.charts.supportClasses.ChartDataGroup; ChartDataGroup;
-	import org.apache.flex.maps.google.Map; Map;
-	
-    import org.apache.flex.html.ToolTip; ToolTip;
-	import org.apache.flex.html.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead;
-	import org.apache.flex.html.accessories.PasswordInputBead; PasswordInputBead;
-	import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead;
-    import org.apache.flex.html.beads.AlertView; AlertView;
-	import org.apache.flex.html.beads.BackgroundImageBead; BackgroundImageBead;
-	import org.apache.flex.html.beads.ButtonBarView; ButtonBarView;
-	import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
-    import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
-    import org.apache.flex.html.beads.ContainerView; ContainerView;
-    import org.apache.flex.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
-    import org.apache.flex.html.beads.CSSButtonView; CSSButtonView;
-	import org.apache.flex.html.beads.CSSTextButtonView; CSSTextButtonView;
-    import org.apache.flex.html.beads.CSSTextToggleButtonView; CSSTextToggleButtonView;
-	import org.apache.flex.html.beads.DropDownListView; DropDownListView;
-	import org.apache.flex.html.beads.CloseButtonView; CloseButtonView;
-    import org.apache.flex.html.beads.ImageButtonView; ImageButtonView;
-    import org.apache.flex.html.beads.ImageAndTextButtonView; ImageAndTextButtonView;
-	import org.apache.flex.html.beads.ImageView; ImageView;
-    import org.apache.flex.html.beads.ListView; ListView;
-    import org.apache.flex.html.beads.NumericStepperView; NumericStepperView;
-    import org.apache.flex.html.beads.PanelView; PanelView;
-    import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView;
-	import org.apache.flex.html.beads.RadioButtonView; RadioButtonView;
-    import org.apache.flex.html.beads.ScrollBarView; ScrollBarView;
-	import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView;
-    import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead;
-	import org.apache.flex.html.beads.SliderView; SliderView;
-	import org.apache.flex.html.beads.SliderThumbView; SliderThumbView;
-	import org.apache.flex.html.beads.SliderTrackView; SliderTrackView;
-	import org.apache.flex.html.beads.SolidBackgroundBead; SolidBackgroundBead;
-    import org.apache.flex.html.beads.SpinnerView; SpinnerView;
-    import org.apache.flex.html.beads.TextButtonMeasurementBead; TextButtonMeasurementBead;
-	import org.apache.flex.html.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead;
-    import org.apache.flex.html.beads.TextAreaView; TextAreaView;
-    import org.apache.flex.html.beads.TextButtonView; TextButtonView;
-    import org.apache.flex.html.beads.TextFieldView; TextFieldView;
-    import org.apache.flex.html.beads.TextInputView; TextInputView;
-    import org.apache.flex.html.beads.TextInputWithBorderView; TextInputWithBorderView;
-    import org.apache.flex.html.beads.models.AlertModel; AlertModel;
-    import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel;
-    import org.apache.flex.html.beads.models.ComboBoxModel; ComboBoxModel;
-	import org.apache.flex.html.beads.models.ImageModel; ImageModel;
-    import org.apache.flex.html.beads.models.ImageAndTextModel; ImageAndTextModel;
-	import org.apache.flex.html.beads.models.PanelModel; PanelModel;
-    import org.apache.flex.html.beads.models.SingleLineBorderModel; SingleLineBorderModel;
-	import org.apache.flex.html.beads.models.TextModel; TextModel;
-    import org.apache.flex.html.beads.models.TitleBarModel; TitleBarModel;
-	import org.apache.flex.html.beads.models.ToggleButtonModel; ToggleButtonModel;
-	import org.apache.flex.html.beads.models.ValueToggleButtonModel; ValueToggleButtonModel;
-    import org.apache.flex.html.beads.controllers.AlertController; AlertController;
-	import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController;
-    import org.apache.flex.html.beads.controllers.DropDownListController; DropDownListController;
-	import org.apache.flex.html.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController;
-    import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController;
-    import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController;
-	import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController;
-	import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController;
-    import org.apache.flex.html.beads.controllers.VScrollBarMouseController; VScrollBarMouseController;
-	import org.apache.flex.html.beads.layouts.ButtonBarLayout; ButtonBarLayout;
-    import org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout; NonVirtualVerticalScrollingLayout;  
-	import org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout; NonVirtualHorizontalScrollingLayout;
-    import org.apache.flex.html.beads.layouts.NonVirtualBasicLayout; NonVirtualBasicLayout;
-    import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout;
-	import org.apache.flex.html.beads.layouts.TileLayout; TileLayout;
-    import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
-	import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
-	import org.apache.flex.html.supportClasses.NonVirtualDataGroup; NonVirtualDataGroup;
+    import org.apache.flex.core.BeadViewBase; BeadViewBase;
+    import org.apache.flex.core.CSSTextField; CSSTextField;
     import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory;  
 	import org.apache.flex.core.FilledRectangle; FilledRectangle;
-	import org.apache.flex.core.FormatBase; FormatBase;
+    import org.apache.flex.core.IAlertModel; IAlertModel;
+    import org.apache.flex.core.IBead; IBead;
+    import org.apache.flex.core.IBeadController; IBeadController;
+    import org.apache.flex.core.IBeadLayout; IBeadLayout;
+    import org.apache.flex.core.IBeadModel; IBeadModel;
+    import org.apache.flex.core.IBeadView; IBeadView;
+    import org.apache.flex.core.IBorderModel; IBorderModel;
+    import org.apache.flex.core.IChild; IChild;
+    import org.apache.flex.core.IChrome; IChrome;
+    import org.apache.flex.core.IComboBoxModel; IComboBoxModel;
+    import org.apache.flex.core.IContainer; IContainer;
+    import org.apache.flex.core.IContentView; IContentView;
+    import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper;
+    import org.apache.flex.core.IDocument; IDocument;
+    import org.apache.flex.core.IFormatBead; IFormatBead;
+    import org.apache.flex.core.IImageModel; IImageModel;
+    import org.apache.flex.core.ILayoutChild; ILayoutChild;
+    import org.apache.flex.core.ILayoutParent; ILayoutParent;
+    import org.apache.flex.core.IPanelModel; IPanelModel;
+    import org.apache.flex.core.IParent; IParent;
+    import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
+    import org.apache.flex.core.IPopUp; IPopUp;
+    import org.apache.flex.core.IRollOverModel; IRollOverModel;
+    import org.apache.flex.core.IScrollBarModel; IScrollBarModel;
+    import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
+    import org.apache.flex.core.ISelectionModel; ISelectionModel;
+    import org.apache.flex.core.IStrand; IStrand;
+    import org.apache.flex.core.IStrandWithModel; IStrandWithModel;
+    import org.apache.flex.core.ITextModel; ITextModel;
+    import org.apache.flex.core.ITitleBarModel; ITitleBarModel;
+    import org.apache.flex.core.IToggleButtonModel; IToggleButtonModel;
+    import org.apache.flex.core.IUIBase; IUIBase;
+    import org.apache.flex.core.IValueToggleButtonModel; IValueToggleButtonModel;
+    import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
+    import org.apache.flex.core.DataBindingBase; DataBindingBase;
+    import org.apache.flex.core.UIBase; UIBase;
+    import org.apache.flex.core.UIButtonBase; UIButtonBase;
 	import org.apache.flex.events.CustomEvent; CustomEvent;
 	import org.apache.flex.events.Event; Event;
+    import org.apache.flex.events.EventDispatcher; EventDispatcher;
+    import org.apache.flex.events.IEventDispatcher; IEventDispatcher;
 	import org.apache.flex.events.MouseEvent; MouseEvent;
 	import org.apache.flex.events.ValueEvent; ValueEvent;
+    import org.apache.flex.events.utils.MouseUtils; MouseUtils;
+    import org.apache.flex.geom.Point; Point;
+    import org.apache.flex.geom.Rectangle; Rectangle;
+    import org.apache.flex.utils.BinaryData; BinaryData;
+    import org.apache.flex.utils.BeadMetrics; BeadMetrics;
+    import org.apache.flex.utils.dbg.DOMPathUtil; DOMPathUtil;
 	import org.apache.flex.utils.EffectTimer; EffectTimer;
+    import org.apache.flex.utils.MixinManager; MixinManager;
+    import org.apache.flex.utils.PNGEncoder; PNGEncoder;
+    import org.apache.flex.utils.SolidBorderUtil; SolidBorderUtil;
 	import org.apache.flex.utils.Timer; Timer;
 	import org.apache.flex.utils.UIUtils; UIUtils;
-	import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer;
-    import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
-	import org.apache.flex.core.graphics.GraphicShape; GraphicShape;
-	import org.apache.flex.core.graphics.Rect; Rect;
-	import org.apache.flex.core.graphics.Ellipse; Ellipse;
-	import org.apache.flex.core.graphics.Circle; Circle;
-	import org.apache.flex.core.graphics.Path; Path;
-	import org.apache.flex.core.graphics.SolidColor; SolidColor;
-	import org.apache.flex.core.graphics.SolidColorStroke; SolidColorStroke;
-	import org.apache.flex.core.graphics.Text; Text;
-	import org.apache.flex.core.graphics.GraphicsContainer; GraphicsContainer;
-	import org.apache.flex.core.graphics.LinearGradient; LinearGradient;
-    import org.apache.flex.core.DataBindingBase; DataBindingBase;
-    import org.apache.flex.binding.ChainBinding; ChainBinding;
-    import org.apache.flex.effects.PlatformWiper; PlatformWiper;    
-    import org.apache.flex.events.DragEvent; DragEvent;   
-	import org.apache.flex.events.utils.MouseUtils; MouseUtils;
-    import org.apache.flex.geom.Rectangle; Rectangle;    
-	
-	import org.apache.flex.mobile.ManagerBase; ManagerBase;
     
 	import mx.core.ClassFactory; ClassFactory;
     import mx.states.AddItems; AddItems;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/src/org/apache/flex/core/FormatBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/FormatBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/FormatBase.as
deleted file mode 100644
index 1056978..0000000
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/FormatBase.as
+++ /dev/null
@@ -1,115 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.core
-{
-	import flash.events.Event;
-	
-	import org.apache.flex.events.Event;
-	import org.apache.flex.events.EventDispatcher;
-	import org.apache.flex.events.IEventDispatcher;
-	
-	public class FormatBase extends EventDispatcher implements IFormatBead
-	{
-		public function FormatBase()
-		{
-		}
-		
-		/**
-		 *  Retrieves the current value of the property from the strand.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get propertyValue():Object
-		{
-			var model:IBeadModel = _strand.getBeadByType(IBeadModel) as IBeadModel;
-			var value:Object = model[propertyName];
-			return value;
-		}
-		
-		private var _propertyName:String;
-		
-		/**
-		 *  The name of the property in the model holding the value to be
-		 *  formatted. The default is text.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get propertyName():String
-		{
-			if (_propertyName == null) {
-				_propertyName = "text";
-			}
-			return _propertyName;
-		}
-		public function set propertyName(value:String):void
-		{
-			_propertyName = value;
-		}
-		
-		private var _eventName:String;
-		
-		/**
-		 *  The name of the event dispatched when the property changes. The
-		 *  default is propertyName + "Changed".
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get eventName():String
-		{
-			if (_eventName == null) {
-				return _propertyName+"Changed";
-			}
-			return _eventName;
-		}
-		public function set eventName(value:String):void
-		{
-			_eventName = value;
-		}
-		
-		/**
-		 *  The resulting formatted value as a string.
-		 *  
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion FlexJS 0.0
-		 */
-		public function get formattedString():String
-		{
-			// override to produce actual result
-			return null;
-		}
-		
-		private var _strand:IStrand;
-		
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/src/org/apache/flex/core/IScrollingLayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IScrollingLayoutParent.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IScrollingLayoutParent.as
deleted file mode 100644
index ed89265..0000000
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IScrollingLayoutParent.as
+++ /dev/null
@@ -1,71 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.core
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	
-	import org.apache.flex.html.supportClasses.Border;
-	import org.apache.flex.html.supportClasses.ScrollBar;
-
-    /**
-     *  The IScrollingLayoutParent interface is an ILayoutParent
-     *  that has traditional scrollbars.  The layout implementation
-     *  often needs to know certain things about other objects in
-     *  the component.
-     * 
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public interface IScrollingLayoutParent extends ILayoutParent
-	{
-        /**
-         *  The border.
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get border():Border;
-		
-        /**
-         *  The vertical ScrollBar.
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get vScrollBar():ScrollBar;
-        
-        /**
-         *  The horizontal ScrollBar.
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		function get hScrollBar():ScrollBar;
-		
-	}
-}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c84daedb/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBaseDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBaseDataBinding.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBaseDataBinding.as
deleted file mode 100644
index 6050e46..0000000
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBaseDataBinding.as
+++ /dev/null
@@ -1,296 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.core
-{
-    import org.apache.flex.binding.ConstantBinding;
-    import org.apache.flex.binding.GenericBinding;
-    import org.apache.flex.binding.PropertyWatcher;
-    import org.apache.flex.binding.SimpleBinding;
-    import org.apache.flex.binding.WatcherBase;
-    import org.apache.flex.core.IBead;
-    import org.apache.flex.core.IStrand;
-    import org.apache.flex.events.Event;
-    import org.apache.flex.events.IEventDispatcher;
-    
-    /**
-     *  The ViewBaseDataBinding class implements databinding for
-     *  ViewBase instances.  Different classes can have
-     *  different databinding implementation that optimize for
-     *  the different lifecycles.  For example, an item renderer
-     *  databinding implementation can wait to execute databindings
-     *  until the data property is set.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class ViewBaseDataBinding implements IBead
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function ViewBaseDataBinding()
-		{
-			super();
-		}
-        
-        private var _strand:IStrand;
-        
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
-            IEventDispatcher(_strand).addEventListener("initBindings", initCompleteHandler);
-        }    
-
-        private function initCompleteHandler(event:Event):void
-        {
-            var fieldWatcher:Object;
-            var sb:SimpleBinding;
-            if (!("_bindings" in _strand))
-                return;
-            var bindingData:Array = _strand["_bindings"];
-            var n:int = bindingData[0];
-            var bindings:Array = [];
-            var i:int;
-            var index:int = 1;
-            for (i = 0; i < n; i++)
-            {
-                var binding:Object = {};
-                binding.source = bindingData[index++];
-				binding.destFunc = bindingData[index++];
-                binding.destination = bindingData[index++];
-                bindings.push(binding);
-            }
-            var watchers:Object = decodeWatcher(bindingData.slice(index));
-            for (i = 0; i < n; i++)
-            {
-                    binding = bindings[i];
-                if (binding.source is Array)
-                {
-                    if (binding.source[0] == "applicationModel")
-                    {
-                        if (binding.source.length == 2 && binding.destination.length == 2)
-                        {
-                            var destination:IStrand;
-                            // can be simplebinding or constantbinding
-                            var modelWatcher:Object = watchers.watcherMap["applicationModel"];
-                            fieldWatcher = modelWatcher.children.watcherMap[binding.source[1]];
-                            if (fieldWatcher.eventNames is String)
-                            {
-                                sb = new SimpleBinding();
-                                sb.destinationPropertyName = binding.destination[1];
-                                sb.eventName = fieldWatcher.eventNames as String;
-                                sb.sourceID = binding.source[0];
-                                sb.sourcePropertyName = binding.source[1];
-                                sb.setDocument(_strand);
-                                destination = _strand[binding.destination[0]] as IStrand;
-                                if (destination)
-                                    destination.addBead(sb);
-                                else
-                                {
-                                    deferredBindings[binding.destination[0]] = sb;
-                                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                                }
-                            }
-                            else if (fieldWatcher.eventNames == null)
-                            {
-                                var cb:ConstantBinding = new ConstantBinding();
-                                cb.destinationPropertyName = binding.destination[1];
-                                cb.sourceID = binding.source[0];
-                                cb.sourcePropertyName = binding.source[1];
-                                cb.setDocument(_strand);
-                                destination = _strand[binding.destination[0]] as IStrand;
-                                if (destination)
-                                    destination.addBead(cb);
-                                else
-                                {
-                                    deferredBindings[binding.destination[0]] = cb;
-                                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (binding.source is String)
-                {
-                    fieldWatcher = watchers.watcherMap[binding.source];
-                    if (fieldWatcher.eventNames is String)
-                    {
-                        sb = new SimpleBinding();
-                        sb.destinationPropertyName = binding.destination[1];
-                        sb.eventName = fieldWatcher.eventNames as String;
-                        sb.sourcePropertyName = binding.source;
-                        sb.setDocument(_strand);
-                        destination = _strand[binding.destination[0]] as IStrand;
-                        if (destination)
-                            destination.addBead(sb);
-                        else
-                        {
-                            deferredBindings[binding.destination[0]] = sb;
-                            IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                        }
-                    }
-                }
-                else
-                {
-                    makeGenericBinding(binding, i, watchers);
-                }
-            }
-        }
-
-        private function makeGenericBinding(binding:Object, index:int, watchers:Object):void
-        {
-            var gb:GenericBinding = new GenericBinding();
-            gb.setDocument(_strand);
-            gb.destinationData = binding.destination;
-			gb.destinationFunction = binding.destFunc;
-            gb.source = binding.source;
-            setupWatchers(gb, index, watchers.watchers, null);
-        }
-        
-        private function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
-        {
-            var n:int = watchers.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var watcher:Object = watchers[i];
-                if (watcher.bindings.indexOf(index) != -1)
-                {
-                    var type:String = watcher.type;
-                    switch (type)
-                    {
-                        case "property":
-                        {
-                            var pw:PropertyWatcher = new PropertyWatcher(this, 
-                                        watcher.propertyName, 
-                                        watcher.eventNames,
-                                        watcher.getterFunction);
-                            watcher.watcher = pw;
-                            if (parentWatcher)
-                                pw.parentChanged(parentWatcher.value);
-                            else
-                                pw.parentChanged(_strand);
-                            if (parentWatcher)
-                                parentWatcher.addChild(pw);
-                            if (watcher.children == null)
-                                pw.addBinding(gb);
-                            break;
-                        }
-                    }
-                    if (watcher.children)
-                    {
-                        setupWatchers(gb, index, watcher.children, watcher.watcher);
-                    }
-                }
-            }
-        }
-        
-        private function decodeWatcher(bindingData:Array):Object
-        {
-            var watcherMap:Object = {};
-            var watchers:Array = [];
-            var n:int = bindingData.length;
-            var index:int = 0;
-            var watcherData:Object;
-            while (index < n)
-            {
-                var watcherIndex:int = bindingData[index++];
-                var type:int = bindingData[index++];
-                switch (type)
-                {
-                    case 0:
-                    {
-                        watcherData = { type: "function" };
-                        watcherData.functionName = bindingData[index++];
-						watcherData.paramFunction = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        break;
-                    }
-                    case 1:
-					{
-						watcherData = { type: "static" };
-						watcherData.propertyName = bindingData[index++];
-						watcherData.eventNames = bindingData[index++];
-						watcherData.bindings = bindingData[index++];
-						watcherData.getterFunction = bindingData[index++];
-						watcherData.parentObj = bindingData[index++];
-						watcherMap[watcherData.propertyName] = watcherData;
-						break;
-					}
-                    case 2:
-                    {
-                        watcherData = { type: "property" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherData.getterFunction = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                    case 3:
-                    {
-                        watcherData = { type: "xml" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                }
-                watcherData.children = bindingData[index++];
-                if (watcherData.children != null)
-                {
-                    watcherData.children = decodeWatcher(watcherData.children);
-                }
-                watcherData.index = watcherIndex;
-                watchers.push(watcherData);
-            }            
-            return { watchers: watchers, watcherMap: watcherMap };
-        }
-        
-        private var deferredBindings:Object = {};
-        private function deferredBindingsHandler(event:Event):void
-        {
-            for (var p:String in deferredBindings)
-            {
-                if (_strand[p] != null)
-                {
-                    var destination:IStrand = _strand[p] as IStrand;
-                    destination.addBead(deferredBindings[p]);
-                    delete deferredBindings[p];
-                }
-            }
-        }
-        
-    }
-}
\ No newline at end of file