You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/04/21 13:44:55 UTC

[10/10] git commit: [flex-asjs] [refs/heads/feature/maven-migration] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature/maven-migration

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature/maven-migration


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

Branch: refs/heads/feature/maven-migration
Commit: b9e1b5e29b26b076323229d62948e2849e72f062
Parents: b2f5d12 9a52f49
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Apr 21 09:30:56 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Apr 21 09:30:56 2016 +0200

----------------------------------------------------------------------
 examples/flexjs/CreateJSExample/build.xml       |  45 ++
 examples/flexjs/CreateJSExample/pom.xml         |  50 ++
 .../CreateJSExample/src/CreateJSExample.mxml    |  42 ++
 examples/flexjs/CreateJSExample/src/README.txt  |  26 +
 .../CreateJSExample/src/models/MyModel.as       |  34 +
 .../flexjs/FlexWebsiteStatsViewer/build.xml     |   4 +-
 .../FlexWebsiteStatsViewer/src/StatsView.mxml   |  26 +-
 .../flex/org/apache/flex/core/UIButtonBase.as   |   2 +
 .../src/main/config/compile-asjs-config.xml     |   1 +
 .../CreateJS/src/main/config/compile-config.xml |   1 +
 .../CreateJS/src/main/flex/CreateJSClasses.as   |   3 +
 .../org/apache/flex/createjs/Application.as     | 331 ++++++++-
 .../flex/org/apache/flex/createjs/CheckBox.as   | 156 ++++-
 .../flex/org/apache/flex/createjs/Container.as  | 301 +++++++++
 .../main/flex/org/apache/flex/createjs/Label.as | 150 ++++-
 .../flex/org/apache/flex/createjs/TextButton.as | 195 ++++--
 .../apache/flex/createjs/core/CreateJSBase.as   | 164 +++++
 .../org/apache/flex/createjs/core/UIBase.as     | 675 +++++++++++++------
 .../flex/org/apache/flex/createjs/core/View.as  | 325 +++++++++
 .../org/apache/flex/createjs/core/ViewBase.as   | 206 ------
 .../org/apache/flex/createjs/graphics/Circle.as |  94 +++
 .../flex/createjs/graphics/GraphicShape.as      |  76 +++
 .../org/apache/flex/createjs/graphics/Rect.as   |  93 +++
 .../src/main/resources/createjs-manifest.xml    |   8 +-
 .../CreateJS/src/main/resources/defaults.css    |  21 +-
 25 files changed, 2470 insertions(+), 559 deletions(-)
----------------------------------------------------------------------


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

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