This is an automated email from the ASF dual-hosted git repository. hiedra pushed a commit to branch examples/TDJ_localresources in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 99304eed73b4f37eb1720f621662f1ebe6f4ee04 Author: Josh Tynjala <[email protected]> AuthorDate: Wed Mar 26 14:31:37 2025 -0700 Basic: reorganize assets --- .../BasicJS/src/main/config/compile-js-config.xml | 4 ++-- frameworks/projects/Basic/asconfig.json | 4 ++-- frameworks/projects/Basic/pom.xml | 4 ++-- frameworks/projects/Basic/rat-excludes.txt | 25 ++++++++++++++++--- .../assembly/css/dialog-polyfill/0.4.9/LICENSE | 27 --------------------- .../assembly/scripts/dialog-polyfill/0.4.9/LICENSE | 27 --------------------- .../dialog-polyfill/0.4.9/LICENSE-dialog-polyfill | 28 ++++++++++++++++++++++ .../dialog-polyfill/0.4.9/dialog-polyfill.min.css | 0 .../dialog-polyfill/0.4.9/dialog-polyfill.min.js | 0 .../org/apache/royale/html/util/DialogPolyfill.as | 12 ---------- 10 files changed, 56 insertions(+), 75 deletions(-) diff --git a/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml b/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml index 631a55d27c..0dfa21b30a 100644 --- a/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/projects/BasicJS/src/main/config/compile-js-config.xml @@ -105,11 +105,11 @@ <js-vector-index-checks>false</js-vector-index-checks> <js-include-script> - <path-element>../../../../../../projects/Basic/src/main/assembly/scripts/dialog-polyfill/0.4.9/dialog-polyfill.min.js</path-element> + <path-element>../../../../../../projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.js</path-element> </js-include-script> <js-include-css> - <path-element>../../../../../../projects/Basic/src/main/assembly/css/dialog-polyfill/0.4.9/dialog-polyfill.min.css</path-element> + <path-element>../../../../../../projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.css</path-element> </js-include-css> diff --git a/frameworks/projects/Basic/asconfig.json b/frameworks/projects/Basic/asconfig.json index 69a69a5844..09730c2fac 100644 --- a/frameworks/projects/Basic/asconfig.json +++ b/frameworks/projects/Basic/asconfig.json @@ -34,7 +34,7 @@ "output": "target/Basic.swc" }, "additionalOptions": [ - "-js-include-script+=src/main/assembly/scripts/dialog-polyfill/0.4.9/dialog-polyfill.min.js", - "-js-include-css+=src/main/assembly/css/dialog-polyfill/0.4.9/dialog-polyfill.min.css" + "-js-include-script+=src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.js", + "-js-include-css+=src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.css" ] } \ No newline at end of file diff --git a/frameworks/projects/Basic/pom.xml b/frameworks/projects/Basic/pom.xml index b84a44635e..a19be2d371 100644 --- a/frameworks/projects/Basic/pom.xml +++ b/frameworks/projects/Basic/pom.xml @@ -70,8 +70,8 @@ <additionalCompilerOptions> ${project.compiler.options}; -compiler.fxg-base-class=flash.display.Sprite; - -js-include-script+=${project.basedir}/src/main/assembly/scripts/dialog-polyfill/0.4.9/dialog-polyfill.min.js - -js-include-css+=${project.basedir}/src/main/assembly/css/dialog-polyfill/0.4.9/dialog-polyfill.min.css; + -js-include-script+=${project.basedir}/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.js + -js-include-css+=${project.basedir}/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.css; </additionalCompilerOptions> </configuration> </plugin> diff --git a/frameworks/projects/Basic/rat-excludes.txt b/frameworks/projects/Basic/rat-excludes.txt index ce2fa1af72..5a635504c8 100644 --- a/frameworks/projects/Basic/rat-excludes.txt +++ b/frameworks/projects/Basic/rat-excludes.txt @@ -1,3 +1,22 @@ -src/main/assembly/css/dialog-polyfill/0.4.9/dialog-polyfill.min.css -src/main/assembly/scripts/dialog-polyfill/0.4.9/dialog-polyfill.min.js -rat-excludes.txt \ No newline at end of file +################################################################################ +## +## 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. +## +################################################################################ + +# dialog-polyfill is BSD-3-Clause +src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.css +src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.js \ No newline at end of file diff --git a/frameworks/projects/Basic/src/main/assembly/css/dialog-polyfill/0.4.9/LICENSE b/frameworks/projects/Basic/src/main/assembly/css/dialog-polyfill/0.4.9/LICENSE deleted file mode 100644 index 3d0f7d3edf..0000000000 --- a/frameworks/projects/Basic/src/main/assembly/css/dialog-polyfill/0.4.9/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/frameworks/projects/Basic/src/main/assembly/scripts/dialog-polyfill/0.4.9/LICENSE b/frameworks/projects/Basic/src/main/assembly/scripts/dialog-polyfill/0.4.9/LICENSE deleted file mode 100644 index 3d0f7d3edf..0000000000 --- a/frameworks/projects/Basic/src/main/assembly/scripts/dialog-polyfill/0.4.9/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/LICENSE-dialog-polyfill b/frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/LICENSE-dialog-polyfill new file mode 100644 index 0000000000..7fe729128b --- /dev/null +++ b/frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/LICENSE-dialog-polyfill @@ -0,0 +1,28 @@ + +Copyright (c) 2013 The Chromium Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/frameworks/projects/Basic/src/main/assembly/css/dialog-polyfill/0.4.9/dialog-polyfill.min.css b/frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.css similarity index 100% rename from frameworks/projects/Basic/src/main/assembly/css/dialog-polyfill/0.4.9/dialog-polyfill.min.css rename to frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.css diff --git a/frameworks/projects/Basic/src/main/assembly/scripts/dialog-polyfill/0.4.9/dialog-polyfill.min.js b/frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.js similarity index 100% rename from frameworks/projects/Basic/src/main/assembly/scripts/dialog-polyfill/0.4.9/dialog-polyfill.min.js rename to frameworks/projects/Basic/src/main/resources/assets/dialog-polyfill/0.4.9/dialog-polyfill.min.js diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as index 93c28c6300..111ba54498 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as @@ -21,18 +21,6 @@ package org.apache.royale.html.util COMPILE::JS public class DialogPolyfill { - /* - * <inject_script> - * var script = document.createElement("script"); - * script.setAttribute("src", "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.js";); - * document.head.appendChild(script) - * var link = document.createElement("link"); - * link.setAttribute("rel", "stylesheet"); - * link.setAttribute("type", "text/css"); - * link.setAttribute("href", "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.css";); - * document.head.appendChild(link); - * </inject_script> - */ public function DialogPolyfill(){} public static function registerDialog(dialog:Element):void
