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 2013/10/08 16:04:04 UTC

[49/62] [abbrv] [partial] Merged Apache Flex 4.9.0 release branch

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/locale/el_GR/metadata.properties
----------------------------------------------------------------------
diff --git a/frameworks/locale/el_GR/metadata.properties b/frameworks/locale/el_GR/metadata.properties
new file mode 100644
index 0000000..c62d379
--- /dev/null
+++ b/frameworks/locale/el_GR/metadata.properties
@@ -0,0 +1,42 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+accessibilityClass.help = Specifies a helper class that implements this component's accessibility behavior.
+alternative.help = Specifies a recommended replacement for this class.
+arrayElementType.help = Specifies the allowed data type for the elements of this Array.
+bindable.help = Indicates that this property or method, or all the properties of this class, are able to be used in databinding expressions.
+defaultProperty.help = Specifies which property of this class can be set in MXML without enclosing its value in a property tag.
+deprecated.help = Marks this property, method, or class as being obsolete and no longer recommended for use.
+embed.help = Embeds an asset file (such as JPEG, PNG, MP3, XML, etc.) into a SWF, and initializes this variable to the corresponding asset class.
+event.help = Declares an event that this class dispatches.
+exclude.help = Omits a specified property, method, style, or event of this class from Flash Builder's code hints and from ASDoc.
+excludeClass.help = Omits this class from Flash Builder's code hints and from ASDoc.
+hostComponent.help = Specifies the SkinnableComponent that will use this Spark skin.
+iconFile.help = Specifies an icon to represent this component in Flash Builder.
+inspectable.help = Specifies how this property appears in Flash Builder's property inspector. Also used to specify the allowed values in MXML for a property of type String.
+managed.help = Indicates that LCDS should monitor all modifications (create/update/delete) to instances of this class. Managed classes are automatically bindable.
+nonCommitingChangeEvent.help = Specifies the event that indicates fine-grained value changes to this property, such as modifications in a TextInput prior to confirmation.
+percentProxy.help = Specifies a percent-based property that corresponds to this property. For example, width="100%" in MXML sets percentWidth to 100 in ActionScript.
+remoteClass.help = Specifies the remote class corresponding to this class for AMF serialization.
+resourceBundle.help = Indicates that this class uses a particular resource bundle, so that the bundle gets compiled into the SWF.
+richTextContent.help = Indicates that all characters should be interpreted literally as text when this property is set using character data in MXML.
+skinPart.help = Indicates that the value of this property is a skin part in this component's skin.
+skinState.help = Declares a view state that this component's skin must support.
+style.help = Declares a CSS style that this component supports.
+swf.help = Specifies information for the SWF header of this ActionScript application.
+transient.help = Indicates that this property should not participate in AMF serialization.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/locale/en_AU/metadata.properties
----------------------------------------------------------------------
diff --git a/frameworks/locale/en_AU/metadata.properties b/frameworks/locale/en_AU/metadata.properties
new file mode 100644
index 0000000..c62d379
--- /dev/null
+++ b/frameworks/locale/en_AU/metadata.properties
@@ -0,0 +1,42 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+accessibilityClass.help = Specifies a helper class that implements this component's accessibility behavior.
+alternative.help = Specifies a recommended replacement for this class.
+arrayElementType.help = Specifies the allowed data type for the elements of this Array.
+bindable.help = Indicates that this property or method, or all the properties of this class, are able to be used in databinding expressions.
+defaultProperty.help = Specifies which property of this class can be set in MXML without enclosing its value in a property tag.
+deprecated.help = Marks this property, method, or class as being obsolete and no longer recommended for use.
+embed.help = Embeds an asset file (such as JPEG, PNG, MP3, XML, etc.) into a SWF, and initializes this variable to the corresponding asset class.
+event.help = Declares an event that this class dispatches.
+exclude.help = Omits a specified property, method, style, or event of this class from Flash Builder's code hints and from ASDoc.
+excludeClass.help = Omits this class from Flash Builder's code hints and from ASDoc.
+hostComponent.help = Specifies the SkinnableComponent that will use this Spark skin.
+iconFile.help = Specifies an icon to represent this component in Flash Builder.
+inspectable.help = Specifies how this property appears in Flash Builder's property inspector. Also used to specify the allowed values in MXML for a property of type String.
+managed.help = Indicates that LCDS should monitor all modifications (create/update/delete) to instances of this class. Managed classes are automatically bindable.
+nonCommitingChangeEvent.help = Specifies the event that indicates fine-grained value changes to this property, such as modifications in a TextInput prior to confirmation.
+percentProxy.help = Specifies a percent-based property that corresponds to this property. For example, width="100%" in MXML sets percentWidth to 100 in ActionScript.
+remoteClass.help = Specifies the remote class corresponding to this class for AMF serialization.
+resourceBundle.help = Indicates that this class uses a particular resource bundle, so that the bundle gets compiled into the SWF.
+richTextContent.help = Indicates that all characters should be interpreted literally as text when this property is set using character data in MXML.
+skinPart.help = Indicates that the value of this property is a skin part in this component's skin.
+skinState.help = Declares a view state that this component's skin must support.
+style.help = Declares a CSS style that this component supports.
+swf.help = Specifies information for the SWF header of this ActionScript application.
+transient.help = Indicates that this property should not participate in AMF serialization.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/locale/en_CA/metadata.properties
----------------------------------------------------------------------
diff --git a/frameworks/locale/en_CA/metadata.properties b/frameworks/locale/en_CA/metadata.properties
new file mode 100644
index 0000000..c62d379
--- /dev/null
+++ b/frameworks/locale/en_CA/metadata.properties
@@ -0,0 +1,42 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+accessibilityClass.help = Specifies a helper class that implements this component's accessibility behavior.
+alternative.help = Specifies a recommended replacement for this class.
+arrayElementType.help = Specifies the allowed data type for the elements of this Array.
+bindable.help = Indicates that this property or method, or all the properties of this class, are able to be used in databinding expressions.
+defaultProperty.help = Specifies which property of this class can be set in MXML without enclosing its value in a property tag.
+deprecated.help = Marks this property, method, or class as being obsolete and no longer recommended for use.
+embed.help = Embeds an asset file (such as JPEG, PNG, MP3, XML, etc.) into a SWF, and initializes this variable to the corresponding asset class.
+event.help = Declares an event that this class dispatches.
+exclude.help = Omits a specified property, method, style, or event of this class from Flash Builder's code hints and from ASDoc.
+excludeClass.help = Omits this class from Flash Builder's code hints and from ASDoc.
+hostComponent.help = Specifies the SkinnableComponent that will use this Spark skin.
+iconFile.help = Specifies an icon to represent this component in Flash Builder.
+inspectable.help = Specifies how this property appears in Flash Builder's property inspector. Also used to specify the allowed values in MXML for a property of type String.
+managed.help = Indicates that LCDS should monitor all modifications (create/update/delete) to instances of this class. Managed classes are automatically bindable.
+nonCommitingChangeEvent.help = Specifies the event that indicates fine-grained value changes to this property, such as modifications in a TextInput prior to confirmation.
+percentProxy.help = Specifies a percent-based property that corresponds to this property. For example, width="100%" in MXML sets percentWidth to 100 in ActionScript.
+remoteClass.help = Specifies the remote class corresponding to this class for AMF serialization.
+resourceBundle.help = Indicates that this class uses a particular resource bundle, so that the bundle gets compiled into the SWF.
+richTextContent.help = Indicates that all characters should be interpreted literally as text when this property is set using character data in MXML.
+skinPart.help = Indicates that the value of this property is a skin part in this component's skin.
+skinState.help = Declares a view state that this component's skin must support.
+style.help = Declares a CSS style that this component supports.
+swf.help = Specifies information for the SWF header of this ActionScript application.
+transient.help = Indicates that this property should not participate in AMF serialization.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/locale/en_GB/metadata.properties
----------------------------------------------------------------------
diff --git a/frameworks/locale/en_GB/metadata.properties b/frameworks/locale/en_GB/metadata.properties
new file mode 100644
index 0000000..c62d379
--- /dev/null
+++ b/frameworks/locale/en_GB/metadata.properties
@@ -0,0 +1,42 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+accessibilityClass.help = Specifies a helper class that implements this component's accessibility behavior.
+alternative.help = Specifies a recommended replacement for this class.
+arrayElementType.help = Specifies the allowed data type for the elements of this Array.
+bindable.help = Indicates that this property or method, or all the properties of this class, are able to be used in databinding expressions.
+defaultProperty.help = Specifies which property of this class can be set in MXML without enclosing its value in a property tag.
+deprecated.help = Marks this property, method, or class as being obsolete and no longer recommended for use.
+embed.help = Embeds an asset file (such as JPEG, PNG, MP3, XML, etc.) into a SWF, and initializes this variable to the corresponding asset class.
+event.help = Declares an event that this class dispatches.
+exclude.help = Omits a specified property, method, style, or event of this class from Flash Builder's code hints and from ASDoc.
+excludeClass.help = Omits this class from Flash Builder's code hints and from ASDoc.
+hostComponent.help = Specifies the SkinnableComponent that will use this Spark skin.
+iconFile.help = Specifies an icon to represent this component in Flash Builder.
+inspectable.help = Specifies how this property appears in Flash Builder's property inspector. Also used to specify the allowed values in MXML for a property of type String.
+managed.help = Indicates that LCDS should monitor all modifications (create/update/delete) to instances of this class. Managed classes are automatically bindable.
+nonCommitingChangeEvent.help = Specifies the event that indicates fine-grained value changes to this property, such as modifications in a TextInput prior to confirmation.
+percentProxy.help = Specifies a percent-based property that corresponds to this property. For example, width="100%" in MXML sets percentWidth to 100 in ActionScript.
+remoteClass.help = Specifies the remote class corresponding to this class for AMF serialization.
+resourceBundle.help = Indicates that this class uses a particular resource bundle, so that the bundle gets compiled into the SWF.
+richTextContent.help = Indicates that all characters should be interpreted literally as text when this property is set using character data in MXML.
+skinPart.help = Indicates that the value of this property is a skin part in this component's skin.
+skinState.help = Declares a view state that this component's skin must support.
+style.help = Declares a CSS style that this component supports.
+swf.help = Specifies information for the SWF header of this ActionScript application.
+transient.help = Indicates that this property should not participate in AMF serialization.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/locale/pt_PT/metadata.properties
----------------------------------------------------------------------
diff --git a/frameworks/locale/pt_PT/metadata.properties b/frameworks/locale/pt_PT/metadata.properties
new file mode 100644
index 0000000..c62d379
--- /dev/null
+++ b/frameworks/locale/pt_PT/metadata.properties
@@ -0,0 +1,42 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+accessibilityClass.help = Specifies a helper class that implements this component's accessibility behavior.
+alternative.help = Specifies a recommended replacement for this class.
+arrayElementType.help = Specifies the allowed data type for the elements of this Array.
+bindable.help = Indicates that this property or method, or all the properties of this class, are able to be used in databinding expressions.
+defaultProperty.help = Specifies which property of this class can be set in MXML without enclosing its value in a property tag.
+deprecated.help = Marks this property, method, or class as being obsolete and no longer recommended for use.
+embed.help = Embeds an asset file (such as JPEG, PNG, MP3, XML, etc.) into a SWF, and initializes this variable to the corresponding asset class.
+event.help = Declares an event that this class dispatches.
+exclude.help = Omits a specified property, method, style, or event of this class from Flash Builder's code hints and from ASDoc.
+excludeClass.help = Omits this class from Flash Builder's code hints and from ASDoc.
+hostComponent.help = Specifies the SkinnableComponent that will use this Spark skin.
+iconFile.help = Specifies an icon to represent this component in Flash Builder.
+inspectable.help = Specifies how this property appears in Flash Builder's property inspector. Also used to specify the allowed values in MXML for a property of type String.
+managed.help = Indicates that LCDS should monitor all modifications (create/update/delete) to instances of this class. Managed classes are automatically bindable.
+nonCommitingChangeEvent.help = Specifies the event that indicates fine-grained value changes to this property, such as modifications in a TextInput prior to confirmation.
+percentProxy.help = Specifies a percent-based property that corresponds to this property. For example, width="100%" in MXML sets percentWidth to 100 in ActionScript.
+remoteClass.help = Specifies the remote class corresponding to this class for AMF serialization.
+resourceBundle.help = Indicates that this class uses a particular resource bundle, so that the bundle gets compiled into the SWF.
+richTextContent.help = Indicates that all characters should be interpreted literally as text when this property is set using character data in MXML.
+skinPart.help = Indicates that the value of this property is a skin part in this component's skin.
+skinState.help = Declares a view state that this component's skin must support.
+style.help = Declares a CSS style that this component supports.
+swf.help = Specifies information for the SWF header of this ActionScript application.
+transient.help = Indicates that this property should not participate in AMF serialization.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/build.xml b/frameworks/projects/advancedgrids/build.xml
index 1191df8..d9b9718 100644
--- a/frameworks/projects/advancedgrids/build.xml
+++ b/frameworks/projects/advancedgrids/build.xml
@@ -33,24 +33,12 @@
 				<!-- because targets that run before flexTasks.jar gets built would fail. -->
 				<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
 				<compc fork="true"
-					output="${FLEX_HOME}/frameworks/locale/@{locale}/advancedgrids_rb.swc"
-					locale="@{locale}">
-					<target-player>${playerglobal.version}</target-player>
+					output="${FLEX_HOME}/frameworks/locale/@{locale}/advancedgrids_rb.swc">
 					<jvmarg line="${compc.jvm.args}"/>
-					<include-resource-bundles bundle="datamanagement"/>
-					<include-resource-bundles bundle="olap"/>
-					<include-namespaces/>
-					<include-classes/>
-					<source-path path-element="${basedir}/bundles/@{locale}"/>
-					<source-path path-element="${FLEX_HOME}/frameworks/projects/advancedgrids/src"/>
-					<include-libraries/>
-					<library-path/>
-					<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-						<include name="${playerglobal.version}/playerglobal.swc"/>
-					</external-library-path>
-					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-						<include name="framework.swc"/>
-					</external-library-path>
+                    <load-config filename="bundle-config.xml" />
+                    <arg value="+playerglobal.version=${playerglobal.version}" />
+                    <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+                    <arg value="+locale=@{locale}" />
 				</compc>
 		</sequential>
 	</macrodef>
@@ -116,6 +104,7 @@
 				<fat-swc locale="de_DE"/>
 			</run.fat.swc>
 		</bundler>
+		<bundler locale="de_CH"/><!-- Swiss German resources -->
 		<bundler locale="es_ES"/><!-- Spanish resources -->
 		<bundler locale="fi_FI"/><!--  Finnish resources-->
 		<bundler locale="fr_FR"><!-- French resources -->
@@ -198,28 +187,11 @@
 			into the file bundles.properties in this directory.
 		-->
 		<compc fork="true"
-			include-classes="AdvancedDataGridClasses"
-			output="${FLEX_HOME}/frameworks/libs/advancedgrids.swc"
-			resource-bundle-list="${basedir}/bundles.properties">
+			output="${FLEX_HOME}/frameworks/libs/advancedgrids.swc">
 			<jvmarg line="${compc.jvm.args}"/>
-			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest_advancedgrids.xml"/>
-			<include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
-			<source-path path-element="${basedir}/src"/>
-			<library-path />
-            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="${playerglobal.version}/playerglobal.swc"/>
-            </external-library-path>
-			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-				<include name="framework.swc"/>
-				<include name="mx/mx.swc"/>
-				<include name="rpc.swc"/>
-                <include name="textLayout.swc"/>
-			</external-library-path>
-			<include-file name="defaults.css" path="${basedir}/data_management.css"/>
-			<include-file name="defaults-3.0.0.css" path="${basedir}/data_management-3.0.0.css"/>
-			<locale/>
-            <accessible>true</accessible>
-			<show-deprecation-warnings>false</show-deprecation-warnings>
+            <load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
 		</compc>
 	</target>
 	

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/bundle-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/bundle-config.xml b/frameworks/projects/advancedgrids/bundle-config.xml
new file mode 100644
index 0000000..0a08cb0
--- /dev/null
+++ b/frameworks/projects/advancedgrids/bundle-config.xml
@@ -0,0 +1,51 @@
+<!--
+
+  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>        
+        <external-library-path>
+            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+            <path-element>../../libs/framework.swc</path-element>
+        </external-library-path>
+        
+        <include-libraries/>
+        
+        <library-path/>
+        
+        <locale>
+            <locale-element>${locale}</locale-element>
+        </locale>
+        
+        <source-path>
+            <path-element>bundles/${locale}</path-element>
+            <path-element>../advancedgrids/src</path-element>
+        </source-path>
+    </compiler>
+    
+    <include-classes/>
+    
+    <include-namespaces/>
+    
+    <include-resource-bundles>
+        <bundle>datamanagement</bundle>
+        <bundle>olap</bundle>
+    </include-resource-bundles>
+        
+    <target-player>${playerglobal.version}</target-player>
+</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/bundles/de_CH/datamanagement.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/bundles/de_CH/datamanagement.properties b/frameworks/projects/advancedgrids/bundles/de_CH/datamanagement.properties
new file mode 100644
index 0000000..50fc8b2
--- /dev/null
+++ b/frameworks/projects/advancedgrids/bundles/de_CH/datamanagement.properties
@@ -0,0 +1,26 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+# Developer RTE Section
+
+repeatColumnsNotAllowed=Jedes Spaltenobjekt kann nur einmal verwendet werden.
+
+# Design View
+
+Branch=Verzweigung {0}
+

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/bundles/de_CH/olap.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/bundles/de_CH/olap.properties b/frameworks/projects/advancedgrids/bundles/de_CH/olap.properties
new file mode 100644
index 0000000..465d21b
--- /dev/null
+++ b/frameworks/projects/advancedgrids/bundles/de_CH/olap.properties
@@ -0,0 +1,49 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+duplicateHierarchyOnAxes=„{0}“ erscheint auf Achse „{1}“ und auf Achse \n„{2}“.
+
+nullMemberOnAxis=NULL-Member sollte der Achse „{1}“ hinzugefügt werden.
+
+crossJoinSameHierarchyError= „{0}“ in beiden Sätzen gefunden.
+
+multipleHierarchies=Die Dimension enthält mehrere Hierarchien. Eine Hierarchie muss explizit angegeben werden.
+
+noMeasures=Für den Würfel wurden keine Maße angegeben.
+
+unionError=Die Sätze haben nicht dieselbe Dimensionalität. Vereinigung nicht möglich.
+
+invalidAggregator=Ungültiger Aggregatorwert „{0}“. Mögliche Werte sind: SUM, AVG, MIN, MAX und COUNT.
+
+invalidAttributeName=Das Attribut „{0}“ ist für die Dimension nicht verfügbar.
+
+noAttributeForLevel=Kein Attribut für eine Ebene in Hierarchie „{0}“ angegeben.
+
+multipleHierarchiesNotSupported=Mehrere benutzerdefinierte Hierarchien sollen der Dimension „{0}“ hinzugefügt werden. In dieser Version werden nur einzelne benutzerdefinierte Hierarchien unterstützt.
+
+zeroElementsOnAxis=Auf der Achse „{0}“ wurde kein Member gefunden.
+
+finalizingMessage=Wird abgeschlossen... Bitte warten.
+
+progressMessage=Daten der Zeile {0} von {1} werden verarbeitet
+
+dimensionProcessingMessage=Dimension {0} wird verarbeitet
+
+queryError=Abfragefehler
+
+error=Allgemeiner Fehler

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/bundles/pt_PT/datamanagement.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/bundles/pt_PT/datamanagement.properties b/frameworks/projects/advancedgrids/bundles/pt_PT/datamanagement.properties
index 941c634..4a7e911 100644
--- a/frameworks/projects/advancedgrids/bundles/pt_PT/datamanagement.properties
+++ b/frameworks/projects/advancedgrids/bundles/pt_PT/datamanagement.properties
@@ -1,3 +1,18 @@
+# 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.
+
 # Developer RTE Section
 
 repeatColumnsNotAllowed=O mesmo objecto Column não pode ser usado mais do que uma vez

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/bundles/pt_PT/olap.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/bundles/pt_PT/olap.properties b/frameworks/projects/advancedgrids/bundles/pt_PT/olap.properties
index bab27c4..fd3db99 100644
--- a/frameworks/projects/advancedgrids/bundles/pt_PT/olap.properties
+++ b/frameworks/projects/advancedgrids/bundles/pt_PT/olap.properties
@@ -1,3 +1,18 @@
+# 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.
+
 duplicateHierarchyOnAxes='[[0]]' aparece no eixo '[[1]]' e no eixo '[[2]]'
 
 nullMemberOnAxis=Foi executada uma tentativa de adição de um membro nulo ao eixo '[[1]]'

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/compile-config.xml b/frameworks/projects/advancedgrids/compile-config.xml
new file mode 100644
index 0000000..19fb7cb
--- /dev/null
+++ b/frameworks/projects/advancedgrids/compile-config.xml
@@ -0,0 +1,69 @@
+<!--
+
+  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>true</accessible>
+        
+        <external-library-path>
+            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+            <path-element>../../libs/framework.swc</path-element>
+            <path-element>../../libs/mx/mx.swc</path-element>
+            <path-element>../../libs/rpc.swc</path-element>
+            <path-element>../../libs/textLayout.swc</path-element>
+        </external-library-path>
+        
+        <locale/>
+        
+        <library-path/>
+        
+        <namespaces>
+            <namespace>
+                <uri>library://ns.adobe.com/flex/mx</uri>
+                <manifest>manifest_advancedgrids.xml</manifest>
+            </namespace>
+        </namespaces>
+        
+        <source-path>
+            <path-element>src</path-element>
+        </source-path>
+        
+        <show-deprecation-warnings>false</show-deprecation-warnings>
+        <warn-no-constructor>false</warn-no-constructor>
+    </compiler>
+    
+    <include-classes>
+        <class>AdvancedDataGridClasses</class>
+    </include-classes>
+    
+    <include-file>
+        <name>defaults.css</name>
+        <path>data_management.css</path>
+    </include-file>
+    <include-file>
+        <name>defaults-3.0.0.css</name>
+        <path>data_management-3.0.0.css</path>
+    </include-file>
+    
+    <include-namespaces>
+        <uri>library://ns.adobe.com/flex/mx</uri>
+    </include-namespaces>  
+    
+    <resource-bundle-list>bundles.properties</resource-bundle-list>    
+</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
index 35ced1d..0809985 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-
+
 package mx.controls
 {
 
@@ -2345,6 +2345,13 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME
             updateHeaderSearchList();
         
             createDisplayableColumns();
+            
+            // It is possible that columns became invisible and the hsp is no longer valid.
+            // Force visibleColumns to be recomputed now so if there are lockedColumns and
+            // updateSubContent() is called before updateDisplayList() is called,
+            // visibleColumns will be correct.
+            if (horizontalScrollPosition > visibleHeaderInfos.length)
+                horizontalScrollPosition = visibleHeaderInfos.length - 1;
         }
 
         super.commitProperties();

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/.actionScriptProperties
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/.actionScriptProperties b/frameworks/projects/airframework/.actionScriptProperties
index 4afa048..038a98e 100644
--- a/frameworks/projects/airframework/.actionScriptProperties
+++ b/frameworks/projects/airframework/.actionScriptProperties
@@ -1,36 +1,36 @@
-################################################################################
-##
-##  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.
-##
-################################################################################
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="airframework.as" projectUUID="cb4c3626-654d-486e-9897-bbabbca668dd" version="6">
-  <compiler additionalCompilerArguments="-keep-as3-metadata=SkinPart -include-file=defaults.css,../defaults.css -include-file=defaults-3.0.0.css,../defaults-3.0.0.css -include-file=Assets.swf,../assets/Assets.swf -include-file=ComputerIcon.swf,../assets/ComputerIcon.swf -include-file=gripper_up.png,../assets/gripper_up.png -include-file=mac_close_down.png,../assets/mac_close_down.png -include-file=mac_close_over.png,../assets/mac_close_over.png -include-file=mac_close_up.png,../assets/mac_close_up.png -include-file=mac_max_dis.png,../assets/mac_max_dis.png -include-file=mac_max_down.png,../assets/mac_max_down.png -include-file=mac_max_over.png,../assets/mac_max_over.png -include-file=mac_max_up.png,../assets/mac_max_up.png -include-file=mac_min_dis.png,../assets/mac_min_dis.png -include-file=mac_min_down.png,../assets/mac_min_down.png -include-file=mac_min_over.png,../assets/mac_min_over.png -include-file=mac_min_up.png,../assets/mac_min_up.png -include-file=win_close_down.png,../as
 sets/win_close_down.png -include-file=win_close_over.png,../assets/win_close_over.png -include-file=win_close_up.png,../assets/win_close_up.png -include-file=win_max_dis.png,../assets/win_max_dis.png -include-file=win_max_down.png,../assets/win_max_down.png -include-file=win_max_over.png,../assets/win_max_over.png -include-file=win_max_up.png,../assets/win_max_up.png -include-file=win_min_dis.png,../assets/win_min_dis.png -include-file=win_min_down.png,../assets/win_min_down.png -include-file=win_min_over.png,../assets/win_min_over.png -include-file=win_min_up.png,../assets/win_min_up.png -include-file=win_restore_down.png,../assets/win_restore_down.png -include-file=win_restore_over.png,../assets/win_restore_over.png -include-file=win_restore_up.png,../assets/win_restore_up.png -namespace=library://ns.adobe.com/flex/mx,../manifest.xml -include-namespaces=library://ns.adobe.com/flex/mx -resource-bundle-list=bundles.properties -minimum-supported-version=3.0.0 -enable-swc-version-filt
 ering=false -library-path= -locale=" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="0">
-      <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/air/airglobal.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/textLayout.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/framework/bin/framework.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/mx/bin/mx.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="airframework.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+  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.
+
+-->
+<actionScriptProperties mainApplicationPath="airframework.as" projectUUID="cb4c3626-654d-486e-9897-bbabbca668dd" version="6">
+  <compiler additionalCompilerArguments="-keep-as3-metadata=SkinPart -include-file=defaults.css,../defaults.css -include-file=defaults-3.0.0.css,../defaults-3.0.0.css -include-file=Assets.swf,../assets/Assets.swf -include-file=ComputerIcon.swf,../assets/ComputerIcon.swf -include-file=gripper_up.png,../assets/gripper_up.png -include-file=mac_close_down.png,../assets/mac_close_down.png -include-file=mac_close_over.png,../assets/mac_close_over.png -include-file=mac_close_up.png,../assets/mac_close_up.png -include-file=mac_max_dis.png,../assets/mac_max_dis.png -include-file=mac_max_down.png,../assets/mac_max_down.png -include-file=mac_max_over.png,../assets/mac_max_over.png -include-file=mac_max_up.png,../assets/mac_max_up.png -include-file=mac_min_dis.png,../assets/mac_min_dis.png -include-file=mac_min_down.png,../assets/mac_min_down.png -include-file=mac_min_over.png,../assets/mac_min_over.png -include-file=mac_min_up.png,../assets/mac_min_up.png -include-file=win_close_down.png,../as
 sets/win_close_down.png -include-file=win_close_over.png,../assets/win_close_over.png -include-file=win_close_up.png,../assets/win_close_up.png -include-file=win_max_dis.png,../assets/win_max_dis.png -include-file=win_max_down.png,../assets/win_max_down.png -include-file=win_max_over.png,../assets/win_max_over.png -include-file=win_max_up.png,../assets/win_max_up.png -include-file=win_min_dis.png,../assets/win_min_dis.png -include-file=win_min_down.png,../assets/win_min_down.png -include-file=win_min_over.png,../assets/win_min_over.png -include-file=win_min_up.png,../assets/win_min_up.png -include-file=win_restore_down.png,../assets/win_restore_down.png -include-file=win_restore_over.png,../assets/win_restore_over.png -include-file=win_restore_up.png,../assets/win_restore_up.png -namespace=library://ns.adobe.com/flex/mx,../manifest.xml -include-namespaces=library://ns.adobe.com/flex/mx -resource-bundle-list=bundles.properties -minimum-supported-version=3.0.0 -enable-swc-version-filt
 ering=false -library-path= -locale=" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+    <compilerSourcePath/>
+    <libraryPath defaultLinkType="0">
+      <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/air/airglobal.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/textLayout.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="/framework/bin/framework.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="/mx/bin/mx.swc" useDefaultLinkType="false"/>
+    </libraryPath>
+    <sourceAttachmentPath/>
+  </compiler>
+  <applications>
+    <application path="airframework.as"/>
+  </applications>
+  <modules/>
+  <buildCSSFiles/>
+</actionScriptProperties>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/.flexLibProperties
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/.flexLibProperties b/frameworks/projects/airframework/.flexLibProperties
index 51c22ba..99fb737 100644
--- a/frameworks/projects/airframework/.flexLibProperties
+++ b/frameworks/projects/airframework/.flexLibProperties
@@ -1,22 +1,22 @@
-################################################################################
-##
-##  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.
-##
-################################################################################
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+  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.
+
+-->
 <flexLibProperties includeAllClasses="false" version="3">
   <includeClasses>
     <classEntry path="AIRFrameworkClasses"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/build.xml b/frameworks/projects/airframework/build.xml
index 7d4603a..4dae004 100644
--- a/frameworks/projects/airframework/build.xml
+++ b/frameworks/projects/airframework/build.xml
@@ -36,33 +36,12 @@
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
 		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
 		<compc fork="true"
-			   output="${FLEX_HOME}/frameworks/locale/@{locale}/airframework_rb.swc"
-			   locale="@{locale}">
-			<target-player>${playerglobal.version}</target-player>
-			<jvmarg line="${compc.jvm.args}"/>
-			<include-resource-bundles bundle="SharedResources"/>
-			<include-resource-bundles bundle="aircontrols"/>
-			<include-resource-bundles bundle="collections"/>
-			<include-resource-bundles bundle="containers"/>
-			<include-resource-bundles bundle="controls"/>
-			<include-resource-bundles bundle="core"/>
-			<include-resource-bundles bundle="effects"/>
-			<include-resource-bundles bundle="formatters"/>
-			<include-resource-bundles bundle="skins"/>
-			<include-resource-bundles bundle="styles"/>
-			<include-namespaces/>
-			<include-classes/>
-			<source-path path-element="${basedir}/bundles/@{locale}"/>
-			<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
-			<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/bundles/@{locale}"/>
-			<include-libraries/>
-			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="${playerglobal.version}/playerglobal.swc"/>
-            </external-library-path>
-            <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="framework.swc"/>
-			</external-library-path>
+			   output="${FLEX_HOME}/frameworks/locale/@{locale}/airframework_rb.swc">
+            <jvmarg line="${compc.jvm.args}"/>
+            <load-config filename="bundle-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+            <arg value="+locale=@{locale}" />
 		</compc>
 		</sequential>
 	</macrodef>	
@@ -124,6 +103,7 @@
 				<fat-swc locale="de_DE"/>
 			</run.fat.swc>
 		</bundler>
+		<bundler locale="de_CH"/><!-- Swiss German resources -->
 		<bundler locale="es_ES"/><!-- Spanish resources -->
 		<bundler locale="fi_FI"/><!--  Finnish resources-->
 		<bundler locale="fr_FR"><!-- French resources -->
@@ -228,56 +208,11 @@
 			into the file bundles.properties in this directory.
 		-->
 		<compc fork="true"
-			   output="${FLEX_HOME}/frameworks/libs/air/airframework.swc"
-			   resource-bundle-list="${basedir}/bundles.properties">
-		    <target-player>${playerglobal.version}</target-player>
+			   output="${FLEX_HOME}/frameworks/libs/air/airframework.swc">
 			<jvmarg line="${compc.jvm.args}"/>
-			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest.xml"/>
-			<include-namespaces uri="library://ns.adobe.com/flex/mx"/>
-			<include-classes>AIRFrameworkClasses</include-classes>
-			<source-path path-element="${basedir}/src"/>
-			<library-path/>
-            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
-                <include name="airglobal.swc"/>
-            </external-library-path>
-			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-				<include name="framework.swc"/>
-				<include name="mx/mx.swc"/>
-                <include name="textLayout.swc"/>
-			</external-library-path>
-			<include-file name="defaults.css" path="${basedir}/defaults.css"/>
-			<include-file name="defaults-3.0.0.css" path="${basedir}/defaults-3.0.0.css"/>
-			<include-file name="Assets.swf" path="${basedir}/assets/Assets.swf"/>
-			<include-file name="ComputerIcon.swf" path="${basedir}/assets/ComputerIcon.swf"/>
-			<include-file name="gripper_up.png" path="${basedir}//assets/gripper_up.png"/>
-			<include-file name="mac_close_down.png" path="${basedir}/assets/mac_close_down.png"/>
-			<include-file name="mac_close_over.png" path="${basedir}/assets/mac_close_over.png"/>
-			<include-file name="mac_close_up.png" path="${basedir}/assets/mac_close_up.png"/>
-			<include-file name="mac_max_dis.png" path="${basedir}/assets/mac_max_dis.png"/>
-			<include-file name="mac_max_down.png" path="${basedir}/assets/mac_max_down.png"/>
-			<include-file name="mac_max_over.png" path="${basedir}/assets/mac_max_over.png"/>
-			<include-file name="mac_max_up.png" path="${basedir}/assets/mac_max_up.png"/>
-			<include-file name="mac_min_dis.png" path="${basedir}/assets/mac_min_dis.png"/>
-			<include-file name="mac_min_down.png" path="${basedir}/assets/mac_min_down.png"/>
-			<include-file name="mac_min_over.png" path="${basedir}/assets/mac_min_over.png"/>
-			<include-file name="mac_min_up.png" path="${basedir}/assets/mac_min_up.png"/>
-			<include-file name="win_close_down.png" path="${basedir}/assets/win_close_down.png"/>
-			<include-file name="win_close_over.png" path="${basedir}/assets/win_close_over.png"/>
-			<include-file name="win_close_up.png" path="${basedir}/assets/win_close_up.png"/>
-			<include-file name="win_max_dis.png" path="${basedir}/assets/win_max_dis.png"/>
-			<include-file name="win_max_down.png" path="${basedir}/assets/win_max_down.png"/>
-			<include-file name="win_max_over.png" path="${basedir}/assets/win_max_over.png"/>
-			<include-file name="win_max_up.png" path="${basedir}/assets/win_max_up.png"/>
-			<include-file name="win_min_dis.png" path="${basedir}/assets/win_min_dis.png"/>
-			<include-file name="win_min_down.png" path="${basedir}/assets/win_min_down.png"/>
-			<include-file name="win_min_over.png" path="${basedir}/assets/win_min_over.png"/>
-			<include-file name="win_min_up.png" path="${basedir}/assets/win_min_up.png"/>
-			<include-file name="win_restore_down.png" path="${basedir}/assets/win_restore_down.png"/>
-			<include-file name="win_restore_over.png" path="${basedir}/assets/win_restore_over.png"/>
-			<include-file name="win_restore_up.png" path="${basedir}/assets/win_restore_up.png"/>
-			<locale/>
-		        <keep-as3-metadata name="SkinPart"/>
-		        <accessible>true</accessible>
+            <load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
 		</compc>
 	</target>
 	

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/bundle-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/bundle-config.xml b/frameworks/projects/airframework/bundle-config.xml
new file mode 100644
index 0000000..726f0e1
--- /dev/null
+++ b/frameworks/projects/airframework/bundle-config.xml
@@ -0,0 +1,60 @@
+<!--
+
+  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>        
+        <external-library-path>
+            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+            <path-element>../../libs/framework.swc</path-element>
+        </external-library-path>
+        
+        <include-libraries/>
+        
+        <library-path/>
+        
+        <locale>
+            <locale-element>${locale}</locale-element>
+        </locale>
+        
+        <source-path>
+            <path-element>bundles/${locale}</path-element>
+            <path-element>../framework/bundles/${locale}</path-element>
+            <path-element>../mx/bundles/${locale}</path-element>
+        </source-path>
+    </compiler>
+    
+    <include-classes/>
+    
+    <include-namespaces/>
+    
+    <include-resource-bundles>
+        <bundle>SharedResources</bundle>
+        <bundle>aircontrols</bundle>
+        <bundle>collections</bundle>
+        <bundle>containers</bundle>
+        <bundle>controls</bundle>
+        <bundle>core</bundle>
+        <bundle>effects</bundle>
+        <bundle>formatters</bundle>
+        <bundle>skins</bundle>
+        <bundle>styles</bundle>
+    </include-resource-bundles>
+        
+    <target-player>${playerglobal.version}</target-player>
+</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/bundles/de_CH/aircontrols.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/bundles/de_CH/aircontrols.properties b/frameworks/projects/airframework/bundles/de_CH/aircontrols.properties
new file mode 100644
index 0000000..f73da49
--- /dev/null
+++ b/frameworks/projects/airframework/bundles/de_CH/aircontrols.properties
@@ -0,0 +1,47 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+
+computer=Computer
+
+fileSystemList_measuredText=XXXXXXXXXXXXXXXXXXXXXXXXX
+
+fileSystemDataGrid_nameColumnHeader=Name
+fileSystemDataGrid_nameColumnMeasuredText=XXXXXXXXXXXXXXX
+
+fileSystemDataGrid_typeColumnHeader=Typ
+fileSystemDataGrid_typeColumnMeasuredText=XXXX-Datei
+fileSystemDataGrid_typeFolder=Ordner
+fileSystemDataGrid_typeFileWithExtension={0} Datei
+fileSystemDataGrid_typeFileWithoutExtension=Datei
+
+fileSystemDataGrid_sizeColumnHeader=Größe
+fileSystemDataGrid_sizeColumnMeasuredText=0000000000
+fileSystemDataGrid_sizeFolder=-
+fileSystemDataGrid_sizeBytes={0}
+fileSystemDataGrid_sizeKilobytes={0} KB
+
+fileSystemDataGrid_creationDateColumnHeader=Erstellt
+fileSystemDataGrid_creationDateColumnMeasuredText=00.00.0000 00:00
+
+fileSystemDataGrid_modificationDateColumnHeader=Geändert am
+fileSystemDataGrid_modificationDateColumnMeasuredText=00.00.0000 00:00
+
+fileSystemDataGrid_dateFormatString=DD.MM.YYYY HH:NN
+
+fileSystemTree_measuredText=XXXXXXXXXXXXXXXXXXXXXXXXX

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/bundles/pt_PT/aircontrols.properties
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/bundles/pt_PT/aircontrols.properties b/frameworks/projects/airframework/bundles/pt_PT/aircontrols.properties
index db9924c..cb56a38 100644
--- a/frameworks/projects/airframework/bundles/pt_PT/aircontrols.properties
+++ b/frameworks/projects/airframework/bundles/pt_PT/aircontrols.properties
@@ -1,11 +1,19 @@
 ################################################################################
 ##
-##  ADOBE SYSTEMS INCORPORATED
-##  Copyright 2007 Adobe Systems Incorporated
-##  All Rights Reserved.
+##  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
 ##
-##  NOTICE: Adobe permits you to use, modify, and distribute this file
-##  in accordance with the terms of the license agreement accompanying it.
+##      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.
 ##
 ################################################################################
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/compile-config.xml b/frameworks/projects/airframework/compile-config.xml
new file mode 100644
index 0000000..19fbc79
--- /dev/null
+++ b/frameworks/projects/airframework/compile-config.xml
@@ -0,0 +1,185 @@
+<!--
+
+  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>true</accessible>
+        
+        <external-library-path>
+            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+            <path-element>../../libs/framework.swc</path-element>
+            <path-element>../../libs/mx/mx.swc</path-element>
+            <path-element>../../libs/textLayout.swc</path-element>
+        </external-library-path>
+        
+        <keep-as3-metadata>
+            <name>SkinPart</name>
+        </keep-as3-metadata>
+        
+        <locale/>
+        
+        <library-path/>
+        
+        <namespaces>
+            <namespace>
+                <uri>library://ns.adobe.com/flex/mx</uri>
+                <manifest>manifest.xml</manifest>
+            </namespace>
+        </namespaces>
+        
+        <source-path>
+            <path-element>src</path-element>
+        </source-path>
+        
+        <warn-no-constructor>false</warn-no-constructor>
+    </compiler>
+    
+    <include-classes>
+        <class>AIRFrameworkClasses</class>
+    </include-classes>
+    
+    <include-file>
+        <name>defaults.css</name>
+        <path>defaults.css</path>
+    </include-file>
+    <include-file>
+        <name>defaults-3.0.0.css</name>
+        <path>defaults-3.0.0.css</path>
+    </include-file>
+    <include-file>
+        <name>Assets.swf</name>
+        <path>assets/Assets.swf</path>
+    </include-file>
+    <include-file>
+        <name>ComputerIcon.swf</name>
+        <path>assets/ComputerIcon.swf</path>
+    </include-file>
+    <include-file>
+        <name>gripper_up.png</name>
+        <path>assets/gripper_up.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_close_down.png</name>
+        <path>assets/mac_close_down.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_close_over.png</name>
+        <path>assets/mac_close_over.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_close_up.png</name>
+        <path>assets/mac_close_up.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_max_dis.png</name>
+        <path>assets/mac_max_dis.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_max_down.png</name>
+        <path>assets/mac_max_down.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_max_over.png</name>
+        <path>assets/mac_max_over.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_max_up.png</name>
+        <path>assets/mac_max_up.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_min_dis.png</name>
+        <path>assets/mac_min_dis.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_min_down.png</name>
+        <path>assets/mac_min_down.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_min_over.png</name>
+        <path>assets/mac_min_over.png</path>
+    </include-file>
+    <include-file>
+        <name>mac_min_up.png</name>
+        <path>assets/mac_min_up.png</path>
+    </include-file>
+    <include-file>
+        <name>win_close_down.png</name>
+        <path>assets/win_close_down.png</path>
+    </include-file>
+    <include-file>
+        <name>win_close_over.png</name>
+        <path>assets/win_close_over.png</path>
+    </include-file>
+    <include-file>
+        <name>win_close_up.png</name>
+        <path>assets/win_close_up.png</path>
+    </include-file>
+    <include-file>
+        <name>win_max_dis.png</name>
+        <path>assets/win_max_dis.png</path>
+    </include-file>
+    <include-file>
+        <name>win_max_down.png</name>
+        <path>assets/win_max_down.png</path>
+    </include-file>
+    <include-file>
+        <name>win_max_over.png</name>
+        <path>assets/win_max_over.png</path>
+    </include-file>
+    <include-file>
+        <name>win_max_up.png</name>
+        <path>assets/win_max_up.png</path>
+    </include-file>
+    <include-file>
+        <name>win_min_dis.png</name>
+        <path>assets/win_min_dis.png</path>
+    </include-file>
+    <include-file>
+        <name>win_min_down.png</name>
+        <path>assets/win_min_down.png</path>
+    </include-file>
+    <include-file>
+        <name>win_min_over.png</name>
+        <path>assets/win_min_over.png</path>
+    </include-file>
+    <include-file>
+        <name>win_min_up.png</name>
+        <path>assets/win_min_up.png</path>
+    </include-file>
+    <include-file>
+        <name>win_restore_down.png</name>
+        <path>assets/win_restore_down.png</path>
+    </include-file>
+    <include-file>
+        <name>win_restore_over.png</name>
+        <path>assets/win_restore_over.png</path>
+    </include-file>
+    <include-file>
+        <name>win_restore_up.png</name>
+        <path>assets/win_restore_up.png</path>
+    </include-file>
+    
+    <include-namespaces>
+        <uri>library://ns.adobe.com/flex/mx</uri>
+    </include-namespaces>
+    
+    <resource-bundle-list>bundles.properties</resource-bundle-list>
+    
+    <target-player>${playerglobal.version}</target-player>
+</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as b/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as
index 1c84a2c..afad68f 100644
--- a/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as
+++ b/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as
@@ -1605,7 +1605,17 @@ public class FileSystemDataGrid extends DataGrid
         if (!item.exists) // item may have been deleted
             return "";
 
-        return dateFormatter.format(item.creationDate);
+		var s:String;
+		try 
+		{
+	        s = dateFormatter.format(item.creationDate);
+		} 
+		catch (e:Error)
+		{
+			// a bad alias on mac will not have a valid creation date
+			s = "";
+		}
+		return s;
     }
 
     /**
@@ -1617,7 +1627,17 @@ public class FileSystemDataGrid extends DataGrid
         if (!item.exists) // item may have been deleted
             return "";
 
-        return dateFormatter.format(item.modificationDate);
+		var s:String;
+		try
+		{
+        	s = dateFormatter.format(item.modificationDate);
+		} 
+		catch (e:Error)
+		{
+			// a bad alias on mac will not have a valid mod date
+			s = "";
+		}
+		return s;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airspark/.actionScriptProperties
----------------------------------------------------------------------
diff --git a/frameworks/projects/airspark/.actionScriptProperties b/frameworks/projects/airspark/.actionScriptProperties
index 021733b..351e03e 100644
--- a/frameworks/projects/airspark/.actionScriptProperties
+++ b/frameworks/projects/airspark/.actionScriptProperties
@@ -1,37 +1,37 @@
-################################################################################
-##
-##  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.
-##
-################################################################################
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="airspark.as" projectUUID="e456729a-8257-4f21-9d3e-b510a8b315d6" version="6">
-  <compiler additionalCompilerArguments="-keep-as3-metadata=SkinPart -include-file=defaults.css,../defaults.css -include-file=gripper_up.png,../assets/gripper_up.png -include-file=mac_close_down.png,../assets/mac_close_down.png -include-file=mac_close_over.png,../assets/mac_close_over.png -include-file=mac_close_up.png,../assets/mac_close_up.png -include-file=mac_max_dis.png,../assets/mac_max_dis.png -include-file=mac_max_down.png,../assets/mac_max_down.png -include-file=mac_max_over.png,../assets/mac_max_over.png -include-file=mac_max_up.png,../assets/mac_max_up.png -include-file=mac_min_dis.png,../assets/mac_min_dis.png -include-file=mac_min_down.png,../assets/mac_min_down.png -include-file=mac_min_over.png,../assets/mac_min_over.png -include-file=mac_min_up.png,../assets/mac_min_up.png -include-file=win_close_down.png,../assets/win_close_down.png -include-file=win_close_over.png,../assets/win_close_over.png -include-file=win_close_up.png,../assets/win_close_up.png -include-file=w
 in_max_dis.png,../assets/win_max_dis.png -include-file=win_max_down.png,../assets/win_max_down.png -include-file=win_max_over.png,../assets/win_max_over.png -include-file=win_max_up.png,../assets/win_max_up.png -include-file=win_min_dis.png,../assets/win_min_dis.png -include-file=win_min_down.png,../assets/win_min_down.png -include-file=win_min_over.png,../assets/win_min_over.png -include-file=win_min_up.png,../assets/win_min_up.png -include-file=win_restore_down.png,../assets/win_restore_down.png -include-file=win_restore_over.png,../assets/win_restore_over.png -include-file=win_restore_up.png,../assets/win_restore_up.png -namespace=library://ns.adobe.com/flex/spark,../manifest.xml -include-namespaces=library://ns.adobe.com/flex/spark -resource-bundle-list=bundles.properties -library-path= -locale=" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPl
 ayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="0">
-      <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/air/airglobal.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/framework/bin/framework.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/airframework/bin/airframework.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/spark/bin/spark.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/mx/bin/mx.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="airspark.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+  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.
+
+-->
+<actionScriptProperties mainApplicationPath="airspark.as" projectUUID="e456729a-8257-4f21-9d3e-b510a8b315d6" version="6">
+  <compiler additionalCompilerArguments="-keep-as3-metadata=SkinPart -include-file=defaults.css,../defaults.css -include-file=gripper_up.png,../assets/gripper_up.png -include-file=mac_close_down.png,../assets/mac_close_down.png -include-file=mac_close_over.png,../assets/mac_close_over.png -include-file=mac_close_up.png,../assets/mac_close_up.png -include-file=mac_max_dis.png,../assets/mac_max_dis.png -include-file=mac_max_down.png,../assets/mac_max_down.png -include-file=mac_max_over.png,../assets/mac_max_over.png -include-file=mac_max_up.png,../assets/mac_max_up.png -include-file=mac_min_dis.png,../assets/mac_min_dis.png -include-file=mac_min_down.png,../assets/mac_min_down.png -include-file=mac_min_over.png,../assets/mac_min_over.png -include-file=mac_min_up.png,../assets/mac_min_up.png -include-file=win_close_down.png,../assets/win_close_down.png -include-file=win_close_over.png,../assets/win_close_over.png -include-file=win_close_up.png,../assets/win_close_up.png -include-file=w
 in_max_dis.png,../assets/win_max_dis.png -include-file=win_max_down.png,../assets/win_max_down.png -include-file=win_max_over.png,../assets/win_max_over.png -include-file=win_max_up.png,../assets/win_max_up.png -include-file=win_min_dis.png,../assets/win_min_dis.png -include-file=win_min_down.png,../assets/win_min_down.png -include-file=win_min_over.png,../assets/win_min_over.png -include-file=win_min_up.png,../assets/win_min_up.png -include-file=win_restore_down.png,../assets/win_restore_down.png -include-file=win_restore_over.png,../assets/win_restore_over.png -include-file=win_restore_up.png,../assets/win_restore_up.png -namespace=library://ns.adobe.com/flex/spark,../manifest.xml -include-namespaces=library://ns.adobe.com/flex/spark -resource-bundle-list=bundles.properties -library-path= -locale=" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPl
 ayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+    <compilerSourcePath/>
+    <libraryPath defaultLinkType="0">
+      <libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/air/airglobal.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="/framework/bin/framework.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="/airframework/bin/airframework.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="/spark/bin/spark.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="2" path="/mx/bin/mx.swc" useDefaultLinkType="false"/>
+    </libraryPath>
+    <sourceAttachmentPath/>
+  </compiler>
+  <applications>
+    <application path="airspark.as"/>
+  </applications>
+  <modules/>
+  <buildCSSFiles/>
+</actionScriptProperties>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airspark/.flexLibProperties
----------------------------------------------------------------------
diff --git a/frameworks/projects/airspark/.flexLibProperties b/frameworks/projects/airspark/.flexLibProperties
index d615697..cd30d19 100644
--- a/frameworks/projects/airspark/.flexLibProperties
+++ b/frameworks/projects/airspark/.flexLibProperties
@@ -1,22 +1,22 @@
-################################################################################
-##
-##  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.
-##
-################################################################################
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+  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.
+
+-->
 <flexLibProperties includeAllClasses="false" version="3">
   <includeClasses>
     <classEntry path="AIRSparkClasses"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airspark/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/airspark/build.xml b/frameworks/projects/airspark/build.xml
index 4d08c8a..b70c996 100644
--- a/frameworks/projects/airspark/build.xml
+++ b/frameworks/projects/airspark/build.xml
@@ -37,22 +37,12 @@
                 <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
                 
                 <compc fork="true"
-                       output="${FLEX_HOME}/frameworks/locale/@{locale}/airspark_rb.swc"
-                       locale="@{locale}">
-                    <target-player>${playerglobal.version}</target-player>
+                       output="${FLEX_HOME}/frameworks/locale/@{locale}/airspark_rb.swc">
                     <jvmarg line="${compc.jvm.args}"/>
-                    <include-resource-bundles bundle="core"/>
-                    <include-namespaces/>
-                    <include-classes/>
-                    <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
-                    <include-libraries/>
-                    <library-path/>
-                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                        <include name="${playerglobal.version}/playerglobal.swc"/>
-                    </external-library-path>
-                    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                        <include name="framework.swc"/> 
-                    </external-library-path>
+                    <load-config filename="bundle-config.xml" />
+                    <arg value="+playerglobal.version=${playerglobal.version}" />
+                    <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+                    <arg value="+locale=@{locale}" />
                 </compc>
             </sequential>
     </macrodef> 
@@ -196,29 +186,11 @@
             into the file bundles.properties in this directory.
         -->
         <compc fork="true"
-               output="${FLEX_HOME}/frameworks/libs/air/airspark.swc"
-               resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>${playerglobal.version}</target-player>
+               output="${FLEX_HOME}/frameworks/libs/air/airspark.swc">
             <jvmarg line="${compc.jvm.args}"/>
-            <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
-            <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
-            <include-classes>AIRSparkClasses</include-classes>
-            <source-path path-element="${basedir}/src"/>
-            <library-path/>
-            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
-                <include name="airglobal.swc"/>
-            </external-library-path>
-            <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="air/airframework.swc"/>
-                <include name="framework.swc"/>
-                <include name="mx/mx.swc"/>
-                <include name="spark.swc"/>
-                <include name="textLayout.swc"/>
-            </external-library-path>
-            <include-file name="defaults.css" path="${basedir}/defaults.css"/>
-            <locale/>
-                <keep-as3-metadata name="SkinPart"/>
-                <accessible>true</accessible>
+            <load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
         </compc>
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/projects/airspark/bundle-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/airspark/bundle-config.xml b/frameworks/projects/airspark/bundle-config.xml
new file mode 100644
index 0000000..41d18a1
--- /dev/null
+++ b/frameworks/projects/airspark/bundle-config.xml
@@ -0,0 +1,49 @@
+<!--
+
+  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>        
+        <external-library-path>
+            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+            <path-element>../../libs/framework.swc</path-element>
+        </external-library-path>
+        
+        <include-libraries/>
+        
+        <library-path/>
+        
+        <locale>
+            <locale-element>${locale}</locale-element>
+        </locale>
+        
+        <source-path>
+            <path-element>../framework/bundles/${locale}</path-element>
+        </source-path>
+    </compiler>
+    
+    <include-classes/>
+    
+    <include-namespaces/>
+    
+    <include-resource-bundles>
+        <bundle>core</bundle>
+    </include-resource-bundles>
+        
+    <target-player>${playerglobal.version}</target-player>
+</flex-config>