use include-classes or include-sources for both js and as compiles. Also clean up a few other things for consistency
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a4b0865b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a4b0865b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a4b0865b Branch: refs/heads/develop Commit: a4b0865b0ae539597542db5c2a8282cb9a9ac72d Parents: 6e31311 Author: Alex Harui <aha...@apache.org> Authored: Wed May 11 17:55:25 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed May 11 17:55:25 2016 -0700 ---------------------------------------------------------------------- .../src/main/config/compile-js-config.xml | 6 +- .../src/main/config/compile-js-config.xml | 13 ++- .../HTML5/src/main/config/compile-js-config.xml | 15 ++- .../src/main/config/compile-js-config.xml | 2 +- .../Core/src/main/flex/CoreJSClasses.as | 99 -------------------- .../HTML5/src/main/resources/html5-manifest.xml | 1 + 6 files changed, 26 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b0865b/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml index 8a8909e..a56c1e2 100644 --- a/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml @@ -65,9 +65,9 @@ <include-file> </include-file> - <include-sources> - <path-element>../../../../../../../projects/Binding/src/main/flex</path-element> - </include-sources> + <include-classes> + <class>BindingClasses</class> + </include-classes> <include-namespaces> <uri>library://ns.apache.org/flexjs/basic</uri> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b0865b/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml index 729d0b2..c009150 100644 --- a/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml @@ -48,6 +48,13 @@ <path-element>../../../../../libs/CoreJS.swc</path-element> </library-path> + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../../../../../../../projects/Collections/src/main/resources/basic-manifest.xml</manifest> + </namespace> + </namespaces> + <source-path> <path-element>../../../../../../../projects/Collections/src/main/flex</path-element> </source-path> @@ -55,9 +62,9 @@ <warn-no-constructor>false</warn-no-constructor> </compiler> - <include-sources> - <path-element>../../../../../../../projects/Collections/src/main/flex</path-element> - </include-sources> + <include-classes> + <class>CollectionsClasses</class> + </include-classes> <include-namespaces> <uri>library://ns.apache.org/flexjs/basic</uri> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b0865b/frameworks/js/FlexJS/projects/HTML5/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/HTML5/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTML5/src/main/config/compile-js-config.xml index 3cdae0b..a320c65 100644 --- a/frameworks/js/FlexJS/projects/HTML5/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/HTML5/src/main/config/compile-js-config.xml @@ -49,6 +49,13 @@ <path-element>../../../../../libs/HTMLJS.swc</path-element> </library-path> + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/html5</uri> + <manifest>../../../../../../../projects/HTML5/src/main/resources/html5-manifest.xml</manifest> + </namespace> + </namespaces> + <source-path> <path-element>../../../../../../../projects/HTML5/src/main/flex</path-element> </source-path> @@ -56,10 +63,10 @@ <warn-no-constructor>false</warn-no-constructor> </compiler> - <include-sources> - <path-element>../../../../../../../projects/HTML5/src/main/flex</path-element> - </include-sources> - + <include-classes> + <class>HTML5Classes</class> + </include-classes> + <include-namespaces> <uri>library://ns.apache.org/flexjs/html5</uri> </include-namespaces> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b0865b/frameworks/js/FlexJS/projects/JQuery/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/JQuery/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/JQuery/src/main/config/compile-js-config.xml index 95e29da..5892898 100644 --- a/frameworks/js/FlexJS/projects/JQuery/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/JQuery/src/main/config/compile-js-config.xml @@ -73,7 +73,7 @@ </include-sources> <include-classes> - <class>HTMLClasses</class> + <class>JQueryClasses</class> </include-classes> <include-namespaces> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b0865b/frameworks/projects/Core/src/main/flex/CoreJSClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/CoreJSClasses.as b/frameworks/projects/Core/src/main/flex/CoreJSClasses.as deleted file mode 100644 index 6bb95de..0000000 --- a/frameworks/projects/Core/src/main/flex/CoreJSClasses.as +++ /dev/null @@ -1,99 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package -{ - -/** - * @private - * This class is used to link additional classes into rpc.swc - * beyond those that are found by dependency analysis starting - * from the classes specified in manifest.xml. - */ -internal class CoreJSClasses -{ - import org.apache.flex.core.BeadViewBase; BeadViewBase; - import org.apache.flex.core.BrowserWindow; BrowserWindow; - import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory; - import org.apache.flex.core.FilledRectangle; FilledRectangle; - import org.apache.flex.core.IAlertModel; IAlertModel; - import org.apache.flex.core.IBead; IBead; - import org.apache.flex.core.IBeadController; IBeadController; - import org.apache.flex.core.IBeadLayout; IBeadLayout; - import org.apache.flex.core.IBeadModel; IBeadModel; - import org.apache.flex.core.IBeadView; IBeadView; - //import org.apache.flex.core.IBorderModel; IBorderModel; - import org.apache.flex.core.IChild; IChild; - import org.apache.flex.core.IChrome; IChrome; - import org.apache.flex.core.IComboBoxModel; IComboBoxModel; - import org.apache.flex.core.IContainer; IContainer; - import org.apache.flex.core.IContentView; IContentView; - import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper; - import org.apache.flex.core.IDocument; IDocument; - import org.apache.flex.core.IFormatBead; IFormatBead; - //import org.apache.flex.core.IImageModel; IImageModel; - import org.apache.flex.core.ILayoutChild; ILayoutChild; - import org.apache.flex.core.ILayoutHost; ILayoutHost; - import org.apache.flex.core.IPanelModel; IPanelModel; - import org.apache.flex.core.IParent; IParent; - import org.apache.flex.core.IParentIUIBase; IParentIUIBase; - import org.apache.flex.core.IPopUp; IPopUp; - import org.apache.flex.core.IRollOverModel; IRollOverModel; - //import org.apache.flex.core.IScrollBarModel; IScrollBarModel; - import org.apache.flex.core.ISelectableItemRenderer; ISelectableItemRenderer; - import org.apache.flex.core.ISelectionModel; ISelectionModel; - import org.apache.flex.core.IStrand; IStrand; - import org.apache.flex.core.IStrandWithModel; IStrandWithModel; - import org.apache.flex.core.ITextModel; ITextModel; - import org.apache.flex.core.ITitleBarModel; ITitleBarModel; - import org.apache.flex.core.IToggleButtonModel; IToggleButtonModel; - import org.apache.flex.core.IUIBase; IUIBase; - import org.apache.flex.core.IValueToggleButtonModel; IValueToggleButtonModel; - import org.apache.flex.core.IViewport; IViewport; - import org.apache.flex.core.IViewportModel; IViewportModel; - //import org.apache.flex.core.IViewportScroller; IViewportScroller; - import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl; - import org.apache.flex.core.DataBindingBase; DataBindingBase; - import org.apache.flex.core.UIBase; UIBase; - //import org.apache.flex.core.UIButtonBase; UIButtonBase; - import org.apache.flex.events.CustomEvent; CustomEvent; - import org.apache.flex.events.Event; Event; - import org.apache.flex.events.EventDispatcher; EventDispatcher; - import org.apache.flex.events.IEventDispatcher; IEventDispatcher; - import org.apache.flex.events.MouseEvent; MouseEvent; - import org.apache.flex.events.ValueEvent; ValueEvent; - import org.apache.flex.events.utils.MouseUtils; MouseUtils; - import org.apache.flex.geom.Point; Point; - import org.apache.flex.geom.Rectangle; Rectangle; - import org.apache.flex.utils.BinaryData; BinaryData; - import org.apache.flex.utils.EffectTimer; EffectTimer; - import org.apache.flex.utils.MixinManager; MixinManager; - //import org.apache.flex.utils.PNGEncoder; PNGEncoder; - //import org.apache.flex.utils.StringTrimmer; StringTrimmer; - import org.apache.flex.utils.Timer; Timer; - import org.apache.flex.utils.UIUtils; UIUtils; - - import org.apache.flex.core.ClassFactory; ClassFactory; - import org.apache.flex.states.AddItems; AddItems; - import org.apache.flex.states.SetEventHandler; SetEventHandler; - import org.apache.flex.states.SetProperty; SetProperty; - import org.apache.flex.states.State; State; -} - -} - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4b0865b/frameworks/projects/HTML5/src/main/resources/html5-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/src/main/resources/html5-manifest.xml b/frameworks/projects/HTML5/src/main/resources/html5-manifest.xml index bb0a281..1826767 100644 --- a/frameworks/projects/HTML5/src/main/resources/html5-manifest.xml +++ b/frameworks/projects/HTML5/src/main/resources/html5-manifest.xml @@ -22,6 +22,7 @@ <componentPackage> + <component id="Button" class="org.apache.flex.html5.Button"/> <component id="Label" class="org.apache.flex.html5.Label"/> <component id="TextButton" class="org.apache.flex.html5.TextButton"/> <component id="TextInput" class="org.apache.flex.html5.TextInput"/>