flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [10/18] git commit: [flex-sdk] [refs/heads/VF2JS] - To accommodate shims for both 's' and 'mx' namespaces, the original 'vf2js' namespace is now split: 'vf2js_s' for Spark shims and 'vf2js_mx' for MX shims.
Date Wed, 02 Jul 2014 14:17:55 GMT
To accommodate shims for both 's' and 'mx' namespaces, the original 'vf2js' namespace is now
split: 'vf2js_s' for Spark shims and 'vf2js_mx' for MX shims.

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


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

Branch: refs/heads/VF2JS
Commit: ec4a73f692f7d5791eff7ae93c285eed5988001a
Parents: 5dcda79
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Tue Jul 1 09:42:44 2014 +0200
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Tue Jul 1 09:42:44 2014 +0200

----------------------------------------------------------------------
 build.xml                                       |  9 ++-
 frameworks/build.xml                            | 20 ++++--
 frameworks/build_framework.xml                  | 66 +++++++++++++++-----
 frameworks/flex-config-template.xml             |  8 ++-
 frameworks/flex-config.xml                      |  8 ++-
 frameworks/projects/vf2js/build.xml             | 36 +++++------
 frameworks/projects/vf2js/bundle-config.xml     |  2 +-
 frameworks/projects/vf2js/compile-config.xml    |  4 +-
 frameworks/projects/vf2js/defaults.css          |  2 +-
 frameworks/projects/vf2js/manifest.xml          |  4 +-
 .../vf2js/src/vf2js/components/Application.as   |  2 +-
 .../vf2js/src/vf2js/components/Button.as        |  2 +-
 frameworks/vf2js-manifest.xml                   |  4 +-
 ide/flashbuilder/config/flex-config.xml         |  8 ++-
 14 files changed, 118 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7dd9b8d..a427303 100644
--- a/build.xml
+++ b/build.xml
@@ -468,8 +468,10 @@
 		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="experimental" build-number="${release.version}.${build.number.date}"/>		
 		<!-- mobile experimental RSL -->
 		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="experimental_mobile" build-number="${release.version}.${build.number.date}"/>
	
-		<!-- vf2js RSL -->
-		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="vf2js" build-number="${release.version}.${build.number.date}"/>		
+		<!-- vf2js_mx RSL -->
+		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="vf2js_mx" build-number="${release.version}.${build.number.date}"/>		
+		<!-- vf2js_s RSL -->
+		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs"
swc-name="vf2js_s" build-number="${release.version}.${build.number.date}"/>		
 	</target>
 
     <target name="other.locales" description="Build resource SWCs for additional locales">
@@ -953,7 +955,8 @@ There are no known issues.
                 <include name="advancedgrids.swc"/>
                 <include name="spark_dmv.swc"/>
             	<include name="textLayout.swc"/>
-                <include name="vf2js.swc"/>
+                <include name="vf2js_mx.swc"/>
+                <include name="vf2js_s.swc"/>
                 <exclude name="osmf.swc"/>
             </fileset>
         </copy>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 067ee9d..c582277 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -131,7 +131,8 @@
     	<antcall target="apache"/>
     	<antcall target="experimental"/>
     	<antcall target="experimental_mobile"/>
-    	<antcall target="vf2js"/>
+    	<antcall target="vf2js_mx"/>
+    	<antcall target="vf2js_s"/>
         <antcall target="compile-automation"/>
     </target>
 	
@@ -242,7 +243,8 @@
     	<ant dir="${basedir}/projects/apache" target="other.locales"/>
     	<ant dir="${basedir}/projects/experimental" target="other.locales"/>
     	<ant dir="${basedir}/projects/experimental_mobile" target="other.locales"/>
-    	<ant dir="${basedir}/projects/vf2js" target="other.locales"/>
+    	<ant dir="${basedir}/projects/vf2js_mx" target="other.locales"/>
+    	<ant dir="${basedir}/projects/vf2js_s" target="other.locales"/>
     </target>
     
     <target name="doc" >
@@ -272,7 +274,8 @@
     	<ant dir="${basedir}/projects/experimental_mobile" target="doc" />
         <!-- removed until this project gets proper documentation -->
         <!--
-        <ant dir="${basedir}/projects/vf2js" target="doc" />
+        <ant dir="${basedir}/projects/vf2js_mx" target="doc" />
+        <ant dir="${basedir}/projects/vf2js_s" target="doc" />
         -->
     </target>
    
@@ -312,7 +315,8 @@
     	<ant dir="${basedir}/projects/apache" target="clean"/>
     	<ant dir="${basedir}/projects/experimental" target="clean"/>
     	<ant dir="${basedir}/projects/experimental_mobile" target="clean"/>
-        <ant dir="${basedir}/projects/vf2js" target="clean"/>
+        <ant dir="${basedir}/projects/vf2js_mx" target="clean"/>
+        <ant dir="${basedir}/projects/vf2js_s" target="clean"/>
         <ant dir="${basedir}/javascript" target="clean"/>
     	<ant dir="${basedir}/themes/AeonGraphical" target="clean"/>
         <!-- delete the FlashBuilder executable directories -->
@@ -513,7 +517,11 @@
         <ant dir="${basedir}/projects/experimental_mobile"/>
     </target>
 	
-    <target name="vf2js" description="Clean build of vf2js.swc">
-        <ant dir="${basedir}/projects/vf2js"/>
+    <target name="vf2js_mx" description="Clean build of vf2js_mx.swc">
+        <ant dir="${basedir}/projects/vf2js_mx"/>
+    </target>
+	
+    <target name="vf2js_s" description="Clean build of vf2js_s.swc">
+        <ant dir="${basedir}/projects/vf2js_s"/>
     </target>
 </project>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/build_framework.xml
----------------------------------------------------------------------
diff --git a/frameworks/build_framework.xml b/frameworks/build_framework.xml
index d224ce3..5e253d0 100644
--- a/frameworks/build_framework.xml
+++ b/frameworks/build_framework.xml
@@ -60,7 +60,8 @@
 	<property name="experimental.dir" value="${projects.dir}/experimental"/>
     <property name="textLayout.dir" value="${projects.dir}/textLayout"/>
     <property name="experimental.dir" value="${projects.dir}/experimental"/>
-    <property name="vf2js.dir" value="${projects.dir}/vf2js"/>
+    <property name="vf2js_mx.dir" value="${projects.dir}/vf2js_mx"/>
+    <property name="vf2js_s.dir" value="${projects.dir}/vf2js_s"/>
 
     <!-- automation -->
     <property name="automation.dir" value="${projects.dir}/automation"/>
@@ -82,9 +83,9 @@
     
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar;${FLEX_HOME}/lib/flexTasks.jar"/>
 
-    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,textLayout,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,automation-swcs,bundles,themes,sparkskins,spark_dmv,apache,experimental,vf2js"/>
+    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,textLayout,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,automation-swcs,bundles,themes,sparkskins,spark_dmv,apache,experimental,vf2js_mx,vf2js_s"/>
 
-    <target name="bundles" depends="framework_rb,mx_rb,textLayout_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb,automation-rbs,apache_rb,experimental_rb,vf2js_rb"/>
+    <target name="bundles" depends="framework_rb,mx_rb,textLayout_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb,automation-rbs,apache_rb,experimental_rb,vf2js_mx_rb,vf2js_s_rb"/>
     
     <target name="automation-swcs" 
         depends="automation_agent,automation_dmv,tool,tool_air,automation,automation_air,automation_spark,automation_flashflexkit,automation_air,automation_airspark"
@@ -1070,11 +1071,11 @@
         </compc>
     </target>
 
-    <target name="vf2js" description="Builds the vf2js.swc">
+    <target name="vf2js_mx" description="Builds the vf2js_mx.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"
accessible="true" 
-            include-classes="VF2JSClasses" output="${basedir}/libs/vf2js.swc"
-            resource-bundle-list="${vf2js.dir}/bundles.properties">
-            <source-path path-element="${vf2js.dir}/src"/>
+            include-classes="VF2JSClasses" output="${basedir}/libs/vf2js_mx.swc"
+            resource-bundle-list="${vf2js_mx.dir}/bundles.properties">
+            <source-path path-element="${vf2js_mx.dir}/src"/>
             <library-path />
             <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
@@ -1089,13 +1090,48 @@
             <keep-as3-metadata name="Transient"/>
         </compc>
     </target>
+
+    <target name="vf2js_s" description="Builds the vf2js_s.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"
accessible="true" 
+            include-classes="VF2JSClasses" output="${basedir}/libs/vf2js_s.swc"
+            resource-bundle-list="${vf2js_s.dir}/bundles.properties">
+            <source-path path-element="${vf2js_s.dir}/src"/>
+            <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+            	<include name="mx.swc"/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${mx.dir}/defaults.css"/>
+            <jvmarg line="${compc.jvm.args}"/>
+            <keep-as3-metadata name="Bindable"/>
+            <keep-as3-metadata name="Managed"/>
+            <keep-as3-metadata name="ChangeEvent"/>
+            <keep-as3-metadata name="NonCommittingChangeEvent"/>
+            <keep-as3-metadata name="Transient"/>
+        </compc>
+    </target>
+    
+    <target name="vf2js_mx_rb" description="Builds default locale vf2js_mx_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"

+            output="${basedir}/locale/${locale}/vf2js_mx_rb.swc">
+            <include-resource-bundles bundle="vf2js_mx"/>
+            <source-path path-element="${vf2js_mx.dir}/bundles/${locale}"/>
+            <source-path path-element="${vf2js_mx.dir}/src"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>
     
-    <target name="vf2js_rb" description="Builds default locale vf2js_rb.swc">
+    <target name="vf2js_s_rb" description="Builds default locale vf2js_s_rb.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"

-            output="${basedir}/locale/${locale}/vf2js_rb.swc">
-            <include-resource-bundles bundle="vf2js"/>
-            <source-path path-element="${vf2js.dir}/bundles/${locale}"/>
-            <source-path path-element="${vf2js.dir}/src"/>
+            output="${basedir}/locale/${locale}/vf2js_s_rb.swc">
+            <include-resource-bundles bundle="vf2js_s"/>
+            <source-path path-element="${vf2js_s.dir}/bundles/${locale}"/>
+            <source-path path-element="${vf2js_s.dir}/src"/>
             <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
                 <include name="framework.swc"/>
@@ -1136,7 +1172,8 @@
                 <include name="flash-integration.swc"/>
             	<include name="apache.swc"/>
             	<include name="experimental.swc"/>	
-                <include name="vf2js.swc"/>	
+                <include name="vf2js_mx.swc"/>	
+                <include name="vf2js_s.swc"/>	
             </fileset>
             <fileset dir="${basedir}/libs/automation">
                 <include name="automation_agent.swc"/>
@@ -1173,7 +1210,8 @@
             	<include name="tool_air_rb.swc"/>
             	<include name="apache_rb.swc"/>
                 <include name="experimental_rb.swc"/>
-                <include name="vf2js_rb.swc"/>
+                <include name="vf2js_mx_rb.swc"/>
+                <include name="vf2js_s_rb.swc"/>
             </fileset>
         </delete>
         <delete dir="${basedir}/projects" includes="*/bundles.properties"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/flex-config-template.xml
----------------------------------------------------------------------
diff --git a/frameworks/flex-config-template.xml b/frameworks/flex-config-template.xml
index b0a65b5..300d2f9 100644
--- a/frameworks/flex-config-template.xml
+++ b/frameworks/flex-config-template.xml
@@ -112,8 +112,12 @@
             <manifest>experimental-manifest.xml</manifest>
          </namespace>
          <namespace>
-            <uri>http://flex.apache.org/vf2js/ns</uri>
-            <manifest>vf2js-manifest.xml</manifest>
+            <uri>http://flex.apache.org/vf2js_mx/ns</uri>
+            <manifest>vf2js_mx-manifest.xml</manifest>
+         </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/vf2js_s/ns</uri>
+            <manifest>vf2js_s-manifest.xml</manifest>
          </namespace>
       </namespaces>
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/flex-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml
index 5e71caa..7678771 100644
--- a/frameworks/flex-config.xml
+++ b/frameworks/flex-config.xml
@@ -112,8 +112,12 @@
             <manifest>experimental-manifest.xml</manifest>
          </namespace>
          <namespace>
-            <uri>http://flex.apache.org/vf2js/ns</uri>
-            <manifest>vf2js-manifest.xml</manifest>
+            <uri>http://flex.apache.org/vf2js_mx/ns</uri>
+            <manifest>vf2js_mx-manifest.xml</manifest>
+         </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/vf2js_s/ns</uri>
+            <manifest>vf2js_s-manifest.xml</manifest>
          </namespace>
       </namespaces>
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/build.xml b/frameworks/projects/vf2js/build.xml
index 40b9bc2..7608819 100644
--- a/frameworks/projects/vf2js/build.xml
+++ b/frameworks/projects/vf2js/build.xml
@@ -18,7 +18,7 @@
 
 -->
 
-<project name="vf2js" default="main" basedir=".">
+<project name="vf2js_s" default="main" basedir=".">
   <property name="FLEX_HOME" location="${basedir}/../../.."/>
   <property file="${FLEX_HOME}/env.properties"/>
   <property environment="env"/>
@@ -26,11 +26,11 @@
   <macrodef name="bundle">
     <attribute name="locale"/>
     <sequential>
-      <echo message="Compiling frameworks/locale/@{locale}/vf2js_rb.swc"/>
+      <echo message="Compiling frameworks/locale/@{locale}/vf2js_s_rb.swc"/>
       <!-- Load the <compc> task. We can't do this at the <project> level
-->
       <!-- because targets that run before flexTasks.jar gets built would fail. -->
       <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
-      <compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_rb.swc">
+      <compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_s_rb.swc">
         <jvmarg line="${compc.jvm.args}"/>
         <load-config filename="bundle-config.xml"/>
         <arg value="+playerglobal.version=${playerglobal.version}"/>
@@ -43,7 +43,7 @@
     <attribute name="locale"/>
     <sequential>
       <mkdir dir="${basedir}/bundles/@{locale}/docs"/>
-      <zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_rb.swc" update="true">
+      <zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_s_rb.swc" update="true">
         <zipfileset dir="${basedir}/bundles/@{locale}/docs" prefix="docs">
           <include name="*.*"/>
         </zipfileset>
@@ -58,8 +58,8 @@
     <sequential>
       <delete failonerror="false">
         <fileset dir="${FLEX_HOME}/frameworks/locale">
-          <include name="@{locale}/vf2js_rb.swc"/>
-          <include name="@{locale}/vf2js_rb.swc.incr"/>
+          <include name="@{locale}/vf2js_s_rb.swc"/>
+          <include name="@{locale}/vf2js_s_rb.swc.incr"/>
         </fileset>
       </delete>
     </sequential>
@@ -73,7 +73,7 @@
       <run.fat.swc/>
     </sequential>
   </macrodef>
-  <target name="main" depends="clean,compile" description="Clean build of vf2js.swc and
default locale">
+  <target name="main" depends="clean,compile" description="Clean build of vf2js_s.swc
and default locale">
     <bundle locale="${locale}"/>
   </target>
   <target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
@@ -91,21 +91,21 @@
         <include name="bundles/en_US/packages.dita"/>
       </fileset>
       <fileset dir="${FLEX_HOME}/frameworks/libs">
-        <include name="vf2js.swc"/>
-        <include name="vf2js.swc.incr"/>
+        <include name="vf2js_s.swc"/>
+        <include name="vf2js_s.swc.incr"/>
       </fileset>
     </delete>
   </target>
   <target name="bundles-clean">
     <delete failonerror="false">
       <fileset dir="${FLEX_HOME}/frameworks/locale">
-        <include name="*/vf2js_rb.swc"/>
-        <include name="*/vf2js_rb.swc.incr"/>
+        <include name="*/vf2js_s_rb.swc"/>
+        <include name="*/vf2js_s_rb.swc.incr"/>
       </fileset>
     </delete>
   </target>
-  <target name="compile" description="Compiles vf2js.swc">
-    <echo message="Compiling frameworks/libs/vf2js.swc"/>
+  <target name="compile" description="Compiles vf2js_s.swc">
+    <echo message="Compiling frameworks/libs/vf2js_s.swc"/>
     <!-- Load the <compc> task. We can't do this at the <project> level -->
     <!-- because targets that run before flexTasks.jar gets built would fail. -->
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -122,14 +122,14 @@
       Write a bundle list of referenced resource bundles
       into the file bundles.properties in this directory.
     -->
-    <compc fork="true" output="${FLEX_HOME}/frameworks/libs/vf2js.swc">
+    <compc fork="true" output="${FLEX_HOME}/frameworks/libs/vf2js_s.swc">
       <jvmarg line="${compc.jvm.args}"/>
       <load-config filename="compile-config.xml"/>
       <arg value="+playerglobal.version=${playerglobal.version}"/>
       <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}"/>
     </compc>
   </target>
-  <target name="doc" depends="clean-temp-docs" description="updates vf2js.swc with asdoc
xml">
+  <target name="doc" depends="clean-temp-docs" description="updates vf2js_s.swc with asdoc
xml">
     <!-- Load the <asdoc> task. We can't do this at the <project> level -->
     <!-- because targets that run before flexTasks.jar gets built would fail. -->
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -146,12 +146,12 @@
     <asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true"
skip-xsl="true" fork="true">
       <compiler.source-path path-element="${basedir}/src"/>
       <doc-classes class="ExperimentalClasses"/>
-      <namespace uri="http://flex.apache.org/vf2js/ns" manifest="${basedir}/manifest.xml"/>
+      <namespace uri="http://flex.apache.org/vf2js_s/ns" manifest="${basedir}/manifest.xml"/>
       <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/spark-manifest.xml"/>
       <jvmarg line="${asdoc.jvm.args}"/>
     </asdoc>
-    <!-- updates vf2js.swc with asdoc xml -->
-    <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/vf2js_rb.swc" update="true">
+    <!-- updates vf2js_s.swc with asdoc xml -->
+    <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/vf2js_s_rb.swc" update="true">
       <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
         <include name="*.*"/>
         <exclude name="ASDoc_Config.xml"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/bundle-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/bundle-config.xml b/frameworks/projects/vf2js/bundle-config.xml
index deac1e8..3604b7a 100644
--- a/frameworks/projects/vf2js/bundle-config.xml
+++ b/frameworks/projects/vf2js/bundle-config.xml
@@ -38,7 +38,7 @@
   <include-classes/>
   <include-namespaces/>
   <include-resource-bundles>
-    <bundle>vf2js</bundle>
+    <bundle>vf2js_s</bundle>
   </include-resource-bundles>
   <target-player>${playerglobal.version}</target-player>
 </flex-config>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/compile-config.xml b/frameworks/projects/vf2js/compile-config.xml
index d06e6d9..a297b33 100644
--- a/frameworks/projects/vf2js/compile-config.xml
+++ b/frameworks/projects/vf2js/compile-config.xml
@@ -38,7 +38,7 @@
     <library-path/>
     <namespaces>
       <namespace>
-        <uri>http://flex.apache.org/vf2js/ns</uri>
+        <uri>http://flex.apache.org/vf2js_s/ns</uri>
         <manifest>manifest.xml</manifest>
       </namespace>
     </namespaces>
@@ -49,7 +49,7 @@
     <warn-no-constructor>false</warn-no-constructor>
   </compiler>
   <include-namespaces>
-    <uri>http://flex.apache.org/vf2js/ns</uri>
+    <uri>http://flex.apache.org/vf2js_s/ns</uri>
   </include-namespaces>
   <include-classes>
     <class>VF2JSClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/defaults.css b/frameworks/projects/vf2js/defaults.css
index 3fa47db..5fe436b 100644
--- a/frameworks/projects/vf2js/defaults.css
+++ b/frameworks/projects/vf2js/defaults.css
@@ -17,5 +17,5 @@
 *
 */
 
-@namespace "http://flex.apache.org/vf2js/ns";
+@namespace vf2js_s "http://flex.apache.org/vf2js_s/ns";
 @namespace s "library://ns.adobe.com/flex/spark";

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/manifest.xml b/frameworks/projects/vf2js/manifest.xml
index 41059d7..7bf4f16 100644
--- a/frameworks/projects/vf2js/manifest.xml
+++ b/frameworks/projects/vf2js/manifest.xml
@@ -25,6 +25,6 @@
 -->
 
 <componentPackage>
-  <component id="Application" class="vf2js.components.Application"/>
-  <component id="Button" class="vf2js.components.Button"/>
+  <component id="Application" class="vf2js_s.components.Application"/>
+  <component id="Button" class="vf2js_s.components.Button"/>
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/src/vf2js/components/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/src/vf2js/components/Application.as b/frameworks/projects/vf2js/src/vf2js/components/Application.as
index 4e6ce89..51e3fd9 100644
--- a/frameworks/projects/vf2js/src/vf2js/components/Application.as
+++ b/frameworks/projects/vf2js/src/vf2js/components/Application.as
@@ -17,7 +17,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package vf2js.components
+package vf2js_s.components
 {
 
 public class Application

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/projects/vf2js/src/vf2js/components/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js/src/vf2js/components/Button.as b/frameworks/projects/vf2js/src/vf2js/components/Button.as
index 6c6cae7..1b66982 100644
--- a/frameworks/projects/vf2js/src/vf2js/components/Button.as
+++ b/frameworks/projects/vf2js/src/vf2js/components/Button.as
@@ -17,7 +17,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package vf2js.components
+package vf2js_s.components
 {
     
 public class Button

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/frameworks/vf2js-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/vf2js-manifest.xml b/frameworks/vf2js-manifest.xml
index 41059d7..7bf4f16 100644
--- a/frameworks/vf2js-manifest.xml
+++ b/frameworks/vf2js-manifest.xml
@@ -25,6 +25,6 @@
 -->
 
 <componentPackage>
-  <component id="Application" class="vf2js.components.Application"/>
-  <component id="Button" class="vf2js.components.Button"/>
+  <component id="Application" class="vf2js_s.components.Application"/>
+  <component id="Button" class="vf2js_s.components.Button"/>
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ec4a73f6/ide/flashbuilder/config/flex-config.xml
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/config/flex-config.xml b/ide/flashbuilder/config/flex-config.xml
index 7caacbe..5301899 100644
--- a/ide/flashbuilder/config/flex-config.xml
+++ b/ide/flashbuilder/config/flex-config.xml
@@ -112,8 +112,12 @@
             <manifest>experimental-manifest.xml</manifest>
          </namespace>
          <namespace>
-            <uri>http://flex.apache.org/vf2js/ns</uri>
-            <manifest>vf2js-manifest.xml</manifest>
+            <uri>http://flex.apache.org/vf2js_mx/ns</uri>
+            <manifest>vf2js_mx-manifest.xml</manifest>
+         </namespace>
+         <namespace>
+            <uri>http://flex.apache.org/vf2js_s/ns</uri>
+            <manifest>vf2js_s-manifest.xml</manifest>
          </namespace>
       </namespaces>
 


Mime
View raw message