svn commit: r56231 [2/2] - /release/flex/KEYS
Modified: release/flex/KEYS == --- release/flex/KEYS (original) +++ release/flex/KEYS Wed Aug 10 14:24:49 2022 @@ -241,10 +241,10 @@ Q96oD9lJJ/uXMjjXLnyp35MHRfAPMfmuBL0s9rRS =Kaki -END PGP PUBLIC KEY BLOCK- pub 4096R/458BCC72 2013-03-09 -uid Frédéric THOMAS -sig 3458BCC72 2013-03-09 Frédéric THOMAS +uid Fr??ic THOMAS +sig 3458BCC72 2013-03-09 Fr??ic THOMAS sub 4096R/D43D84D5 2013-03-09 -sig 458BCC72 2013-03-09 Frédéric THOMAS +sig 458BCC72 2013-03-09 Fr??ic THOMAS -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v2.0.17 (MingW32) @@ -472,3 +472,5796 @@ AA5kBssMJqOIOVF5KZsafBSW3OG7xbmF/hNA6cJM ZGs7Ibn/LbgXcM6jdzDFLOHfulZ/ =GBzo -END PGP PUBLIC KEY BLOCK- + +pub rsa4096 2014-09-05 [SC] + F156813FF315007E36BA6C13089127C15C60D6B9 +uid[ ultimativ ] Christofer Dutz (Apache Comitter) +sig 3089127C15C60D6B9 2014-09-05 Christofer Dutz (Apache Comitter) +sig 9DAADC1C9FCC82D0 2015-07-27 Benedikt Ritter (CODE SIGNING KEY) +sig 3E0F28593AEEAD151 2014-11-19 Justin Mclean +sig 388F3CF4C22D7F6EC 2015-07-27 Hendrik Saly +sig 37903F81190910A83 2015-07-27 Hendrik Saly +sig 3ED74488A5707E66B 2017-07-23 Christofer Dutz +uid[ ultimativ ] [jpeg image of size 272202] +sig 3089127C15C60D6B9 2015-07-27 Christofer Dutz (Apache Comitter) +sig 3ED74488A5707E66B 2017-07-23 Christofer Dutz +sub rsa4096 2014-09-05 [E] +sig 089127C15C60D6B9 2014-09-05 Christofer Dutz (Apache Comitter) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFQJ9kwBEAC8+epn6+DNDhx7COxuqtcYeL498od+9wiEDt7fTFX2lQpDzH3e +OI41Dxtlw/2s2guoVvw3cu9PzrI4NCvfWPRMzUhzpOr8wIRURFy+rJ3Xoh4GnASD +GKtLMRt2XTDmIGSPR+EiKm3TGA89dgrG+DF4Bsf+4kpHRvUzWmtlx1Gwf8GpHGIu +Db9J5A2VTg9QqdsQS1lX2Z1NvDkFMC2BEJQDKwAii+wpZ6Ld57MOAJeDVCyG2Tpb +FwgmkggQHxnBmA30ZJrVqLnkaWch10q7mCIHv87l1c0EiGnGKE8MtY3H+Ko6Dt2q +eYEzkn7sR759M42+BNBkK0u4t3j+fxkA+p61dc+6ovMdBzRKXD319HDJjGNJ6ouU +L8KDaSwxN6e3mKtNi+zb6SPpZ17pyS9t0QbT7rIHlkX47aMWIp+jBWXL9gGQeBMx +YhLfoS5Kqq4TSCxtGwFF1q/xd3DA6lfcCp6B4ePOM7pPd2+uowRXyJPRRTowHtXE +HzTj9VTmO08pDd4iqivTQ3YLJdEAlx07VrND8MERG+4SEiiyWWIM7aT2m0K79Fg8 +cDue73isiZ+jmmI0tqe2AJLlhhl3L3Co2VeoLFu1TQuCScK6T8RsKfQ1/h0P6hkQ +w1a0A84S+klBM8LZPXbsYgBMSpwdFQmgc6hY3O2YaY6+3eVT1VxUU26bGQARAQAB +tDRDaHJpc3RvZmVyIER1dHogKEFwYWNoZSBDb21pdHRlcikgPGNkdXR6QGFwYWNo +ZS5vcmc+iQI3BBMBCgAhBQJUCfZMAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheA +AAoJEAiRJ8FcYNa5W2UQAIzN8wjHGwNPBc+AmlOwfuV3RGIxkp01Uhy8fSzPXcbo +N6Cbg8rjPf3VyZ8sj57JrKIjGP5Dpgw6WNUFLqucTxJZhZLSN12+5u3c+B/bALLa +IqjDPRw+IecYaTZdEGncWaLdMK7Tp6AOSZWgTr5wUVxLWjdeLfDc6AbF0PsA5DRQ +BxxRh/1MzEd7CwPyuIEqRpDhwzo684M3vXhOQL2fVsu0ja/NYz+73z8CJItD2Jtz +LlVLrmnsw0SVO93dxUDAQgkzrj9Mymek+KH9hMl0ucT0TT4yXIT91gKpg6yWmHVY +vrbQSwu8jMzuOxOHwpBHEL3BAAzlUA5DxKTGQBJS7YzkZr4iUT+Lm6CgPlJcxNu4 +eP82gT6YDtm5jLflY7UklIvPTWqBc9y93h6Z3VoaMBqGgPqtbmOVG5axBXajaVVU +BZs14KPZozQ0cAGZR7/379IsCymSTkd2LzM3c6c5k4Cgz0Ctlv78vid/1vtHZNCk +XeOlIFU6he1UU3ldsq7eyJ9+rm9RwQV9RvV4OgQUBgcZUtegjKQCJL1vGSJZQSqV +US2P43gbNcyBozypbW9C5KZBdeyIKes6mofA+E1zlkBzxMstg1xRRICwssn2PqB4 +uzxM1oh5b4uCY09XPKHe/OJ15R62xTNBnHqQIo9LrKh5UjYt1GIlMUOIxV15GGKY +iQIcBBABCgAGBQJVthI5AAoJEJ2q3ByfzILQDZIQAMLQ+f3ZUnxHd08EuelCZ0p+ +JD4/aAi6c/6j+hx7qSKTtMVslsRut12lsLmhY7UwZbJjxQXqREEEothe0gQwmb9W +elvs2TLcnFRCA/HBdVd9S0AmwRJFPBemqImtSe8f3R+J2EBfcwiK6MPSf3QxyAMz +is26dzFy24lMRii4zczZLYJg71w75Y/7GBf6ps6gp+X18wxKsypLntL0uo6MOM63 +Qr4fGD1OpA/Lh08d+mdVkR+GPemoY6p71zWjyqzgV4bwdmNGut5BdT0z9r0kqEbb +DkEQJnAeFCcyVMvs44YrKSZWwssrMnyHfdiXy9twO1H3CzXOelhAYJeDAf5rro0T ++Pzc/hJIy3NryBEtS02/J0F5g8utl5K2bG4WtjUSamDDoCQACPJOkOoR4QXCF2/m +e84tD6g9uVSg9A2sdHLt3swi/VeVvODj28x8flqU5tGE0Jtk/o2tMj3B4wdoSIjZ +Qm92vTrHDt4bxBlMkfZ7tD98WeZFFDd8yfNymTlsQLOnHuosRXtH0AL9Z5CJT48d +EDyiDRiOnprEnuAvRk00AlAixd/ktLOz200bX5WK+8xX9w/p6IVyodNCA79xAa3Z +qdEnc/oVDVBV9UD0kqDWyFoW4lU/ENZMHaSUFGkoL5mv4fWiLhn5Nqu8lhie+WWE +8rIXFFrji0qLbWvHUTheiQIcBBMBCgAGBQJUbHLbAAoJEODyhZOu6tFRzMEP/i+b +QDKBSj6DpdGQr7AbeccJ/cMX2WLhyWcCKpEttvvu3g9UhqcWezdjd3lJVtYAX7zE +iae4Is1BUnAZW3gzRB8IO3NCGipc9QD9Wu3DbSY6xLG0w2GvDz9w4E3CNijN3TN0 +8SLXqxDxEyz2CHXCI1iNPEbVtnaOCU8u6RhYaQqMwJcb3KrNZi8mx7JhEgMmWXmZ +ZuzjH5Yp3NoW9ZXLBWYMMUZqcCM3/oyWVIR4p4l+Yrjh0hYMdNoQeZGO6p9BC6wK +zZq5pa+d8pXV/y5K6tlox1y2ehIHTBwpDacbpEjXPZtCl4xMlxaqJNrbUQ8/dE+0 +xTDHa1EL4HYlWCHSLjllFAYxDpXR6YPWgvTi6vEFNX0vW3nkiyC0FIG3kxAn0v5o +yql2NNTq1rThE+Nol6YcUh30zsA20a+xsx+8U5Fbgtlf1R+0+mGSJ++2OCQVb5U0 +lnuwH5f+d6+cbz2MshmTi2v13+WvoICMH21Oiy3GsL4C2GTm2kn8lU1eqSCb+mlc +x04Vt7c4RBJJsuk222MaL86huebuW9v0oZJff6SpuHKPBGCFjCt9yVjWprDLPTx0 +RBrwEmrOIeIAWOiTMa4j+MIEkB8ezLHLBWh394tuIpX79TITkqP4ICX6V6NWXTk4 +7dK5Ib+BLmMLAZ9+sRfq1gWRU7h0+NI8o1qdgiI3iEYEExECAAYFAlW2FxAACgkQ +iPPPTCLX9uzl5ACeOPjk/yuoEoWmBvl5hwZjH9vAT88An0yreBBhX0ZDB12Ijxnh +rVsDe+6oiQEcBBMBCAAGBQJVthb/AAoJEHkD+BGQkQqDmMsH/3/EDrxaNbCovO3v
svn commit: r56231 [1/2] - /release/flex/KEYS
Author: cdutz Date: Wed Aug 10 14:24:49 2022 New Revision: 56231 Log: Added my key to the KEYS file Modified: release/flex/KEYS
[flex-blazeds] branch security-updates created (now 125c935)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch security-updates in repository https://gitbox.apache.org/repos/asf/flex-blazeds.git at 125c935 - Updated most external dependencies and plugins - Updated to the most recent apache parent pom - Added the rat plugin to check for missing header (and added the missing headers) - Added the OWASP plugin to check for vulnerable dependencies (And managed the false positives) - Commented out the spring-boot-starter and all tomcat modules as they are extremely CVE affected and no invulnerable versions were available This branch includes the following new commits: new 125c935 - Updated most external dependencies and plugins - Updated to the most recent apache parent pom - Added the rat plugin to check for missing header (and added the missing headers) - Added the OWASP plugin to check for vulnerable dependencies (And managed the false positives) - Commented out the spring-boot-starter and all tomcat modules as they are extremely CVE affected and no invulnerable versions were available The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[flex-blazeds] branch master updated: - Got a first working version of sub-crux instances in modules working - Implemented a first working UI for the heating system
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flex-blazeds.git The following commit(s) were added to refs/heads/master by this push: new 895277c - Got a first working version of sub-crux instances in modules working - Implemented a first working UI for the heating system 895277c is described below commit 895277c20ab4a170d598796e74c761ded3d89373 Author: Christofer Dutz AuthorDate: Sun Sep 27 18:38:34 2020 +0200 - Got a first working version of sub-crux instances in modules working - Implemented a first working UI for the heating system --- core/src/main/java/flex/messaging/security/LoginCommand.java| 2 +- core/src/main/java/flex/messaging/security/LoginCommandExt.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/flex/messaging/security/LoginCommand.java b/core/src/main/java/flex/messaging/security/LoginCommand.java index f29fca7..3e05991 100644 --- a/core/src/main/java/flex/messaging/security/LoginCommand.java +++ b/core/src/main/java/flex/messaging/security/LoginCommand.java @@ -57,7 +57,7 @@ public interface LoginCommand * The gateway calls this method to perform programmatic authorization. * * A typical implementation would simply iterate over the supplied roles and - * check that atleast one of the roles returned true from a call to + * check that at least one of the roles returned true from a call to * HttpServletRequest.isUserInRole(String role). * * diff --git a/core/src/main/java/flex/messaging/security/LoginCommandExt.java b/core/src/main/java/flex/messaging/security/LoginCommandExt.java index 6078180..7bf159b 100644 --- a/core/src/main/java/flex/messaging/security/LoginCommandExt.java +++ b/core/src/main/java/flex/messaging/security/LoginCommandExt.java @@ -25,10 +25,10 @@ public interface LoginCommandExt /** * Classes that implement the flex.messaging.security.LoginCommand interface, should also * implement this interface if the name stored in java.security.Principal created as a result - * of a succesfull authentication differs from the username that is actually passed in to + * of a successful authentication differs from the username that is actually passed in to * the authentication. * - * Implementing this interace gives such LoginCommand's a chance to return the resulting + * Implementing this interface gives such LoginCommand's a chance to return the resulting * username so that it can be compared to the one stored in Principal. * * Returns the value that would be returned by java.security.Principal.getName() if
[flex-utilities] branch feature/pre-release-0.9.7 created (now 3d0d730)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch feature/pre-release-0.9.7 in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 3d0d730 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[flex-utilities] branch feature/royale-release created (now 3d0d730)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch feature/royale-release in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 3d0d730 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[flex-utilities] branch feature/maven-release created (now 3d0d730)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch feature/maven-release in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 3d0d730 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[flex-utilities] branch feature/maven-release created (now 3d0d730)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch feature/maven-release in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 3d0d730 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[flex-utilities] branch feature/maven-release created (now 3d0d730)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch feature/maven-release in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 3d0d730 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[flex-utilities] branch feature/js-only-distribution created (now 3d0d730)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to branch feature/js-only-distribution in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 3d0d730 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
svn commit: r36833 - /dev/flex/flex-maven-tools/flex-sdk-converter/rc2/ /release/flex/flex-maven-tools/flex-sdk-converter/1.0.0/rc2/
Author: cdutz Date: Tue Nov 19 16:32:48 2019 New Revision: 36833 Log: Release flex-sdk-converter 1.0.0 Added: release/flex/flex-maven-tools/flex-sdk-converter/1.0.0/rc2/ - copied from r36832, dev/flex/flex-maven-tools/flex-sdk-converter/rc2/ Removed: dev/flex/flex-maven-tools/flex-sdk-converter/rc2/
svn commit: r36832 - /release/flex/flex-maven-tools/flex-sdk-converter/1.0.0/
Author: cdutz Date: Tue Nov 19 16:31:37 2019 New Revision: 36832 Log: Added directories for the flex-sdk-converter Added: release/flex/flex-maven-tools/flex-sdk-converter/1.0.0/
svn commit: r36831 - in /release/flex/flex-maven-tools: ./ flex-sdk-converter/
Author: cdutz Date: Tue Nov 19 16:31:09 2019 New Revision: 36831 Log: Added directories for the flex-sdk-converter Added: release/flex/flex-maven-tools/ release/flex/flex-maven-tools/flex-sdk-converter/
svn commit: r36770 - /dev/flex/flex-maven-tools/flex-sdk-converter/rc1/
Author: cdutz Date: Sat Nov 16 13:43:14 2019 New Revision: 36770 Log: Removec direcory for rc1 Removed: dev/flex/flex-maven-tools/flex-sdk-converter/rc1/
svn commit: r36769 - /dev/flex/flex-maven-tools/flex-sdk-converter/rc2/
Author: cdutz Date: Sat Nov 16 13:42:25 2019 New Revision: 36769 Log: Add direcory for rc2 Added: dev/flex/flex-maven-tools/flex-sdk-converter/rc2/README.txt dev/flex/flex-maven-tools/flex-sdk-converter/rc2/RELEASE_NOTES dev/flex/flex-maven-tools/flex-sdk-converter/rc2/apache-flex-sdk-converter-1.0.0-source-release.zip (with props) dev/flex/flex-maven-tools/flex-sdk-converter/rc2/apache-flex-sdk-converter-1.0.0-source-release.zip.asc dev/flex/flex-maven-tools/flex-sdk-converter/rc2/apache-flex-sdk-converter-1.0.0-source-release.zip.sha512 Added: dev/flex/flex-maven-tools/flex-sdk-converter/rc2/README.txt == --- dev/flex/flex-maven-tools/flex-sdk-converter/rc2/README.txt (added) +++ dev/flex/flex-maven-tools/flex-sdk-converter/rc2/README.txt Sat Nov 16 13:42:25 2019 @@ -0,0 +1,223 @@ +Apache Flex SDK Converter += + The Apache Flex SDK Converter tool is used to convert the Apache and Adobe + Flex SDKs and Air SDKs into Maven artifacts. Automatically creating the + Directories, pom-files, copying and moving the resources to the correct + destinations. + + These artifacts can be used in Maven builds using the Flexmojos plugin + (Starting with version 6.x). + + The Apache Flex SDK Converter comes with all the means to download, convert + and deploy a mavenized form of an Apache Flex SDK. + +The Converter does not simply copy all java libraries to the destination; it checks +if the given artifact has already been deployed to maven central or by deploying an +other FDK previously. For this check you do need an internet connection to do the +conversion, otherwise it will probably take forever. + +Internally it consists of 3 components: +- One Retriever + - DownloadRetriever: For downloading binary artifacts +- Four Converters + - One for producing the Apache Flex SDK artifacts + - One for producing the Adobe Flash artifacts + - One for producing the Adobe Air artifacts + - One for producing the Adobe Fontkit artifacts +- Two Deployers + - One using Aether with no requirement to Maven (Faster, but less configurable) + - One using a local Maven installation (A lot slower, but fully configurable) + + + +Getting the latest sources via git +== + +Getting the source code is the recommended way to get the Apache Flex SDK +Converter. + +You can always checkout the latest source via git using the following +command: + +git clone https://git-wip-us.apache.org/repos/asf/flex-utilities.git flex-utilities +cd flex-utilities/flex-maven-tools/flex-sdk-converter +git checkout develop + +Building the Apache Flex SDK Converter +== + +The Apache Flex SDK Converter is a relatively simple project. It requires some +build tools which must be installed prior to building the compiler and it depends +on some external software which are downloaded as part of the build process. +Some of these have different licenses. See the Software Dependencies section +for more information on the external software dependencies. + +Install Prerequisites +- + +Before building the Apache Flex Compiler you must install the following software +and set the corresponding environment variables using absolute file paths. +Relative file paths will result in build errors. + + == +SOFTWAREENVIRONMENT VARIABLE (absolute paths) + == + +Java SDK 1.7 or greater but smaller than 12 (*1) JAVA_HOME + +Maven 3.1.0 or greater (*1) MAVEN_HOME + + == + +*1) The bin directories for MAVEN_HOME and JAVA_HOME should be added to your +PATH. + +On Windows, set PATH to + +PATH=%PATH%;%MAVEN_HOME%\bin;%JAVA_HOME%\bin + +On the Mac (bash), set PATH to + +export PATH="$PATH:$MAVEN_HOME/bin:$JAVA_HOME/bin" + + On Linux make sure you path include MAVEN_HOME and JAVA_HOME. + +Software Dependencies +- + +The Apache Flex SDK Converter uses third-party code that will be downloaded as +part of the build. + +The Apache Version 2.0 license is in the LICENSE file. + +The following dependencies have licenses which are, or are compatible with, +the Apache Version 2.0 license. You will not be prompted to acknowledge the +download. Most of the jars are installed in your maven local repository and +are included in the assembly jars. + +TODO: Ad
svn commit: r36768 - /dev/flex/flex-maven-tools/flex-sdk-converter/rc2/
Author: cdutz Date: Sat Nov 16 13:41:11 2019 New Revision: 36768 Log: Add direcory for rc2 Added: dev/flex/flex-maven-tools/flex-sdk-converter/rc2/
[flex-utilities] annotated tag apache-flex-sdk-converter-1.0.0-rc2 created (now 65485a6)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to annotated tag apache-flex-sdk-converter-1.0.0-rc2 in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 65485a6 (tag) tagging 746000ac7559883d6193922c8c3dfaa4d5465971 (commit) replaces apache-flex-sdk-converter-1.0.0-rc1 by Christofer Dutz on Sat Nov 16 14:17:01 2019 +0100 - Log - [maven-release-plugin] copy for tag apache-flex-sdk-converter-1.0.0-rc2 --- No new revisions were added by this update.
[flex-utilities] branch develop updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 3d0d730 [maven-release-plugin] prepare for next development iteration 3d0d730 is described below commit 3d0d730cae5c8a4acd4dcbe53cb3fcc25198f68d Author: Christofer Dutz AuthorDate: Sat Nov 16 14:17:06 2019 +0100 [maven-release-plugin] prepare for next development iteration --- flex-maven-tools/flex-sdk-converter/api/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/cli/pom.xml | 12 ++-- .../flex-sdk-converter/converters/air/pom.xml| 6 +++--- .../flex-sdk-converter/converters/base/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flash/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flex/pom.xml | 14 +++--- .../flex-sdk-converter/converters/fontkit/pom.xml| 6 +++--- flex-maven-tools/flex-sdk-converter/converters/pom.xml | 4 ++-- .../flex-sdk-converter/converters/wrapper/pom.xml| 6 +++--- .../flex-sdk-converter/deployers/aether/pom.xml | 4 ++-- .../flex-sdk-converter/deployers/maven/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/deployers/pom.xml| 4 ++-- .../flex-sdk-converter/maven-extension/pom.xml | 16 flex-maven-tools/flex-sdk-converter/pom.xml | 4 ++-- .../flex-sdk-converter/retrievers/base/pom.xml | 6 +++--- .../flex-sdk-converter/retrievers/download/pom.xml | 6 +++--- flex-maven-tools/flex-sdk-converter/retrievers/pom.xml | 4 ++-- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 7c6dfe6..4b108b6 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0 +1.1.0-SNAPSHOT api -1.0.0 +1.1.0-SNAPSHOT jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index 1e468dd..c3561fd 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0 +1.1.0-SNAPSHOT cli -1.0.0 +1.1.0-SNAPSHOT jar @@ -68,23 +68,23 @@ org.apache.flex.utilities.converter api -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter download-retriever -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter flex-converter -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter aether-deployer -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml index 176a480..044bbc4 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0 +1.1.0-SNAPSHOT air-converter -1.0.0 +1.1.0-SNAPSHOT jar org.apache.flex.utilities.converter base-converter -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml index 33d87d1..5a40784 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0 +1.1.0-SNAPSHOT base-converter -1.0.0 +1.1.0-SNAPSHOT jar org.apache.flex.utilities.converter api -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml index ac140ce..293377e 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter
[flex-utilities] branch develop updated: [maven-release-plugin] prepare release apache-flex-sdk-converter-1.0.0-rc2
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 746000a [maven-release-plugin] prepare release apache-flex-sdk-converter-1.0.0-rc2 746000a is described below commit 746000ac7559883d6193922c8c3dfaa4d5465971 Author: Christofer Dutz AuthorDate: Sat Nov 16 14:16:46 2019 +0100 [maven-release-plugin] prepare release apache-flex-sdk-converter-1.0.0-rc2 --- flex-maven-tools/flex-sdk-converter/api/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/cli/pom.xml | 12 ++-- .../flex-sdk-converter/converters/air/pom.xml| 6 +++--- .../flex-sdk-converter/converters/base/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flash/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flex/pom.xml | 14 +++--- .../flex-sdk-converter/converters/fontkit/pom.xml| 6 +++--- flex-maven-tools/flex-sdk-converter/converters/pom.xml | 4 ++-- .../flex-sdk-converter/converters/wrapper/pom.xml| 6 +++--- .../flex-sdk-converter/deployers/aether/pom.xml | 4 ++-- .../flex-sdk-converter/deployers/maven/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/deployers/pom.xml| 4 ++-- .../flex-sdk-converter/maven-extension/pom.xml | 16 flex-maven-tools/flex-sdk-converter/pom.xml | 4 ++-- .../flex-sdk-converter/retrievers/base/pom.xml | 6 +++--- .../flex-sdk-converter/retrievers/download/pom.xml | 6 +++--- flex-maven-tools/flex-sdk-converter/retrievers/pom.xml | 4 ++-- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 4b108b6..7c6dfe6 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.1.0-SNAPSHOT +1.0.0 api -1.1.0-SNAPSHOT +1.0.0 jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index c3561fd..1e468dd 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.1.0-SNAPSHOT +1.0.0 cli -1.1.0-SNAPSHOT +1.0.0 jar @@ -68,23 +68,23 @@ org.apache.flex.utilities.converter api -1.1.0-SNAPSHOT +1.0.0 org.apache.flex.utilities.converter download-retriever -1.1.0-SNAPSHOT +1.0.0 org.apache.flex.utilities.converter flex-converter -1.1.0-SNAPSHOT +1.0.0 org.apache.flex.utilities.converter aether-deployer -1.1.0-SNAPSHOT +1.0.0 diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml index 044bbc4..176a480 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.1.0-SNAPSHOT +1.0.0 air-converter -1.1.0-SNAPSHOT +1.0.0 jar org.apache.flex.utilities.converter base-converter -1.1.0-SNAPSHOT +1.0.0 diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml index 5a40784..33d87d1 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.1.0-SNAPSHOT +1.0.0 base-converter -1.1.0-SNAPSHOT +1.0.0 jar org.apache.flex.utilities.converter api -1.1.0-SNAPSHOT +1.0.0 diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml index 293377e..ac140ce 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml @@ -23,18 +23,18
[flex-utilities] branch develop updated: - Removed the intellij created headers with any form of attribution of people or ides - Added the apache header to all files missing this
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 8809506 - Removed the intellij created headers with any form of attribution of people or ides - Added the apache header to all files missing this 8809506 is described below commit 880950688d6ef19c321003324aff0fa1ab926d21 Author: Christofer Dutz AuthorDate: Sat Nov 16 11:00:22 2019 +0100 - Removed the intellij created headers with any form of attribution of people or ides - Added the apache header to all files missing this --- .../utilities/converter/api/ProxySettings.java | 19 ++--- .../utilities/converter/core/SdkConverterCLI.java | 19 ++--- .../converters/base/src/main/resources/logback.xml | 18 .../converter/fontkit/FontkitConverter.java| 19 ++--- .../converter/wrapper/WrapperConverter.java| 19 ++--- .../converter/deployer/aether/AetherDeployer.java | 3 --- .../converter/deployer/maven/MavenDeployer.java| 5 - .../converter/mavenextension/FlexEventSpy.java | 18 ++-- flex-maven-tools/flex-sdk-converter/pom.xml| 24 ++ .../retrievers/types/PlatformTypeTest.java | 21 ++- .../retrievers/download/SystemIdHelper.java| 19 ++--- .../converter/retrievers/download/ProxyTest.java | 3 --- 12 files changed, 154 insertions(+), 33 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/src/main/java/org/apache/flex/utilities/converter/api/ProxySettings.java b/flex-maven-tools/flex-sdk-converter/api/src/main/java/org/apache/flex/utilities/converter/api/ProxySettings.java index 5ed76da..a3a9427 100644 --- a/flex-maven-tools/flex-sdk-converter/api/src/main/java/org/apache/flex/utilities/converter/api/ProxySettings.java +++ b/flex-maven-tools/flex-sdk-converter/api/src/main/java/org/apache/flex/utilities/converter/api/ProxySettings.java @@ -1,8 +1,21 @@ +/* + * 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 org.apache.flex.utilities.converter.api; -/** - * Created by christoferdutz on 01.07.15. - */ public class ProxySettings { private static ProxySettings proxySettings = null; diff --git a/flex-maven-tools/flex-sdk-converter/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/flex-maven-tools/flex-sdk-converter/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java index 8cf0522..5844716 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java +++ b/flex-maven-tools/flex-sdk-converter/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java @@ -1,3 +1,19 @@ +/* + * 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 org.apache.flex.utilities.converter.core; import org.apache.commons.cli.*; @@ -18,9 +34,6 @@ import java.io.File; import java.io.IOException; import java.util.*; -/** - * Created by christoferdutz on 07.04.15. - */ public class SdkConverterCLI { public static final String COMMAND_HELP = "help"; diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/resources/logback.xml
[flex-utilities] branch develop updated: - Removed the intellij created headers with my user-id
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 502c99c - Removed the intellij created headers with my user-id 502c99c is described below commit 502c99c348e00d633dc6fd451d11d500961b7b44 Author: Christofer Dutz AuthorDate: Sat Nov 16 10:50:48 2019 +0100 - Removed the intellij created headers with my user-id --- .../main/java/org/apache/flex/utilities/converter/BaseConverter.java | 3 --- .../src/main/java/org/apache/flex/utilities/converter/Converter.java | 3 --- .../apache/flex/utilities/converter/exceptions/ConverterException.java | 3 --- .../java/org/apache/flex/utilities/converter/model/MavenArtifact.java | 3 --- .../java/org/apache/flex/utilities/converter/flash/FlashConverter.java | 3 --- .../java/org/apache/flex/utilities/converter/flex/FlexConverter.java | 3 --- .../org/apache/flex/utilities/converter/retrievers/BaseRetriever.java | 3 --- .../java/org/apache/flex/utilities/converter/retrievers/Retriever.java | 3 --- .../utilities/converter/retrievers/exceptions/RetrieverException.java | 3 --- .../apache/flex/utilities/converter/retrievers/types/PlatformType.java | 3 --- .../org/apache/flex/utilities/converter/retrievers/types/SdkType.java | 3 --- .../apache/flex/utilities/converter/retrievers/utils/ProgressBar.java | 3 --- .../utilities/converter/retrievers/download/DownloadRetriever.java | 3 --- 13 files changed, 39 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java index f74257e..e15147e 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java @@ -47,9 +47,6 @@ import java.util.*; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -/** - * Created by cdutz on 11.05.2012. - */ public abstract class BaseConverter { private static final Logger LOG = LoggerFactory.getLogger(BaseConverter.class); diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/Converter.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/Converter.java index 54f4e18..e9b6873 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/Converter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/Converter.java @@ -18,9 +18,6 @@ package org.apache.flex.utilities.converter; import org.apache.flex.utilities.converter.exceptions.ConverterException; -/** - * Created by cdutz on 18.04.2014. - */ public interface Converter { void convert() throws ConverterException; diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/exceptions/ConverterException.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/exceptions/ConverterException.java index 384f2fe..c9d81ac 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/exceptions/ConverterException.java +++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/exceptions/ConverterException.java @@ -16,9 +16,6 @@ */ package org.apache.flex.utilities.converter.exceptions; -/** - * Created by cdutz on 07.05.2014. - */ public class ConverterException extends Exception { public ConverterException(String message) { diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java index c41db58..f1eaee7 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java +++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java @@ -22,9 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * Created by cdutz on 01.07.2012. - */ public class MavenArtifact { public static final String DEFAULT_CLASSIFIER = "default"; diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/src/main/java/org/apache/flex/utilities
svn commit: r36742 - /dev/flex/flex-maven-tools/flex-sdk-converter/rc1/
Author: cdutz Date: Fri Nov 15 10:09:22 2019 New Revision: 36742 Log: stage rc1 Added: dev/flex/flex-maven-tools/flex-sdk-converter/rc1/ dev/flex/flex-maven-tools/flex-sdk-converter/rc1/README.txt dev/flex/flex-maven-tools/flex-sdk-converter/rc1/RELEASE_NOTES dev/flex/flex-maven-tools/flex-sdk-converter/rc1/apache-flex-sdk-converter-1.0.0-source-release.zip (with props) dev/flex/flex-maven-tools/flex-sdk-converter/rc1/apache-flex-sdk-converter-1.0.0-source-release.zip.asc dev/flex/flex-maven-tools/flex-sdk-converter/rc1/apache-flex-sdk-converter-1.0.0-source-release.zip.sha512 Added: dev/flex/flex-maven-tools/flex-sdk-converter/rc1/README.txt == --- dev/flex/flex-maven-tools/flex-sdk-converter/rc1/README.txt (added) +++ dev/flex/flex-maven-tools/flex-sdk-converter/rc1/README.txt Fri Nov 15 10:09:22 2019 @@ -0,0 +1,223 @@ +Apache Flex SDK Converter += + The Apache Flex SDK Converter tool is used to convert the Apache and Adobe + Flex SDKs and Air SDKs into Maven artifacts. Automatically creating the + Directories, pom-files, copying and moving the resources to the correct + destinations. + + These artifacts can be used in Maven builds using the Flexmojos plugin + (Starting with version 6.x). + + The Apache Flex SDK Converter comes with all the means to download, convert + and deploy a mavenized form of an Apache Flex SDK. + +The Converter does not simply copy all java libraries to the destination; it checks +if the given artifact has already been deployed to maven central or by deploying an +other FDK previously. For this check you do need an internet connection to do the +conversion, otherwise it will probably take forever. + +Internally it consists of 3 components: +- One Retriever + - DownloadRetriever: For downloading binary artifacts +- Four Converters + - One for producing the Apache Flex SDK artifacts + - One for producing the Adobe Flash artifacts + - One for producing the Adobe Air artifacts + - One for producing the Adobe Fontkit artifacts +- Two Deployers + - One using Aether with no requirement to Maven (Faster, but less configurable) + - One using a local Maven installation (A lot slower, but fully configurable) + + + +Getting the latest sources via git +== + +Getting the source code is the recommended way to get the Apache Flex SDK +Converter. + +You can always checkout the latest source via git using the following +command: + +git clone https://git-wip-us.apache.org/repos/asf/flex-utilities.git flex-utilities +cd flex-utilities/flex-maven-tools/flex-sdk-converter +git checkout develop + +Building the Apache Flex SDK Converter +== + +The Apache Flex SDK Converter is a relatively simple project. It requires some +build tools which must be installed prior to building the compiler and it depends +on some external software which are downloaded as part of the build process. +Some of these have different licenses. See the Software Dependencies section +for more information on the external software dependencies. + +Install Prerequisites +- + +Before building the Apache Flex Compiler you must install the following software +and set the corresponding environment variables using absolute file paths. +Relative file paths will result in build errors. + + == +SOFTWAREENVIRONMENT VARIABLE (absolute paths) + == + +Java SDK 1.7 or greater but smaller than 12 (*1) JAVA_HOME + +Maven 3.1.0 or greater (*1) MAVEN_HOME + + == + +*1) The bin directories for MAVEN_HOME and JAVA_HOME should be added to your +PATH. + +On Windows, set PATH to + +PATH=%PATH%;%MAVEN_HOME%\bin;%JAVA_HOME%\bin + +On the Mac (bash), set PATH to + +export PATH="$PATH:$MAVEN_HOME/bin:$JAVA_HOME/bin" + + On Linux make sure you path include MAVEN_HOME and JAVA_HOME. + +Software Dependencies +- + +The Apache Flex SDK Converter uses third-party code that will be downloaded as +part of the build. + +The Apache Version 2.0 license is in the LICENSE file. + +The following dependencies have licenses which are, or are compatible with, +the Apache Version 2.0 license. You will not be prompted to acknowledge the +download. Most of the jars are installed in your maven local repository and +ar
[flex-utilities] branch develop updated: [maven-release-plugin] prepare release apache-flex-sdk-converter-1.0.0-rc1
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 9d9fc75 [maven-release-plugin] prepare release apache-flex-sdk-converter-1.0.0-rc1 9d9fc75 is described below commit 9d9fc753cd6bfb3af67e217d6ba511ef1c2a51a0 Author: Christofer Dutz AuthorDate: Fri Nov 15 10:51:47 2019 +0100 [maven-release-plugin] prepare release apache-flex-sdk-converter-1.0.0-rc1 --- flex-maven-tools/flex-sdk-converter/api/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/cli/pom.xml | 12 ++-- .../flex-sdk-converter/converters/air/pom.xml | 6 +++--- .../flex-sdk-converter/converters/base/pom.xml| 6 +++--- .../flex-sdk-converter/converters/flash/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flex/pom.xml| 14 +++--- .../flex-sdk-converter/converters/fontkit/pom.xml | 6 +++--- .../flex-sdk-converter/converters/pom.xml | 4 ++-- .../flex-sdk-converter/converters/wrapper/pom.xml | 6 +++--- .../flex-sdk-converter/deployers/aether/pom.xml | 4 ++-- .../flex-sdk-converter/deployers/maven/pom.xml| 4 ++-- flex-maven-tools/flex-sdk-converter/deployers/pom.xml | 4 ++-- .../flex-sdk-converter/maven-extension/pom.xml| 19 +-- flex-maven-tools/flex-sdk-converter/pom.xml | 5 +++-- .../flex-sdk-converter/retrievers/base/pom.xml| 6 +++--- .../flex-sdk-converter/retrievers/download/pom.xml| 6 +++--- .../flex-sdk-converter/retrievers/pom.xml | 4 ++-- 17 files changed, 58 insertions(+), 58 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 15e1a2a..7c6dfe6 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0-SNAPSHOT +1.0.0 api -1.0.0-SNAPSHOT +1.0.0 jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index 7176ed1..1e468dd 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0-SNAPSHOT +1.0.0 cli -1.0.0-SNAPSHOT +1.0.0 jar @@ -68,23 +68,23 @@ org.apache.flex.utilities.converter api -1.0.0-SNAPSHOT +1.0.0 org.apache.flex.utilities.converter download-retriever -1.0.0-SNAPSHOT +1.0.0 org.apache.flex.utilities.converter flex-converter -1.0.0-SNAPSHOT +1.0.0 org.apache.flex.utilities.converter aether-deployer -1.0.0-SNAPSHOT +1.0.0 diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml index 88d61aa..176a480 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0-SNAPSHOT +1.0.0 air-converter -1.0.0-SNAPSHOT +1.0.0 jar org.apache.flex.utilities.converter base-converter -1.0.0-SNAPSHOT +1.0.0 diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml index fcc4881..33d87d1 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0-SNAPSHOT +1.0.0 base-converter -1.0.0-SNAPSHOT +1.0.0 jar org.apache.flex.utilities.converter api -1.0.0-SNAPSHOT +1.0.0 diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml index 6afc519..ac140ce 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters
[flex-utilities] branch develop updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 5aff356 [maven-release-plugin] prepare for next development iteration 5aff356 is described below commit 5aff356c0863b2fa57bcabc658086acad2660a4d Author: Christofer Dutz AuthorDate: Fri Nov 15 10:52:07 2019 +0100 [maven-release-plugin] prepare for next development iteration --- flex-maven-tools/flex-sdk-converter/api/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/cli/pom.xml | 12 ++-- .../flex-sdk-converter/converters/air/pom.xml| 6 +++--- .../flex-sdk-converter/converters/base/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flash/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flex/pom.xml | 14 +++--- .../flex-sdk-converter/converters/fontkit/pom.xml| 6 +++--- flex-maven-tools/flex-sdk-converter/converters/pom.xml | 4 ++-- .../flex-sdk-converter/converters/wrapper/pom.xml| 6 +++--- .../flex-sdk-converter/deployers/aether/pom.xml | 4 ++-- .../flex-sdk-converter/deployers/maven/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/deployers/pom.xml| 4 ++-- .../flex-sdk-converter/maven-extension/pom.xml | 16 flex-maven-tools/flex-sdk-converter/pom.xml | 4 ++-- .../flex-sdk-converter/retrievers/base/pom.xml | 6 +++--- .../flex-sdk-converter/retrievers/download/pom.xml | 6 +++--- flex-maven-tools/flex-sdk-converter/retrievers/pom.xml | 4 ++-- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 7c6dfe6..4b108b6 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0 +1.1.0-SNAPSHOT api -1.0.0 +1.1.0-SNAPSHOT jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index 1e468dd..c3561fd 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0 +1.1.0-SNAPSHOT cli -1.0.0 +1.1.0-SNAPSHOT jar @@ -68,23 +68,23 @@ org.apache.flex.utilities.converter api -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter download-retriever -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter flex-converter -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter aether-deployer -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml index 176a480..044bbc4 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0 +1.1.0-SNAPSHOT air-converter -1.0.0 +1.1.0-SNAPSHOT jar org.apache.flex.utilities.converter base-converter -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml index 33d87d1..5a40784 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0 +1.1.0-SNAPSHOT base-converter -1.0.0 +1.1.0-SNAPSHOT jar org.apache.flex.utilities.converter api -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml index ac140ce..293377e 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter
[flex-utilities] annotated tag apache-flex-sdk-converter-1.0.0-rc1 created (now d2d8838)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to annotated tag apache-flex-sdk-converter-1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at d2d8838 (tag) tagging 9d9fc753cd6bfb3af67e217d6ba511ef1c2a51a0 (commit) replaces apache-flex-sdk-converter-1.0.0 by Christofer Dutz on Fri Nov 15 10:52:02 2019 +0100 - Log - [maven-release-plugin] copy for tag apache-flex-sdk-converter-1.0.0-rc1 --- No new revisions were added by this update.
[flex-utilities] branch develop updated: - Fixed some documentation issues.
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 4299eb1 - Fixed some documentation issues. 4299eb1 is described below commit 4299eb1b43976ad864c43b0ec8b5cddf8ce7 Author: Christofer Dutz AuthorDate: Fri Nov 15 10:49:15 2019 +0100 - Fixed some documentation issues. --- flex-maven-tools/flex-sdk-converter/NOTICE | 4 ++-- flex-maven-tools/flex-sdk-converter/README.txt | 23 --- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/NOTICE b/flex-maven-tools/flex-sdk-converter/NOTICE index d1becf0..51beba2 100644 --- a/flex-maven-tools/flex-sdk-converter/NOTICE +++ b/flex-maven-tools/flex-sdk-converter/NOTICE @@ -1,5 +1,5 @@ -Apache Flex Mavenizer -Copyright 2015 The Apache Software Foundation +Apache Flex SDK Converter +Copyright 2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/flex-maven-tools/flex-sdk-converter/README.txt b/flex-maven-tools/flex-sdk-converter/README.txt index 9410a47..5fe8713 100644 --- a/flex-maven-tools/flex-sdk-converter/README.txt +++ b/flex-maven-tools/flex-sdk-converter/README.txt @@ -1,8 +1,9 @@ Apache Flex SDK Converter = - The Mavenizer tool is used to convert the Apache and Adobe Flex SDKs and Air - SDKs into Maven artifacts. Automatically creating the Directories, pom-files, - copying and moving the resources to the correct destinations. + The Apache Flex SDK Converter tool is used to convert the Apache and Adobe + Flex SDKs and Air SDKs into Maven artifacts. Automatically creating the + Directories, pom-files, copying and moving the resources to the correct + destinations. These artifacts can be used in Maven builds using the Flexmojos plugin (Starting with version 6.x). @@ -39,7 +40,7 @@ Getting the latest sources via git command: git clone https://git-wip-us.apache.org/repos/asf/flex-utilities.git flex-utilities -cd flex-utilities/mavenizer +cd flex-utilities/flex-maven-tools/flex-sdk-converter git checkout develop Building the Apache Flex SDK Converter @@ -62,9 +63,9 @@ Install Prerequisites SOFTWAREENVIRONMENT VARIABLE (absolute paths) == -Java SDK 1.7 or greater (*1)JAVA_HOME +Java SDK 1.7 or greater but smaller than 12 (*1) JAVA_HOME -Maven 3.1.0 or greater (*1) MAVEN_HOME +Maven 3.1.0 or greater (*1) MAVEN_HOME == @@ -105,10 +106,10 @@ Building the Source in the Source Distribution When you have all the prerequisites in place and the environment variables set (see Install Prerequisites above) use -cd +cd mvn install -to download the thirdparty dependencies and build the binary from the source. +to download the third-party dependencies and build the binary from the source. To clean the build, of everything other than the downloaded third-party dependencies use @@ -118,7 +119,7 @@ Building the Source in the Source Distribution The packages can be found in the "target" subdirectories. The particularly interesting one is the Standalone Command Line Interface: -- cli/target/apache-flex-sdk-converter-1.0.0-SNAPSHOT.jar +- cli/target/apache-flex-sdk-converter-1.0.0.jar @@ -129,8 +130,8 @@ Using the Apache Flex SDK Converter to be executed from the command-line. Assuming the Java executable is available on the current systems path, it can be called using: - cd /cli/target - java -jar apache-flex-sdk-converter-1.0.0-SNAPSHOT.jar + cd /cli/target + java -jar apache-flex-sdk-converter-1.0.0.jar If executed without any command, it will output a list of commands and available properties.
[flex-utilities] branch develop updated: [maven-release-plugin] rollback the release of apache-flex-sdk-converter-1.0.0
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new ccb727f [maven-release-plugin] rollback the release of apache-flex-sdk-converter-1.0.0 ccb727f is described below commit ccb727fcbb457ede1989e57edc04a41dbc5c2ced Author: Christofer Dutz AuthorDate: Fri Nov 15 10:45:08 2019 +0100 [maven-release-plugin] rollback the release of apache-flex-sdk-converter-1.0.0 --- flex-maven-tools/flex-sdk-converter/api/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/cli/pom.xml | 12 ++-- .../flex-sdk-converter/converters/air/pom.xml | 6 +++--- .../flex-sdk-converter/converters/base/pom.xml| 6 +++--- .../flex-sdk-converter/converters/flash/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flex/pom.xml| 14 +++--- .../flex-sdk-converter/converters/fontkit/pom.xml | 6 +++--- .../flex-sdk-converter/converters/pom.xml | 4 ++-- .../flex-sdk-converter/converters/wrapper/pom.xml | 6 +++--- .../flex-sdk-converter/deployers/aether/pom.xml | 4 ++-- .../flex-sdk-converter/deployers/maven/pom.xml| 4 ++-- flex-maven-tools/flex-sdk-converter/deployers/pom.xml | 4 ++-- .../flex-sdk-converter/maven-extension/pom.xml| 19 ++- flex-maven-tools/flex-sdk-converter/pom.xml | 5 ++--- .../flex-sdk-converter/retrievers/base/pom.xml| 6 +++--- .../flex-sdk-converter/retrievers/download/pom.xml| 6 +++--- .../flex-sdk-converter/retrievers/pom.xml | 4 ++-- 17 files changed, 58 insertions(+), 58 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 4b108b6..15e1a2a 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT api -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index c3561fd..7176ed1 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT cli -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT jar @@ -68,23 +68,23 @@ org.apache.flex.utilities.converter api -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT org.apache.flex.utilities.converter download-retriever -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT org.apache.flex.utilities.converter flex-converter -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT org.apache.flex.utilities.converter aether-deployer -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml index 044bbc4..88d61aa 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT air-converter -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT jar org.apache.flex.utilities.converter base-converter -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml index 5a40784..fcc4881 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT base-converter -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT jar org.apache.flex.utilities.converter api -1.1.0-SNAPSHOT +1.0.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml index 293377e..6afc519 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml +++ b/flex-maven-tools/flex
[flex-utilities] branch develop updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 1cb6c4f [maven-release-plugin] prepare for next development iteration 1cb6c4f is described below commit 1cb6c4f9957bc1afb6eb7c1975bf7212da621feb Author: Christofer Dutz AuthorDate: Fri Nov 15 10:43:18 2019 +0100 [maven-release-plugin] prepare for next development iteration --- flex-maven-tools/flex-sdk-converter/api/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/cli/pom.xml | 12 ++-- .../flex-sdk-converter/converters/air/pom.xml| 6 +++--- .../flex-sdk-converter/converters/base/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flash/pom.xml | 6 +++--- .../flex-sdk-converter/converters/flex/pom.xml | 14 +++--- .../flex-sdk-converter/converters/fontkit/pom.xml| 6 +++--- flex-maven-tools/flex-sdk-converter/converters/pom.xml | 4 ++-- .../flex-sdk-converter/converters/wrapper/pom.xml| 6 +++--- .../flex-sdk-converter/deployers/aether/pom.xml | 4 ++-- .../flex-sdk-converter/deployers/maven/pom.xml | 4 ++-- flex-maven-tools/flex-sdk-converter/deployers/pom.xml| 4 ++-- .../flex-sdk-converter/maven-extension/pom.xml | 16 flex-maven-tools/flex-sdk-converter/pom.xml | 4 ++-- .../flex-sdk-converter/retrievers/base/pom.xml | 6 +++--- .../flex-sdk-converter/retrievers/download/pom.xml | 6 +++--- flex-maven-tools/flex-sdk-converter/retrievers/pom.xml | 4 ++-- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 7c6dfe6..4b108b6 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0 +1.1.0-SNAPSHOT api -1.0.0 +1.1.0-SNAPSHOT jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index 1e468dd..c3561fd 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,11 +23,11 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0 +1.1.0-SNAPSHOT cli -1.0.0 +1.1.0-SNAPSHOT jar @@ -68,23 +68,23 @@ org.apache.flex.utilities.converter api -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter download-retriever -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter flex-converter -1.0.0 +1.1.0-SNAPSHOT org.apache.flex.utilities.converter aether-deployer -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml index 176a480..044bbc4 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0 +1.1.0-SNAPSHOT air-converter -1.0.0 +1.1.0-SNAPSHOT jar org.apache.flex.utilities.converter base-converter -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml index 33d87d1..5a40784 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter converters -1.0.0 +1.1.0-SNAPSHOT base-converter -1.0.0 +1.1.0-SNAPSHOT jar org.apache.flex.utilities.converter api -1.0.0 +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml index ac140ce..293377e 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml @@ -23,18 +23,18 @@ org.apache.flex.utilities.converter
[flex-utilities] annotated tag apache-flex-sdk-converter-1.0.0 created (now 4c8d2be)
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a change to annotated tag apache-flex-sdk-converter-1.0.0 in repository https://gitbox.apache.org/repos/asf/flex-utilities.git. at 4c8d2be (tag) tagging dfa3bb47e96623c0223741e6a8380afa4ee1c2f5 (commit) replaces apache-flex-sdk-installer-3.3.2-rc2 by Christofer Dutz on Fri Nov 15 10:43:13 2019 +0100 - Log - [maven-release-plugin] copy for tag apache-flex-sdk-converter-1.0.0 --- No new revisions were added by this update.
[flex-utilities] branch develop updated: - Made the build not break on javadoc issues.
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 0347960 - Made the build not break on javadoc issues. 0347960 is described below commit 03479603a10705c95364d716d73b9a0510757b13 Author: Christofer Dutz AuthorDate: Fri Nov 15 10:41:37 2019 +0100 - Made the build not break on javadoc issues. --- flex-maven-tools/flex-sdk-converter/pom.xml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/flex-maven-tools/flex-sdk-converter/pom.xml b/flex-maven-tools/flex-sdk-converter/pom.xml index 92ff0c5..72f911e 100644 --- a/flex-maven-tools/flex-sdk-converter/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/pom.xml @@ -79,6 +79,20 @@ + + + + +org.apache.maven.plugins +maven-javadoc-plugin +3.1.1 + +false +false + + + +
svn commit: r36741 [1/2] - /dev/flex/flex-maven-tools/flex-sdk-converter/KEYS.txt
Author: cdutz Date: Fri Nov 15 09:27:55 2019 New Revision: 36741 Log: added KEYS.txt file Added: dev/flex/flex-maven-tools/flex-sdk-converter/KEYS.txt
svn commit: r36741 [2/2] - /dev/flex/flex-maven-tools/flex-sdk-converter/KEYS.txt
Added: dev/flex/flex-maven-tools/flex-sdk-converter/KEYS.txt == --- dev/flex/flex-maven-tools/flex-sdk-converter/KEYS.txt (added) +++ dev/flex/flex-maven-tools/flex-sdk-converter/KEYS.txt Fri Nov 15 09:27:55 2019 @@ -0,0 +1,5825 @@ +This file contains GPG keys of Apache Flex developers. + +Users:gpg --import KEYS + +Developers: + Create a key: +gpg --gen-key + + Adding your key to this file: +(gpg --list-sigs && gpg --armor --export ) >> KEYS. + + Publish the key: +gpg --keyserver pgp.mit.edu --send-keys + + Signing another developers key: +gpg --keyserver pgp.mit.edu --search-keys +gpg --keyserver pgp.mit.edu --recv-keys +gpg --sign-key +gpg --keyserver pgp.mit.edu --send-keys + + Additional Information: +http://www.apache.org/dev/openpgp.html#generate-key + +* PLEASE NOTE ** + + Releases will be signed using one of these keys in this file. This file will + be available with the distributed Apache Flex releases at: + + https://dist.apache.org/repos/dist/release/flex/flex-maven-tools/flex-sdk-converter/KEYS + + + + +pub rsa4096 2014-09-05 [SC] + F156813FF315007E36BA6C13089127C15C60D6B9 +uid[ ultimativ ] Christofer Dutz (Apache Comitter) +sig 3089127C15C60D6B9 2014-09-05 Christofer Dutz (Apache Comitter) +sig 9DAADC1C9FCC82D0 2015-07-27 Benedikt Ritter (CODE SIGNING KEY) +sig 3E0F28593AEEAD151 2014-11-19 Justin Mclean +sig 388F3CF4C22D7F6EC 2015-07-27 Hendrik Saly +sig 37903F81190910A83 2015-07-27 Hendrik Saly +sig 3ED74488A5707E66B 2017-07-23 Christofer Dutz +uid[ ultimativ ] [jpeg image of size 272202] +sig 3089127C15C60D6B9 2015-07-27 Christofer Dutz (Apache Comitter) +sig 3ED74488A5707E66B 2017-07-23 Christofer Dutz +sub rsa4096 2014-09-05 [E] +sig 089127C15C60D6B9 2014-09-05 Christofer Dutz (Apache Comitter) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFQJ9kwBEAC8+epn6+DNDhx7COxuqtcYeL498od+9wiEDt7fTFX2lQpDzH3e +OI41Dxtlw/2s2guoVvw3cu9PzrI4NCvfWPRMzUhzpOr8wIRURFy+rJ3Xoh4GnASD +GKtLMRt2XTDmIGSPR+EiKm3TGA89dgrG+DF4Bsf+4kpHRvUzWmtlx1Gwf8GpHGIu +Db9J5A2VTg9QqdsQS1lX2Z1NvDkFMC2BEJQDKwAii+wpZ6Ld57MOAJeDVCyG2Tpb +FwgmkggQHxnBmA30ZJrVqLnkaWch10q7mCIHv87l1c0EiGnGKE8MtY3H+Ko6Dt2q +eYEzkn7sR759M42+BNBkK0u4t3j+fxkA+p61dc+6ovMdBzRKXD319HDJjGNJ6ouU +L8KDaSwxN6e3mKtNi+zb6SPpZ17pyS9t0QbT7rIHlkX47aMWIp+jBWXL9gGQeBMx +YhLfoS5Kqq4TSCxtGwFF1q/xd3DA6lfcCp6B4ePOM7pPd2+uowRXyJPRRTowHtXE +HzTj9VTmO08pDd4iqivTQ3YLJdEAlx07VrND8MERG+4SEiiyWWIM7aT2m0K79Fg8 +cDue73isiZ+jmmI0tqe2AJLlhhl3L3Co2VeoLFu1TQuCScK6T8RsKfQ1/h0P6hkQ +w1a0A84S+klBM8LZPXbsYgBMSpwdFQmgc6hY3O2YaY6+3eVT1VxUU26bGQARAQAB +tDRDaHJpc3RvZmVyIER1dHogKEFwYWNoZSBDb21pdHRlcikgPGNkdXR6QGFwYWNo +ZS5vcmc+iQI3BBMBCgAhBQJUCfZMAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheA +AAoJEAiRJ8FcYNa5W2UQAIzN8wjHGwNPBc+AmlOwfuV3RGIxkp01Uhy8fSzPXcbo +N6Cbg8rjPf3VyZ8sj57JrKIjGP5Dpgw6WNUFLqucTxJZhZLSN12+5u3c+B/bALLa +IqjDPRw+IecYaTZdEGncWaLdMK7Tp6AOSZWgTr5wUVxLWjdeLfDc6AbF0PsA5DRQ +BxxRh/1MzEd7CwPyuIEqRpDhwzo684M3vXhOQL2fVsu0ja/NYz+73z8CJItD2Jtz +LlVLrmnsw0SVO93dxUDAQgkzrj9Mymek+KH9hMl0ucT0TT4yXIT91gKpg6yWmHVY +vrbQSwu8jMzuOxOHwpBHEL3BAAzlUA5DxKTGQBJS7YzkZr4iUT+Lm6CgPlJcxNu4 +eP82gT6YDtm5jLflY7UklIvPTWqBc9y93h6Z3VoaMBqGgPqtbmOVG5axBXajaVVU +BZs14KPZozQ0cAGZR7/379IsCymSTkd2LzM3c6c5k4Cgz0Ctlv78vid/1vtHZNCk +XeOlIFU6he1UU3ldsq7eyJ9+rm9RwQV9RvV4OgQUBgcZUtegjKQCJL1vGSJZQSqV +US2P43gbNcyBozypbW9C5KZBdeyIKes6mofA+E1zlkBzxMstg1xRRICwssn2PqB4 +uzxM1oh5b4uCY09XPKHe/OJ15R62xTNBnHqQIo9LrKh5UjYt1GIlMUOIxV15GGKY +iQIcBBABCgAGBQJVthI5AAoJEJ2q3ByfzILQDZIQAMLQ+f3ZUnxHd08EuelCZ0p+ +JD4/aAi6c/6j+hx7qSKTtMVslsRut12lsLmhY7UwZbJjxQXqREEEothe0gQwmb9W +elvs2TLcnFRCA/HBdVd9S0AmwRJFPBemqImtSe8f3R+J2EBfcwiK6MPSf3QxyAMz +is26dzFy24lMRii4zczZLYJg71w75Y/7GBf6ps6gp+X18wxKsypLntL0uo6MOM63 +Qr4fGD1OpA/Lh08d+mdVkR+GPemoY6p71zWjyqzgV4bwdmNGut5BdT0z9r0kqEbb +DkEQJnAeFCcyVMvs44YrKSZWwssrMnyHfdiXy9twO1H3CzXOelhAYJeDAf5rro0T ++Pzc/hJIy3NryBEtS02/J0F5g8utl5K2bG4WtjUSamDDoCQACPJOkOoR4QXCF2/m +e84tD6g9uVSg9A2sdHLt3swi/VeVvODj28x8flqU5tGE0Jtk/o2tMj3B4wdoSIjZ +Qm92vTrHDt4bxBlMkfZ7tD98WeZFFDd8yfNymTlsQLOnHuosRXtH0AL9Z5CJT48d +EDyiDRiOnprEnuAvRk00AlAixd/ktLOz200bX5WK+8xX9w/p6IVyodNCA79xAa3Z +qdEnc/oVDVBV9UD0kqDWyFoW4lU/ENZMHaSUFGkoL5mv4fWiLhn5Nqu8lhie+WWE +8rIXFFrji0qLbWvHUTheiQIcBBMBCgAGBQJUbHLbAAoJEODyhZOu6tFRzMEP/i+b +QDKBSj6DpdGQr7AbeccJ/cMX2WLhyWcCKpEttvvu3g9UhqcWezdjd3lJVtYAX7zE +iae4Is1BUnAZW3gzRB8IO3NCGipc9QD9Wu3DbSY6xLG0w2GvDz9w4E3CNijN3TN0 +8SLXqxDxEyz2CHXCI1iNPEbVtnaOCU8u6RhYaQqMwJcb3KrNZi8mx7JhEgMmWXmZ +ZuzjH5Yp3NoW9ZXLBWYMMUZqcCM3/oyWVIR4p4l+Yrjh0hYMdNoQeZGO6p9BC6wK +zZq5pa+d8pXV/y5K6tlox1y2ehIHTBwpDacbpEjXPZtCl4xMlxaqJNrbUQ8/dE+0 +xTDHa1EL4HYlWCHSLjllFAYxDpXR6YPWgvTi6vEFNX0vW3nkiyC0FIG3kxAn0v5o
svn commit: r36740 - /dev/flex/flex-maven-tools/flex-sdk-converter/
Author: cdutz Date: Fri Nov 15 09:19:53 2019 New Revision: 36740 Log: added flex-sdk-converter Added: dev/flex/flex-maven-tools/flex-sdk-converter/
svn commit: r36739 - /dev/flex/flex-maven-tools/
Author: cdutz Date: Fri Nov 15 09:19:26 2019 New Revision: 36739 Log: added flex-maven-tools Added: dev/flex/flex-maven-tools/
[flex-utilities] branch develop updated: - Tweaked the formal text documents
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 551ee82 - Tweaked the formal text documents 551ee82 is described below commit 551ee825c78c27adcefa60ffb773c4f489660916 Author: Christofer Dutz AuthorDate: Thu Nov 14 16:33:13 2019 +0100 - Tweaked the formal text documents --- flex-maven-tools/flex-sdk-converter/README.txt| 2 +- flex-maven-tools/flex-sdk-converter/RELEASE_NOTES | 8 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/README.txt b/flex-maven-tools/flex-sdk-converter/README.txt index 7f84e76..9410a47 100644 --- a/flex-maven-tools/flex-sdk-converter/README.txt +++ b/flex-maven-tools/flex-sdk-converter/README.txt @@ -62,7 +62,7 @@ Install Prerequisites SOFTWAREENVIRONMENT VARIABLE (absolute paths) == -Java SDK 1.6 or greater (*1)JAVA_HOME +Java SDK 1.7 or greater (*1)JAVA_HOME Maven 3.1.0 or greater (*1) MAVEN_HOME diff --git a/flex-maven-tools/flex-sdk-converter/RELEASE_NOTES b/flex-maven-tools/flex-sdk-converter/RELEASE_NOTES index d51fd96..3a0e14b 100644 --- a/flex-maven-tools/flex-sdk-converter/RELEASE_NOTES +++ b/flex-maven-tools/flex-sdk-converter/RELEASE_NOTES @@ -1,9 +1,9 @@ -Apache Flex Mavenizer 1.0.0 +Apache Flex SDK Converter 1.0.0 === -Apache Flex Mavenizer 1.0.0 is the first release of a tool allowing, automating -the conversion of Apache Flex FDKs into Maven artifacts that can be used by -FlexMojos to build Apache Flex application using Maven. +Apache Flex SDK Converter 1.0.0 is the first release of a tool allowing, automating +the conversion of Apache Flex FDKs into Maven artifacts that can be used by tools +like FlexMojos to build Apache Flex application using Maven. Known Issues _
[flex-utilities] branch develop updated: - Removed a reference to a version variable - Added generating a SHA512 hash of the source-release
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new 0dc5b70 - Removed a reference to a version variable - Added generating a SHA512 hash of the source-release 0dc5b70 is described below commit 0dc5b70894664f704b086e67e636e90caaaf3520 Author: Christofer Dutz AuthorDate: Thu Nov 14 16:23:36 2019 +0100 - Removed a reference to a version variable - Added generating a SHA512 hash of the source-release --- flex-maven-tools/flex-sdk-converter/pom.xml| 44 ++ .../flex-sdk-converter/retrievers/download/pom.xml | 20 +- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/flex-maven-tools/flex-sdk-converter/pom.xml b/flex-maven-tools/flex-sdk-converter/pom.xml index 8076911..92ff0c5 100644 --- a/flex-maven-tools/flex-sdk-converter/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/pom.xml @@ -80,4 +80,48 @@ + + + + +apache-release + + + + +net.nicoulaj.maven.plugins +checksum-maven-plugin +1.8 + + +package + +files + + + + + +SHA-512 + + + + ${project.build.directory} + + ${project.artifactId}-${project.version}-source-release.zip + + + + + + + + + diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml b/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml index ffa2665..351037a 100644 --- a/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml @@ -44,9 +44,27 @@ +commons-io +commons-io +2.4 + + + + +net.sf.sevenzipjbinding +sevenzipjbinding +9.20-2.00beta + + +net.sf.sevenzipjbinding +sevenzipjbinding-all-platforms +9.20-2.00beta + + + org.mock-server mockserver-netty -RELEASE +5.1.0 test
[flex-utilities] branch develop updated: - Updated the the root pom to be able to be released.
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/develop by this push: new fb5a556 - Updated the the root pom to be able to be released. fb5a556 is described below commit fb5a5560e63bcd3e8c8bc610d1126504d812b1f9 Author: Christofer Dutz AuthorDate: Thu Nov 14 16:14:54 2019 +0100 - Updated the the root pom to be able to be released. --- flex-maven-tools/flex-sdk-converter/pom.xml | 175 +--- 1 file changed, 2 insertions(+), 173 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/pom.xml b/flex-maven-tools/flex-sdk-converter/pom.xml index 1aebab9..8076911 100644 --- a/flex-maven-tools/flex-sdk-converter/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/pom.xml @@ -23,7 +23,7 @@ org.apache apache -16 +21 org.apache.flex.utilities.converter @@ -34,18 +34,10 @@ Apache Flex - SDK-Converter -1.6 +1.7 3.1.1 0.9.0.M4 2.2 - - -https://builds.apache.org/analysis - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - -file:**/generated-sources/** @@ -64,7 +56,6 @@ scm:git:https://git-wip-us.apache.org/repos/asf/flex-utilities.git scm:git:https://git-wip-us.apache.org/repos/asf/flex-utilities.git https://git-wip-us.apache.org/repos/asf/flex-utilities.git -HEAD @@ -81,174 +72,12 @@ org.apache.maven.plugins maven-compiler-plugin -3.5.1 ${java.version} ${java.version} ${project.build.sourceEncoding} - - -org.jacoco -jacoco-maven-plugin -0.7.6.201602180812 - - - -pre-unit-test - -prepare-agent - - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - -surefireArgLine - - - - -post-unit-test -test - -report - - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - ${project.reporting.outputDirectory}/jacoco-ut - - - - -pre-integration-test -pre-integration-test - -prepare-agent - - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - -failsafeArgLine - - - - -post-integration-test -post-integration-test - -report - - - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - ${project.reporting.outputDirectory}/jacoco-it - - - - - - - -org.apache.maven.plugins -maven-surefire-plugin -2.19 - -${surefireArgLine} - -Maven -${flex.version} -${flash.version} -${air.version} - ${settings.localRepository} - - -false - - - - - -org.apache.maven.plugins -maven-failsafe-plugin -2.18.1 - - - -integration-test -verify
[flex-utilities] branch feature/flash-downloader updated: - Updated the project to a somewhat releasable state
This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch feature/flash-downloader in repository https://gitbox.apache.org/repos/asf/flex-utilities.git The following commit(s) were added to refs/heads/feature/flash-downloader by this push: new 133b6ec - Updated the project to a somewhat releasable state 133b6ec is described below commit 133b6ec00ba486fd32fdb9ef34a3c200c4f6fc10 Author: Christofer Dutz AuthorDate: Mon Nov 11 11:42:52 2019 +0100 - Updated the project to a somewhat releasable state --- flex-maven-tools/flex-sdk-converter/api/pom.xml| 4 +- flex-maven-tools/flex-sdk-converter/cli/pom.xml| 12 +- .../flex-sdk-converter/converters/air/pom.xml | 6 +- .../flex-sdk-converter/converters/base/pom.xml | 6 +- .../flex-sdk-converter/converters/flash/pom.xml| 7 +- .../flex-sdk-converter/converters/flex/pom.xml | 13 +- .../flex-sdk-converter/converters/fontkit/pom.xml | 6 +- .../flex-sdk-converter/converters/pom.xml | 3 +- .../flex-sdk-converter/converters/wrapper/pom.xml | 6 +- .../flex-sdk-converter/deployers/aether/pom.xml| 4 +- .../flex-sdk-converter/deployers/maven/pom.xml | 4 +- .../flex-sdk-converter/deployers/pom.xml | 3 +- .../flex-sdk-converter/maven-extension/pom.xml | 16 +- flex-maven-tools/flex-sdk-converter/pom.xml| 177 +--- .../flex-sdk-converter/retrievers/base/pom.xml | 6 +- .../flex-sdk-converter/retrievers/download/pom.xml | 15 +- .../retrievers/download/utils/DmgExtractor.java| 319 - .../download/utils/utils/ApplePartitionMap.java| 209 -- .../download/utils/utils/DmgBlkxBlock.java | 125 .../download/utils/utils/DmgBlockChunkEntry.java | 95 -- .../download/utils/utils/DmgTrailer.java | 174 --- .../download/utils/utils/DmgUdifChecksum.java | 42 --- .../download/utils/utils/DriverDescriptor.java | 38 --- .../download/utils/utils/DriverDescriptorMap.java | 85 -- .../download/utils/utils/HFSVolumeFactory.java | 24 -- .../download/utils/utils/IHFSVolumeHeader.java | 10 - .../utils/utils/btree/BTreeDescriptor.java | 99 --- .../utils/utils/btree/BTreeHeaderNode.java | 55 .../utils/utils/btree/BTreeHeaderRecord.java | 168 --- .../download/utils/utils/btree/BTreeIndexNode.java | 36 --- .../download/utils/utils/btree/BTreeLeafNode.java | 36 --- .../download/utils/utils/btree/BTreeMapNode.java | 36 --- .../download/utils/utils/btree/BTreeMapRecord.java | 29 -- .../download/utils/utils/btree/BTreeNode.java | 42 --- .../utils/utils/btree/BTreeUserDataRecord.java | 28 -- .../download/utils/utils/hfs/HFSVolumeHeader.java | 29 -- .../utils/utils/hfsplus/HFSPlusExtent.java | 56 .../utils/utils/hfsplus/HFSPlusFinderInfo.java | 72 - .../utils/utils/hfsplus/HFSPlusForkData.java | 74 - .../utils/utils/hfsplus/HFSPlusVolumeHeader.java | 311 .../utils/utils/hfsx/HFSXVolumeHeader.java | 29 -- .../converter/retrievers/download/ProxyTest.java | 4 +- .../flex-sdk-converter/retrievers/pom.xml | 3 +- 43 files changed, 46 insertions(+), 2470 deletions(-) diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml index 15e1a2a..0ba4943 100644 --- a/flex-maven-tools/flex-sdk-converter/api/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml @@ -23,11 +23,9 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT api -1.0.0-SNAPSHOT -jar diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml index 095617f..2f307e2 100644 --- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml @@ -23,12 +23,10 @@ org.apache.flex.utilities.converter apache-flex-sdk-converter -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT cli -1.0.0-SNAPSHOT -jar @@ -68,23 +66,23 @@ org.apache.flex.utilities.converter api -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT org.apache.flex.utilities.converter download-retriever -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT org.apache.flex.utilities.converter flex-converter -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT org.apache.flex.utilities.converter aether-deployer -1.0.0-SNAPSHOT +1.1.0-SNAPSHOT diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex
git commit: [flex-asjs] [refs/heads/develop] - did stuff
Repository: flex-asjs Updated Branches: refs/heads/develop 9e2267216 -> 4fa9ffa3d did stuff Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4fa9ffa3 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4fa9ffa3 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4fa9ffa3 Branch: refs/heads/develop Commit: 4fa9ffa3dc070295520ad805a2a501e4341c8cc0 Parents: 9e22672 Author: Christofer DutzAuthored: Wed Jun 14 10:13:38 2017 +0200 Committer: Christofer Dutz Committed: Wed Jun 14 10:13:38 2017 +0200 -- distribution/jars/compc/pom.xml| 1 + distribution/jars/falcon-asc/pom.xml | 1 + distribution/jars/falcon-compc/pom.xml | 1 + distribution/jars/falcon-mxmlc/pom.xml | 1 + distribution/jars/falcon-optimizer/pom.xml | 1 + distribution/jars/falcon-swfdump/pom.xml | 1 + distribution/jars/mxmlc/pom.xml| 1 + examples/pom.xml | 2 +- pom.xml| 7 +++ 9 files changed, 15 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/compc/pom.xml -- diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml index 1b3cfaa..f4a17ee 100644 --- a/distribution/jars/compc/pom.xml +++ b/distribution/jars/compc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/falcon-asc/pom.xml -- diff --git a/distribution/jars/falcon-asc/pom.xml b/distribution/jars/falcon-asc/pom.xml index e1b4ae1..3d9dca8 100644 --- a/distribution/jars/falcon-asc/pom.xml +++ b/distribution/jars/falcon-asc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/falcon-compc/pom.xml -- diff --git a/distribution/jars/falcon-compc/pom.xml b/distribution/jars/falcon-compc/pom.xml index c332371..f178e21 100644 --- a/distribution/jars/falcon-compc/pom.xml +++ b/distribution/jars/falcon-compc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/falcon-mxmlc/pom.xml -- diff --git a/distribution/jars/falcon-mxmlc/pom.xml b/distribution/jars/falcon-mxmlc/pom.xml index d0bf1b9..9d24cd2 100644 --- a/distribution/jars/falcon-mxmlc/pom.xml +++ b/distribution/jars/falcon-mxmlc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/falcon-optimizer/pom.xml -- diff --git a/distribution/jars/falcon-optimizer/pom.xml b/distribution/jars/falcon-optimizer/pom.xml index eec988e..022b4d3 100644 --- a/distribution/jars/falcon-optimizer/pom.xml +++ b/distribution/jars/falcon-optimizer/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/falcon-swfdump/pom.xml -- diff --git a/distribution/jars/falcon-swfdump/pom.xml b/distribution/jars/falcon-swfdump/pom.xml index 86f1ef8..7362a68 100644 --- a/distribution/jars/falcon-swfdump/pom.xml +++ b/distribution/jars/falcon-swfdump/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4fa9ffa3/distribution/jars/mxmlc/pom.xml -- diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml index ff99ffa..332b25f 100644
git commit: [flex-falcon] [refs/heads/release0.8.0] - Added a rat exclusion for the flex-typedefs directory which causes problems in ANT built release packages.
Repository: flex-falcon Updated Branches: refs/heads/release0.8.0 e8e91e671 -> e90ea207b Added a rat exclusion for the flex-typedefs directory which causes problems in ANT built release packages. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e90ea207 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e90ea207 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e90ea207 Branch: refs/heads/release0.8.0 Commit: e90ea207b05a2cd31fbfba8f54c8e386f603fefa Parents: e8e91e6 Author: Christofer DutzAuthored: Tue Jun 13 08:58:25 2017 +0200 Committer: Christofer Dutz Committed: Tue Jun 13 08:58:25 2017 +0200 -- pom.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e90ea207/pom.xml -- diff --git a/pom.xml b/pom.xml index 0f34fc2..de4d206 100644 --- a/pom.xml +++ b/pom.xml @@ -162,6 +162,12 @@ **/target/** lib/** + +flex-typedefs/**
[2/3] git commit: [flex-asjs] [refs/heads/release0.8.0] - - Added missing "relativePath" entries to the parts of the distribution bundle.
- Added missing "relativePath" entries to the parts of the distribution bundle. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2ca935a0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2ca935a0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2ca935a0 Branch: refs/heads/release0.8.0 Commit: 2ca935a0e7c55d40c2dafb0558d616106572403b Parents: e6ec965 Author: Christofer DutzAuthored: Mon Jun 12 11:14:52 2017 +0200 Committer: Christofer Dutz Committed: Mon Jun 12 11:14:52 2017 +0200 -- distribution/jars/compc/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ca935a0/distribution/jars/compc/pom.xml -- diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml index 1b3cfaa..f4a17ee 100644 --- a/distribution/jars/compc/pom.xml +++ b/distribution/jars/compc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution
[1/3] git commit: [flex-asjs] [refs/heads/release0.8.0] - - Added missing "relativePath" entries to the parts of the distribution bundle.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 d4aa7a6fc -> 77b09e0a8 - Added missing "relativePath" entries to the parts of the distribution bundle. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e6ec9658 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e6ec9658 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e6ec9658 Branch: refs/heads/release0.8.0 Commit: e6ec96587e5dd6182f64ceeb85ff963c353181cd Parents: 4ddc52c Author: Christofer DutzAuthored: Mon Jun 12 11:14:34 2017 +0200 Committer: Christofer Dutz Committed: Mon Jun 12 11:14:34 2017 +0200 -- distribution/jars/falcon-asc/pom.xml | 1 + distribution/jars/falcon-compc/pom.xml | 1 + distribution/jars/falcon-mxmlc/pom.xml | 1 + distribution/jars/falcon-optimizer/pom.xml | 1 + distribution/jars/falcon-swfdump/pom.xml | 1 + distribution/jars/mxmlc/pom.xml| 1 + 6 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6ec9658/distribution/jars/falcon-asc/pom.xml -- diff --git a/distribution/jars/falcon-asc/pom.xml b/distribution/jars/falcon-asc/pom.xml index e1b4ae1..3d9dca8 100644 --- a/distribution/jars/falcon-asc/pom.xml +++ b/distribution/jars/falcon-asc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6ec9658/distribution/jars/falcon-compc/pom.xml -- diff --git a/distribution/jars/falcon-compc/pom.xml b/distribution/jars/falcon-compc/pom.xml index c332371..f178e21 100644 --- a/distribution/jars/falcon-compc/pom.xml +++ b/distribution/jars/falcon-compc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6ec9658/distribution/jars/falcon-mxmlc/pom.xml -- diff --git a/distribution/jars/falcon-mxmlc/pom.xml b/distribution/jars/falcon-mxmlc/pom.xml index d0bf1b9..9d24cd2 100644 --- a/distribution/jars/falcon-mxmlc/pom.xml +++ b/distribution/jars/falcon-mxmlc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6ec9658/distribution/jars/falcon-optimizer/pom.xml -- diff --git a/distribution/jars/falcon-optimizer/pom.xml b/distribution/jars/falcon-optimizer/pom.xml index eec988e..022b4d3 100644 --- a/distribution/jars/falcon-optimizer/pom.xml +++ b/distribution/jars/falcon-optimizer/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6ec9658/distribution/jars/falcon-swfdump/pom.xml -- diff --git a/distribution/jars/falcon-swfdump/pom.xml b/distribution/jars/falcon-swfdump/pom.xml index 86f1ef8..7362a68 100644 --- a/distribution/jars/falcon-swfdump/pom.xml +++ b/distribution/jars/falcon-swfdump/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6ec9658/distribution/jars/mxmlc/pom.xml -- diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml index ff99ffa..332b25f 100644 --- a/distribution/jars/mxmlc/pom.xml +++ b/distribution/jars/mxmlc/pom.xml @@ -25,6 +25,7 @@ org.apache.flex.flexjs.framework flexjs-framework-parent 0.8.0-SNAPSHOT +../../../pom.xml org.apache.flex.flexjs.framework.distribution
[3/3] git commit: [flex-asjs] [refs/heads/release0.8.0] - Merge remote-tracking branch 'origin/release0.8.0' into release0.8.0
Merge remote-tracking branch 'origin/release0.8.0' into release0.8.0 Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/77b09e0a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/77b09e0a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/77b09e0a Branch: refs/heads/release0.8.0 Commit: 77b09e0a89a88342db6a335852bad510a0bf1ac2 Parents: 2ca935a d4aa7a6 Author: Christofer DutzAuthored: Mon Jun 12 11:15:07 2017 +0200 Committer: Christofer Dutz Committed: Mon Jun 12 11:15:07 2017 +0200 -- RELEASE_NOTES | 1 + build.xml | 18 +--- examples/flexjs/StorageExample/pom.xml | 15 ++- .../flex/org/apache/flex/core/LayoutBase.as | 36 .../main/flex/org/apache/flex/core/UIBase.as| 5 +++ .../src/main/flex/org/apache/flex/core/View.as | 2 +- .../main/flex/org/apache/flex/html/CheckBox.as | 1 + .../main/flex/org/apache/flex/html/Slider.as| 1 + .../html/beads/AccordionItemRendererView.as | 25 ++- .../org/apache/flex/html/beads/GroupView.as | 9 .../flex/html/beads/NumericStepperView.as | 44 +++- .../org/apache/flex/html/beads/PanelView.as | 15 +++ .../org/apache/flex/html/beads/SpinnerView.as | 17 .../beads/controllers/SliderMouseController.as | 27 .../beads/controllers/SpinnerMouseController.as | 9 +++- .../html/beads/layouts/VerticalFlexLayout.as| 14 +-- .../apache/flex/html/beads/models/RangeModel.as | 6 ++- .../html/beads/models/RangeModelExtended.as | 9 +++- .../flex/html/beads/models/ToggleButtonModel.as | 2 +- .../html/beads/models/ValueToggleButtonModel.as | 5 ++- .../supportClasses/AccordionItemRenderer.as | 2 + .../Basic/src/main/resources/defaults.css | 28 - .../FlexJSTest_Panel/src/MyInitialView.mxml | 7 +++- .../java/src/marmotinni/MarmotinniRunner.java | 9 releasecandidate.xml| 36 25 files changed, 267 insertions(+), 76 deletions(-) --
git commit: [flex-asjs] [refs/heads/develop] - - Removed the Fonts.swf dependency from the distribution package
Repository: flex-asjs Updated Branches: refs/heads/develop e5f1328c6 -> 95545813d - Removed the Fonts.swf dependency from the distribution package Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/95545813 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/95545813 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/95545813 Branch: refs/heads/develop Commit: 95545813dbb0bc60e9f56a6371351bca4c61a6fb Parents: e5f1328 Author: Christofer DutzAuthored: Thu May 25 16:53:29 2017 +0200 Committer: Christofer Dutz Committed: Thu May 25 16:53:29 2017 +0200 -- distribution/pom.xml | 13 +++-- distribution/src/main/assembly/component.xml | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95545813/distribution/pom.xml -- diff --git a/distribution/pom.xml b/distribution/pom.xml index f8e2478..5e0708f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -439,12 +439,13 @@ - - org.apache.flex.flexjs.framework - Fonts - 0.8.0-SNAPSHOT - swf - + + org.apache.flex.flexjs.framework Fonts http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95545813/distribution/src/main/assembly/component.xml -- diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml index 7e40f9e..0b8235f 100644 --- a/distribution/src/main/assembly/component.xml +++ b/distribution/src/main/assembly/component.xml @@ -102,14 +102,15 @@ under the License. - + + false frameworks/fonts
[1/2] git commit: [flex-asjs] [refs/heads/release0.8.0] - - Removed the execution of the font compilation
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 2fad673d2 -> baa544c21 - Removed the execution of the font compilation Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c2eefaf7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c2eefaf7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c2eefaf7 Branch: refs/heads/release0.8.0 Commit: c2eefaf7bdb2d8577134f861a23ea07c691cf103 Parents: 2fad673 Author: Christofer DutzAuthored: Wed May 24 14:11:27 2017 +0200 Committer: Christofer Dutz Committed: Wed May 24 14:11:27 2017 +0200 -- frameworks/fontsrc/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c2eefaf7/frameworks/fontsrc/pom.xml -- diff --git a/frameworks/fontsrc/pom.xml b/frameworks/fontsrc/pom.xml index e9f1db1..356d6fa 100644 --- a/frameworks/fontsrc/pom.xml +++ b/frameworks/fontsrc/pom.xml @@ -60,7 +60,7 @@ - + org.apache.maven.plugins @@ -116,7 +116,7 @@ Attach the generated swf as additional Maven artifact, So it is automatically installed and deployed. --> - +
[2/2] git commit: [flex-asjs] [refs/heads/release0.8.0] - - Fixed some problems in the archetypes
- Fixed some problems in the archetypes Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/baa544c2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/baa544c2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/baa544c2 Branch: refs/heads/release0.8.0 Commit: baa544c21715772f4eb3cee74a9ddc0e128fa2f0 Parents: c2eefaf Author: Christofer DutzAuthored: Wed May 24 14:11:42 2017 +0200 Committer: Christofer Dutz Committed: Wed May 24 14:11:42 2017 +0200 -- .../src/main/resources/META-INF/maven/archetype.xml | 1 + .../src/main/resources/archetype-resources/pom.xml | 3 --- .../src/main/resources/META-INF/maven/archetype.xml | 1 + .../src/main/resources/archetype-resources/pom.xml | 11 --- .../src/main/resources/META-INF/maven/archetype.xml | 1 + .../src/main/resources/archetype-resources/pom.xml | 16 +--- 6 files changed, 4 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml -- diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml index e765a36..7c92985 100644 --- a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -22,6 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd;> flexjs-simple-application-archetype +.mvn/extensions.xml src/main/flex/App.mxml http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml index 1e69b25..fc47d37 100644 --- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,6 @@ true -target/javascript/bin/js-debug @@ -84,7 +83,6 @@ Language 0.8.0-SNAPSHOT swc - js @@ -93,7 +91,6 @@ release false - target/javascript/bin/js-release http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml index e765a36..7c92985 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -22,6 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd;> flexjs-simple-application-archetype +.mvn/extensions.xml src/main/flex/App.mxml http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml index 8715462..c58ee01 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,6 @@ true -target/javascript/bin/js-debug @@ -64,15 +63,6 @@ swc - - - com.adobe.flash.framework - playerglobal - ${flash.version}
[flex-typedefs] Git Push Summary
Repository: flex-typedefs Updated Branches: refs/heads/release0.8.0 [created] 2bd4044d1
git commit: [flex-asjs] [refs/heads/develop] - - Removed the font compilation as this is causing SSL problems and is currently needed nowhere.
Repository: flex-asjs Updated Branches: refs/heads/develop 60664b858 -> 12cad35ec - Removed the font compilation as this is causing SSL problems and is currently needed nowhere. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/12cad35e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/12cad35e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/12cad35e Branch: refs/heads/develop Commit: 12cad35ec9f774f99c5ccd38a9bebaca628f0688 Parents: 60664b8 Author: Christofer DutzAuthored: Thu May 18 17:26:29 2017 -0400 Committer: Christofer Dutz Committed: Thu May 18 17:26:29 2017 -0400 -- frameworks/fontsrc/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/12cad35e/frameworks/fontsrc/pom.xml -- diff --git a/frameworks/fontsrc/pom.xml b/frameworks/fontsrc/pom.xml index e9f1db1..356d6fa 100644 --- a/frameworks/fontsrc/pom.xml +++ b/frameworks/fontsrc/pom.xml @@ -60,7 +60,7 @@ - + org.apache.maven.plugins @@ -116,7 +116,7 @@ Attach the generated swf as additional Maven artifact, So it is automatically installed and deployed. --> - +
git commit: [flex-falcon] [refs/heads/develop] - - Reformatted the config templates.
Repository: flex-falcon Updated Branches: refs/heads/develop 31fd9d66d -> d533d5ed5 - Reformatted the config templates. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d533d5ed Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d533d5ed Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d533d5ed Branch: refs/heads/develop Commit: d533d5ed51fc92a7d23780ce2747daaa124490d4 Parents: 31fd9d6 Author: Christofer DutzAuthored: Thu May 18 11:54:57 2017 -0400 Committer: Christofer Dutz Committed: Thu May 18 11:54:57 2017 -0400 -- .../resources/config/compile-app-config.xml | 8 ++-- .../config/compile-asdoc-js-config.xml | 48 ++-- .../resources/config/compile-swf-config.xml | 16 +++ 3 files changed, 36 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d533d5ed/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml -- diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml index 425552a..cb38619 100644 --- a/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml +++ b/flexjs-maven-plugin/src/main/resources/config/compile-app-config.xml @@ -67,8 +67,8 @@ -#foreach($artifact in $swfExternalLibraries) $artifact.file -#end +#foreach($artifact in $swfExternalLibraries) $artifact.file +#end @@ -95,8 +95,8 @@ -#foreach($artifact in $swfLibraries) $artifact.file -#end +#foreach($artifact in $swfLibraries) $artifact.file +#end $allowSubclassOverrides http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d533d5ed/flexjs-maven-plugin/src/main/resources/config/compile-asdoc-js-config.xml -- diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-asdoc-js-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-asdoc-js-config.xml index 034246b..ce582fa 100644 --- a/flexjs-maven-plugin/src/main/resources/config/compile-asdoc-js-config.xml +++ b/flexjs-maven-plugin/src/main/resources/config/compile-asdoc-js-config.xml @@ -24,33 +24,33 @@ $debug - #foreach($artifact in $libraries) $artifact.file - #end +#foreach($artifact in $libraries) $artifact.file +#end - #foreach($artifact in $externalLibraries) $artifact.file - #end +#foreach($artifact in $externalLibraries) $artifact.file +#end - #foreach($sourcePath in $sourcePaths) $sourcePath - #end +#foreach($sourcePath in $sourcePaths) $sourcePath +#end - #foreach($namespace in $namespaces) +#foreach($namespace in $namespaces) $namespace.uri $namespace.manifest - #end +#end false - #foreach($metadata in $keepAs3Metadata)$metadata - #end +#foreach($metadata in $keepAs3Metadata)$metadata +#end $allowSubclassOverrides @@ -65,33 +65,33 @@ false -#foreach($define in $defines) +#foreach($define in $defines) $define.name $define.value -#end +#end - #if($includeSources) +#if($includeSources) -#foreach($sourcePath in $sourcePaths) $sourcePath -#end +#foreach($sourcePath in $sourcePaths) $sourcePath +#end - #end +#end - #if($includeClasses) +#if($includeClasses) -#foreach($includeClass in $includeClasses) $includeClass -#end +#foreach($includeClass in $includeClasses)$includeClass +#end - #end +#end - #if($namespaceUris) +#if($namespaceUris) -#foreach($namespaceUri in $namespaceUris)$namespaceUri -#end +#foreach($namespaceUri in $namespaceUris)$namespaceUri +#end - #end +#end FLEXJS http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d533d5ed/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml -- diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml index 7633a94..c53f821 100644 --- a/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml +++ b/flexjs-maven-plugin/src/main/resources/config/compile-swf-config.xml @@ -29,13 +29,13 @@
git commit: [flex-asjs] [refs/heads/develop] - - Added a NodeJS section to the examples - Added a NodeJS "Hello World" example
Repository: flex-asjs Updated Branches: refs/heads/develop 7a3c0e875 -> 60664b858 - Added a NodeJS section to the examples - Added a NodeJS "Hello World" example Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/60664b85 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/60664b85 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/60664b85 Branch: refs/heads/develop Commit: 60664b85865cec2a5eaa2877afbc3a0124d697c0 Parents: 7a3c0e8 Author: Christofer DutzAuthored: Thu May 18 11:53:51 2017 -0400 Committer: Christofer Dutz Committed: Thu May 18 11:53:51 2017 -0400 -- examples/node/HelloWorld/pom.xml| 55 + .../node/HelloWorld/src/main/flex/HelloWorld.as | 29 + examples/node/pom.xml | 65 examples/pom.xml| 1 + 4 files changed, 150 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60664b85/examples/node/HelloWorld/pom.xml -- diff --git a/examples/node/HelloWorld/pom.xml b/examples/node/HelloWorld/pom.xml new file mode 100644 index 000..c030150 --- /dev/null +++ b/examples/node/HelloWorld/pom.xml @@ -0,0 +1,55 @@ + + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples-node +0.8.0-SNAPSHOT + + + org.apache.flex.flexjs.examples.node + Node-HelloWorld + 0.8.0-SNAPSHOT + swf + + Apache Flex - FlexJS: Examples: NodeJS: HelloWorld + + + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +true + + HelloWorld.as + JSNode + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60664b85/examples/node/HelloWorld/src/main/flex/HelloWorld.as -- diff --git a/examples/node/HelloWorld/src/main/flex/HelloWorld.as b/examples/node/HelloWorld/src/main/flex/HelloWorld.as new file mode 100644 index 000..a6f40f5 --- /dev/null +++ b/examples/node/HelloWorld/src/main/flex/HelloWorld.as @@ -0,0 +1,29 @@ + +// +// 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 { + +public class HelloWorld { + +public function HelloWorld() { +console.log("Hello FlexJS World!") +} + +} + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60664b85/examples/node/pom.xml -- diff --git a/examples/node/pom.xml b/examples/node/pom.xml new file mode 100644 index 000..d641846 --- /dev/null +++ b/examples/node/pom.xml @@ -0,0 +1,65 @@ + + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples +0.8.0-SNAPSHOT + + + examples-node + 0.8.0-SNAPSHOT + pom + + Apache Flex - FlexJS: Examples: NodeJS + + +HelloWorld + + + + + + org.apache.flex.flexjs.typedefs + flexjs-typedefs-js + ${flexjs.typedefs.version} + swc + typedefs + runtime + + + org.apache.flex.flexjs.typedefs + flexjs-typedefs-node + ${flexjs.typedefs.version} + swc + typedefs + runtime + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60664b85/examples/pom.xml
git commit: [flex-asjs] [refs/heads/develop] - - Added the ".mvn/extensions.xml" to the archetypes for applications.
Repository: flex-asjs Updated Branches: refs/heads/develop 643a8cc11 -> 7a3c0e875 - Added the ".mvn/extensions.xml" to the archetypes for applications. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7a3c0e87 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7a3c0e87 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7a3c0e87 Branch: refs/heads/develop Commit: 7a3c0e875d93e7663cfde041180cf7edb290624e Parents: 643a8cc Author: Christofer DutzAuthored: Thu May 18 11:52:06 2017 -0400 Committer: Christofer Dutz Committed: Thu May 18 11:52:06 2017 -0400 -- .../src/main/resources/META-INF/maven/archetype.xml | 1 + .../src/main/resources/META-INF/maven/archetype.xml | 1 + .../src/main/resources/META-INF/maven/archetype.xml | 1 + 3 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a3c0e87/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml -- diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml index e765a36..7c92985 100644 --- a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -22,6 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd;> flexjs-simple-application-archetype +.mvn/extensions.xml src/main/flex/App.mxml http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a3c0e87/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml index e765a36..7c92985 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -22,6 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd;> flexjs-simple-application-archetype +.mvn/extensions.xml src/main/flex/App.mxml http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a3c0e87/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml -- diff --git a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml index e765a36..7c92985 100644 --- a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -22,6 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd;> flexjs-simple-application-archetype +.mvn/extensions.xml src/main/flex/App.mxml
git commit: [flex-asjs] [refs/heads/develop] - - Removed the unneeded "compiler.output-dir" parameter.
Repository: flex-asjs Updated Branches: refs/heads/develop 84bfbe5c0 -> 643a8cc11 - Removed the unneeded "compiler.output-dir" parameter. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/643a8cc1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/643a8cc1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/643a8cc1 Branch: refs/heads/develop Commit: 643a8cc11d9930e7beedcdd9684c46de4e206b44 Parents: 84bfbe5 Author: Christofer DutzAuthored: Wed May 17 07:54:21 2017 -0400 Committer: Christofer Dutz Committed: Wed May 17 07:54:21 2017 -0400 -- .../src/main/resources/archetype-resources/pom.xml | 2 -- .../src/main/resources/archetype-resources/pom.xml | 2 -- 2 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/643a8cc1/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml index 67e4e6d..fc47d37 100644 --- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,6 @@ true -target/javascript/bin/js-debug @@ -92,7 +91,6 @@ release false - target/javascript/bin/js-release http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/643a8cc1/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml index da37524..c58ee01 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,7 +29,6 @@ true -target/javascript/bin/js-debug @@ -84,7 +83,6 @@ release false - target/javascript/bin/js-release
git commit: [flex-asjs] [refs/heads/develop] - - Fine tuned the archetypes a little more.
Repository: flex-asjs Updated Branches: refs/heads/develop 832659208 -> 84bfbe5c0 - Fine tuned the archetypes a little more. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/84bfbe5c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/84bfbe5c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/84bfbe5c Branch: refs/heads/develop Commit: 84bfbe5c0531ae8ca7fdd6ac5b48158a156495eb Parents: 8326592 Author: Christofer DutzAuthored: Wed May 17 07:33:46 2017 -0400 Committer: Christofer Dutz Committed: Wed May 17 07:33:46 2017 -0400 -- .../src/main/resources/archetype-resources/pom.xml | 9 - .../src/main/resources/archetype-resources/pom.xml | 16 +--- 2 files changed, 1 insertion(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84bfbe5c/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml index 8715462..da37524 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml @@ -64,15 +64,6 @@ swc - - - com.adobe.flash.framework - playerglobal - ${flash.version} - swc - provided - - org.apache.flex.flexjs.framework http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84bfbe5c/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml index 70fe474..d096bae 100644 --- a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml @@ -37,7 +37,7 @@ true App.mxml - JSFlex + SWF @@ -66,20 +66,6 @@ swc provided - - - - org.apache.flex.flexjs.framework - HTML - 0.8.0-SNAPSHOT - swc - - - org.apache.flex.flexjs.framework - Language - 0.8.0-SNAPSHOT - swc - \ No newline at end of file
git commit: [flex-asjs] [refs/heads/develop] - - Re-named the "target" for building JS from "JS" to "JSFlex"
Repository: flex-asjs Updated Branches: refs/heads/develop 0a7da1bb3 -> 832659208 - Re-named the "target" for building JS from "JS" to "JSFlex" Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/83265920 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/83265920 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/83265920 Branch: refs/heads/develop Commit: 8326592089b2f748de81cd2ebcede8e5dd68b5f9 Parents: 0a7da1b Author: Christofer DutzAuthored: Tue May 16 18:45:53 2017 -0400 Committer: Christofer Dutz Committed: Tue May 16 18:45:53 2017 -0400 -- .../src/main/resources/archetype-resources/pom.xml | 15 +-- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 1 + 3 files changed, 3 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/83265920/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml index 637b3c1..67e4e6d 100644 --- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml @@ -42,21 +42,8 @@ true App.mxml + SWF,JSFlex - - - -compile-javascript -compile - - compile-app - - - \${compiler.debug} - JS - - - org.apache.flex.flexjs.compiler http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/83265920/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml index ad6af3a..8715462 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml @@ -43,7 +43,7 @@ App.mxml \${compiler.debug} - JS + JSFlex http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/83265920/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml index 36e9c57..70fe474 100644 --- a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml @@ -37,6 +37,7 @@ true App.mxml + JSFlex
git commit: [flex-asjs] [refs/heads/develop] - - Re-added the fontsrc module
Repository: flex-asjs Updated Branches: refs/heads/develop d54491fd3 -> 0a7da1bb3 - Re-added the fontsrc module Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0a7da1bb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0a7da1bb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0a7da1bb Branch: refs/heads/develop Commit: 0a7da1bb30942880f68e9a1b6890aa027f6956d8 Parents: d54491f Author: Christofer DutzAuthored: Mon May 15 11:56:32 2017 -0400 Committer: Christofer Dutz Committed: Mon May 15 11:56:32 2017 -0400 -- frameworks/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0a7da1bb/frameworks/pom.xml -- diff --git a/frameworks/pom.xml b/frameworks/pom.xml index 05f926d..75c0749 100644 --- a/frameworks/pom.xml +++ b/frameworks/pom.xml @@ -33,7 +33,7 @@ Apache Flex - FlexJS: Framework - +fontsrc projects
git commit: [flex-asjs] [refs/heads/develop] - - Added missing apache headers to some of the .actionScriptProperties
Repository: flex-asjs Updated Branches: refs/heads/develop dfdbc97a6 -> d54491fd3 - Added missing apache headers to some of the .actionScriptProperties Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d54491fd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d54491fd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d54491fd Branch: refs/heads/develop Commit: d54491fd30edc8e562db8475cc7b57cc870f7d62 Parents: dfdbc97 Author: Christofer DutzAuthored: Mon May 15 11:55:46 2017 -0400 Committer: Christofer Dutz Committed: Mon May 15 11:55:46 2017 -0400 -- frameworks/pom.xml | 2 +- .../projects/Graphics/.actionScriptProperties | 18 +++ .../projects/HTML/.actionScriptProperties | 18 +++ .../projects/HTML5/.actionScriptProperties | 24 ++-- .../projects/JQuery/.actionScriptProperties | 24 ++-- .../projects/Mobile/.actionScriptProperties | 24 ++-- .../projects/Network/.actionScriptProperties| 24 ++-- .../projects/Reflection/.actionScriptProperties | 24 ++-- 8 files changed, 97 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/pom.xml -- diff --git a/frameworks/pom.xml b/frameworks/pom.xml index 75c0749..05f926d 100644 --- a/frameworks/pom.xml +++ b/frameworks/pom.xml @@ -33,7 +33,7 @@ Apache Flex - FlexJS: Framework -fontsrc + projects http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/Graphics/.actionScriptProperties -- diff --git a/frameworks/projects/Graphics/.actionScriptProperties b/frameworks/projects/Graphics/.actionScriptProperties index 79c24d7..a66e686 100644 --- a/frameworks/projects/Graphics/.actionScriptProperties +++ b/frameworks/projects/Graphics/.actionScriptProperties @@ -1,4 +1,22 @@ + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/HTML/.actionScriptProperties -- diff --git a/frameworks/projects/HTML/.actionScriptProperties b/frameworks/projects/HTML/.actionScriptProperties index 8f3aeb5..5941dea 100644 --- a/frameworks/projects/HTML/.actionScriptProperties +++ b/frameworks/projects/HTML/.actionScriptProperties @@ -1,4 +1,22 @@ + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/HTML5/.actionScriptProperties -- diff --git a/frameworks/projects/HTML5/.actionScriptProperties b/frameworks/projects/HTML5/.actionScriptProperties index 2087297..7e1ca56 100644 --- a/frameworks/projects/HTML5/.actionScriptProperties +++ b/frameworks/projects/HTML5/.actionScriptProperties @@ -1,20 +1,20 @@ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/JQuery/.actionScriptProperties -- diff --git a/frameworks/projects/JQuery/.actionScriptProperties b/frameworks/projects/JQuery/.actionScriptProperties index 8206a8b..f89db2d 100644 --- a/frameworks/projects/JQuery/.actionScriptProperties +++ b/frameworks/projects/JQuery/.actionScriptProperties @@ -1,20 +1,20 @@ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/Mobile/.actionScriptProperties -- diff --git a/frameworks/projects/Mobile/.actionScriptProperties b/frameworks/projects/Mobile/.actionScriptProperties index 31b1fbe..63c502a 100644 --- a/frameworks/projects/Mobile/.actionScriptProperties +++ b/frameworks/projects/Mobile/.actionScriptProperties @@ -1,20 +1,20 @@ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/Network/.actionScriptProperties -- diff --git a/frameworks/projects/Network/.actionScriptProperties b/frameworks/projects/Network/.actionScriptProperties index 97d04f8..17b7454 100644 --- a/frameworks/projects/Network/.actionScriptProperties +++ b/frameworks/projects/Network/.actionScriptProperties @@ -1,20 +1,20 @@ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d54491fd/frameworks/projects/Reflection/.actionScriptProperties -- diff --git a/frameworks/projects/Reflection/.actionScriptProperties
git commit: [flex-asjs] [refs/heads/develop] - - Post dual branch merge cleanup
Repository: flex-asjs Updated Branches: refs/heads/develop 986d75596 -> ed2503e4e - Post dual branch merge cleanup Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ed2503e4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ed2503e4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ed2503e4 Branch: refs/heads/develop Commit: ed2503e4ec9a260a026008ba9b2737992d8b53a8 Parents: 986d755 Author: Christofer DutzAuthored: Mon May 1 19:16:26 2017 +0200 Committer: Christofer Dutz Committed: Mon May 1 19:16:39 2017 +0200 -- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- examples/native/ButtonExample/pom.xml | 1 - examples/native/USStatesMap/pom.xml| 1 - testsuite/src/it/compiler-options/custom-html-template/pom.xml | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml index 637e719..637b3c1 100644 --- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml @@ -53,7 +53,7 @@ \${compiler.debug} - true + JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml index 66360ea..ad6af3a 100644 --- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml @@ -42,8 +42,8 @@ true App.mxml - true \${compiler.debug} + JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/examples/native/ButtonExample/pom.xml -- diff --git a/examples/native/ButtonExample/pom.xml b/examples/native/ButtonExample/pom.xml index b81d238..17b1942 100644 --- a/examples/native/ButtonExample/pom.xml +++ b/examples/native/ButtonExample/pom.xml @@ -41,7 +41,6 @@ flexjs-maven-plugin true - true ButtonExample.as JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/examples/native/USStatesMap/pom.xml -- diff --git a/examples/native/USStatesMap/pom.xml b/examples/native/USStatesMap/pom.xml index 936866d..7c6d81e 100644 --- a/examples/native/USStatesMap/pom.xml +++ b/examples/native/USStatesMap/pom.xml @@ -42,7 +42,6 @@ ${flexjs.compiler.version} true - true USStatesMap.as JS http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/testsuite/src/it/compiler-options/custom-html-template/pom.xml -- diff --git a/testsuite/src/it/compiler-options/custom-html-template/pom.xml b/testsuite/src/it/compiler-options/custom-html-template/pom.xml index d6096d5..74ff0d0 100644 --- a/testsuite/src/it/compiler-options/custom-html-template/pom.xml +++ b/testsuite/src/it/compiler-options/custom-html-template/pom.xml @@ -43,7 +43,7 @@ true HelloWorld.mxml - true + JS ${basedir}/src/main/template/custom-js-index-template.html
git commit: [flex-asjs] [refs/heads/dual] - - Fixed the assembly descriptor to correctly package the html module
Repository: flex-asjs Updated Branches: refs/heads/dual 5d6519a9c -> 7ffe9dd23 - Fixed the assembly descriptor to correctly package the html module Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7ffe9dd2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7ffe9dd2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7ffe9dd2 Branch: refs/heads/dual Commit: 7ffe9dd23e2d8e57e4e357cab0d358adb04b2937 Parents: 5d6519a Author: Christofer DutzAuthored: Tue Apr 25 22:31:52 2017 +0200 Committer: Christofer Dutz Committed: Tue Apr 25 22:31:52 2017 +0200 -- distribution/src/main/assembly/component.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7ffe9dd2/distribution/src/main/assembly/component.xml -- diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml index a27dc15..8a81182 100644 --- a/distribution/src/main/assembly/component.xml +++ b/distribution/src/main/assembly/component.xml @@ -264,11 +264,6 @@ under the License. svg-manifest-graphics.xml - ../frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml - frameworks/manifests - basic-as-manifest-html.xml - - ../frameworks/projects/HTML/src/main/resources/basic-manifest.xml frameworks/manifests basic-manifest-html.xml
[05/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - ant_on_air: Exec task makes Ant fail if failonerror is true and the NativeProcessExitEvent exitCode is not 0
ant_on_air: Exec task makes Ant fail if failonerror is true and the NativeProcessExitEvent exitCode is not 0 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/903fddec Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/903fddec Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/903fddec Branch: refs/heads/feature/flash-downloader Commit: 903fddecda2c30e6069db5763baec51dca5a82c7 Parents: 60b0452 Author: Josh TynjalaAuthored: Mon Nov 21 14:35:44 2016 -0800 Committer: Josh Tynjala Committed: Mon Nov 21 14:35:44 2016 -0800 -- .../ant_on_air/src/org/apache/flex/ant/tags/Exec.as | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/903fddec/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Exec.as -- diff --git a/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Exec.as b/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Exec.as index bc503a6..e5eced7 100644 --- a/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Exec.as +++ b/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Exec.as @@ -126,11 +126,23 @@ package org.apache.flex.ant.tags { return getAttributeValue("@outputproperty"); } + +override public function get failonerror():Boolean +{ +var val:String = getNullOrAttributeValue("@failonerror"); +//if omitted, defaults to false +return val == null ? false : val == "true"; +} private var process:NativeProcess; private function exitHandler(event:NativeProcessExitEvent):void { +if(event.exitCode !== 0 && failonerror) +{ +ant.project.failureMessage = "Exec task failed: " + fileName; +ant.project.status = false; +} dispatchEvent(new Event(Event.COMPLETE)); }
[15/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - Continued working on the decoding of DMG images.
Continued working on the decoding of DMG images. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d0cef423 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d0cef423 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d0cef423 Branch: refs/heads/feature/flash-downloader Commit: d0cef423715970e7ea624340e7e3371f18934312 Parents: 0b6dfdd ee771e6 Author: Christofer DutzAuthored: Tue Apr 18 14:14:58 2017 +0200 Committer: Christofer Dutz Committed: Tue Apr 18 14:14:58 2017 +0200 -- .../spelling/ISpellingContainerController.as| 7 + .../spelling/SpellingContextMenuForTLF.as | 7 +- .../SquigglyCustomContainerController.as| 6 +- .../src/org/apache/flex/ant/tags/Exec.as| 12 + .../src/org/apache/flex/ant/tags/Replace.as | 5 + .../utilities/converter/air/AirConverter.java | 66 +++- .../flex-sdk-converter/converters/base/pom.xml | 16 + .../flex/utilities/converter/BaseConverter.java | 58 ++-- .../base/src/main/resources/logback.xml | 16 + .../utilities/converter/flex/FlexConverter.java | 8 +- .../deployer/aether/AetherDeployer.java | 26 +- .../converter/retrievers/BaseRetriever.java | 41 ++- .../retrievers/download/DownloadRetriever.java | 210 - .../download/utils/utils/DmgBlkxBlock.java | 125 .../utils/utils/DmgPropertyListMishBlock.java | 109 --- .../download/utils/utils/HFSPlusExtent.java | 40 --- .../download/utils/utils/HFSPlusForkData.java | 58 .../utils/utils/HFSPlusVolumeHeader.java| 217 - .../download/utils/utils/HFSVolumeHeader.java | 13 - .../utils/utils/btree/BTreeDescriptor.java | 99 ++ .../utils/utils/btree/BTreeHeaderNode.java | 55 .../utils/utils/btree/BTreeHeaderRecord.java| 168 ++ .../utils/utils/btree/BTreeIndexNode.java | 36 +++ .../utils/utils/btree/BTreeLeafNode.java| 36 +++ .../utils/utils/btree/BTreeMapNode.java | 36 +++ .../utils/utils/btree/BTreeMapRecord.java | 29 ++ .../download/utils/utils/btree/BTreeNode.java | 42 +++ .../utils/utils/btree/BTreeUserDataRecord.java | 28 ++ .../utils/utils/hfs/HFSVolumeHeader.java| 29 ++ .../utils/utils/hfsplus/HFSPlusExtent.java | 56 .../utils/utils/hfsplus/HFSPlusFinderInfo.java | 72 + .../utils/utils/hfsplus/HFSPlusForkData.java| 74 + .../utils/hfsplus/HFSPlusVolumeHeader.java | 311 +++ .../utils/utils/hfsx/HFSXVolumeHeader.java | 29 ++ npm-flexjs/dependencies/ApacheFalcon.js | 12 +- 35 files changed, 1560 insertions(+), 592 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d0cef423/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d0cef423/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlkxBlock.java -- diff --cc flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlkxBlock.java index 000,000..5bb6bdf new file mode 100644 --- /dev/null +++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlkxBlock.java @@@ -1,0 -1,0 +1,125 @@@ ++/* ++ * 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 org.apache.flex.utilities.converter.retrievers.download.utils.utils; ++ ++import java.io.ByteArrayInputStream; ++import java.io.DataInputStream; ++import java.io.IOException;
[03/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - Squiggly now only replaces ContainerControllers if they don't implement ISpellingContainerController
Squiggly now only replaces ContainerControllers if they don't implement ISpellingContainerController Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e62376ea Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e62376ea Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e62376ea Branch: refs/heads/feature/flash-downloader Commit: e62376ea9d7738ef96ea6abb93e003eda66b4619 Parents: 98b189d Author: HarbsAuthored: Thu Oct 13 09:05:42 2016 +0300 Committer: Harbs Committed: Thu Oct 13 09:05:42 2016 +0300 -- .../linguistics/spelling/ISpellingContainerController.as | 7 +++ .../adobe/linguistics/spelling/SpellingContextMenuForTLF.as | 7 +-- .../linguistics/spelling/SquigglyCustomContainerController.as | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e62376ea/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/ISpellingContainerController.as -- diff --git a/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/ISpellingContainerController.as b/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/ISpellingContainerController.as new file mode 100644 index 000..c5b25cd --- /dev/null +++ b/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/ISpellingContainerController.as @@ -0,0 +1,7 @@ +package com.adobe.linguistics.spelling +{ + public interface ISpellingContainerController + { + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e62376ea/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SpellingContextMenuForTLF.as -- diff --git a/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SpellingContextMenuForTLF.as b/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SpellingContextMenuForTLF.as index 7cfc65a..45f212b 100644 --- a/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SpellingContextMenuForTLF.as +++ b/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SpellingContextMenuForTLF.as @@ -23,12 +23,12 @@ package com.adobe.linguistics.spelling import com.adobe.linguistics.spelling.framework.ui.IHighlighter; import com.adobe.linguistics.spelling.framework.ui.IWordProcessor; import com.adobe.linguistics.utils.Token; - + import flash.events.ContextMenuEvent; import flash.ui.ContextMenu; import flash.ui.ContextMenuItem; import flash.utils.describeType; - + import flashx.textLayout.container.ContainerController; import flashx.textLayout.elements.TextFlow; import flashx.textLayout.tlf_internal; @@ -65,6 +65,9 @@ package com.adobe.linguistics.spelling for (var idx:int = 0; idx < numControllers; idx++) { var containerController:ContainerController = mTextFlow.flowComposer.getControllerAt(idx); + // if it's already squiggly compatible don't replace it. + if(containerController is ISpellingContainerController) + continue; var squigglyContainerController:SquigglyCustomContainerController = new SquigglyCustomContainerController(containerController.container, mTextHighlighter, mWordProcessor, mSpellEngine, func, containerController.compositionWidth, containerController.compositionHeight); copyObject(containerController, squigglyContainerController); http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e62376ea/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SquigglyCustomContainerController.as -- diff --git a/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SquigglyCustomContainerController.as b/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SquigglyCustomContainerController.as index 1c5b4ee..d4028c9 100644 --- a/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SquigglyCustomContainerController.as +++ b/Squiggly/main/SpellingUITLF/src/com/adobe/linguistics/spelling/SquigglyCustomContainerController.as @@ -23,19 +23,19 @@ package
[06/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Added configuration for SonarQube analysis
- Added configuration for SonarQube analysis Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/44633291 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/44633291 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/44633291 Branch: refs/heads/feature/flash-downloader Commit: 4463329167236a92e0d3b44b3b7efa03b4a917e7 Parents: 903fdde Author: Christofer DutzAuthored: Sun Dec 18 14:30:16 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 18 14:30:25 2016 +0100 -- flex-maven-tools/flex-sdk-converter/pom.xml | 177 ++- 1 file changed, 175 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/44633291/flex-maven-tools/flex-sdk-converter/pom.xml -- diff --git a/flex-maven-tools/flex-sdk-converter/pom.xml b/flex-maven-tools/flex-sdk-converter/pom.xml index 81109d9..1aebab9 100644 --- a/flex-maven-tools/flex-sdk-converter/pom.xml +++ b/flex-maven-tools/flex-sdk-converter/pom.xml @@ -31,10 +31,21 @@ 1.0.0-SNAPSHOT pom +Apache Flex - SDK-Converter + +1.6 3.1.1 0.9.0.M4 2.2 + + +https://builds.apache.org/analysis + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + +file:**/generated-sources/** @@ -70,12 +81,174 @@ org.apache.maven.plugins maven-compiler-plugin +3.5.1 -1.5 -1.5 +${java.version} +${java.version} ${project.build.sourceEncoding} + + +org.jacoco +jacoco-maven-plugin +0.7.6.201602180812 + + + +pre-unit-test + +prepare-agent + + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + +surefireArgLine + + + + +post-unit-test +test + +report + + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + +pre-integration-test +pre-integration-test + +prepare-agent + + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + +failsafeArgLine + + + + +post-integration-test +post-integration-test + +report + + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + ${project.reporting.outputDirectory}/jacoco-it + + + + + + + +org.apache.maven.plugins +maven-surefire-plugin +2.19 + +${surefireArgLine} + +Maven +${flex.version} +${flash.version} +${air.version} + ${settings.localRepository} + + +false + + + + + +org.apache.maven.plugins +maven-failsafe-plugin +2.18.1 + + + +
[12/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Switched from System.out.println to logback - Fixed a problem in the AirConverter, not packaging all the required parts
- Switched from System.out.println to logback - Fixed a problem in the AirConverter, not packaging all the required parts Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/9b38938c Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/9b38938c Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/9b38938c Branch: refs/heads/feature/flash-downloader Commit: 9b38938c03d454415258226ae10e7d3aa464493e Parents: 30ef5fb Author: Christofer DutzAuthored: Fri Feb 3 15:31:03 2017 +0100 Committer: Christofer Dutz Committed: Fri Feb 3 15:31:26 2017 +0100 -- .../utilities/converter/air/AirConverter.java | 40 .../flex-sdk-converter/converters/base/pom.xml | 16 .../flex/utilities/converter/BaseConverter.java | 10 +++-- .../base/src/main/resources/logback.xml | 16 .../deployer/aether/AetherDeployer.java | 26 +++-- 5 files changed, 86 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/9b38938c/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java index 46373c4..205daaa 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java @@ -20,6 +20,8 @@ import org.apache.flex.utilities.converter.BaseConverter; import org.apache.flex.utilities.converter.Converter; import org.apache.flex.utilities.converter.exceptions.ConverterException; import org.apache.flex.utilities.converter.model.MavenArtifact; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.*; import java.util.*; @@ -31,6 +33,8 @@ import java.util.zip.ZipOutputStream; */ public class AirConverter extends BaseConverter implements Converter { +private static final Logger LOG = LoggerFactory.getLogger(AirConverter.class); + private String airSdkVersion; /** @@ -53,7 +57,7 @@ public class AirConverter extends BaseConverter implements Converter { @Override protected void processDirectory() throws ConverterException { if ((airSdkVersion == null) || !rootSourceDirectory.exists() || !rootSourceDirectory.isDirectory()) { -System.out.println("Skipping AIR SDK generation."); +LOG.info("Skipping AIR SDK generation."); return; } @@ -94,13 +98,28 @@ public class AirConverter extends BaseConverter implements Converter { compiler.addDependency(artifact); } +// Generate the common package (files from the bin directory) +File binDir = new File(rootSourceDirectory, "bin"); +if (binDir.exists() && binDir.isDirectory()) { +final File commonZip = new File(rootTargetDirectory, +"com.adobe.air.compiler.adt.".replace(".", File.separator) + airSdkVersion + +File.separator + "adt-" + airSdkVersion + "-common.zip"); +generateZip(binDir, commonZip, new FilenameFilter() { +@Override +public boolean accept(File dir, String name) { +return "adt".equals(name) || "adt.bat".equals(name) || +"adl".equals(name) || "adl.exe".equals(name); +} +}); +} + // Generate the android package (android directory) File androidDir = new File(directory, "android"); if (androidDir.exists() && androidDir.isDirectory()) { final File androidZip = new File(rootTargetDirectory, "com.adobe.air.compiler.adt.".replace(".", File.separator) + airSdkVersion + File.separator + "adt-" + airSdkVersion + "-android.zip"); -generateCompilerPlatformArtifact(androidDir, androidZip); +generateZip(androidDir, androidZip); } // Generate the ios package (aot directory) @@ -109,7 +128,7 @@ public class AirConverter extends BaseConverter implements Converter { final File iosZip = new File(rootTargetDirectory, "com.adobe.air.compiler.adt.".replace(".", File.separator) + airSdkVersion +
[04/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - ant_on_air: Replace task makes Ant fail if file does not exist (instead of throwing an uncaught error)
ant_on_air: Replace task makes Ant fail if file does not exist (instead of throwing an uncaught error) Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/60b04527 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/60b04527 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/60b04527 Branch: refs/heads/feature/flash-downloader Commit: 60b0452754aef2c8759e98aeac674cddcac0127d Parents: e62376e Author: Josh TynjalaAuthored: Mon Nov 21 14:06:17 2016 -0800 Committer: Josh Tynjala Committed: Mon Nov 21 14:06:17 2016 -0800 -- .../ant_on_air/src/org/apache/flex/ant/tags/Replace.as | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/60b04527/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Replace.as -- diff --git a/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Replace.as b/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Replace.as index 2873ee1..afb95b7 100644 --- a/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Replace.as +++ b/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Replace.as @@ -18,6 +18,7 @@ package org.apache.flex.ant.tags { +import flash.errors.IOError; import flash.filesystem.File; import flash.filesystem.FileMode; import flash.filesystem.FileStream; @@ -62,6 +63,10 @@ package org.apache.flex.ant.tags try { var f:File = File.applicationDirectory.resolvePath(file); +if(!f.exists) +{ +throw new IOError("File not found: " + f.nativePath); +} } catch (e:Error) {
[08/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - Fixed SonarQube findings ...
Fixed SonarQube findings ... Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/2e676844 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2e676844 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2e676844 Branch: refs/heads/feature/flash-downloader Commit: 2e6768445a730216aaafcfc8f46c57044dd2b3c1 Parents: 790b355 Author: Christofer DutzAuthored: Sun Dec 18 15:28:47 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 18 15:28:47 2016 +0100 -- .../flex/utilities/converter/BaseConverter.java | 21 +--- .../utilities/converter/flex/FlexConverter.java | 8 2 files changed, 13 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2e676844/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java index d3171fb..d80cf8f 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java @@ -94,10 +94,9 @@ public abstract class BaseConverter { protected String calculateChecksum(File jarFile) throws ConverterException { // Implement the calculation of checksums for a given jar. -final MessageDigest digest; InputStream is = null; try { -digest = MessageDigest.getInstance("SHA-1"); +MessageDigest digest = MessageDigest.getInstance("SHA-1"); is = new FileInputStream(jarFile); final byte[] buffer = new byte[8192]; @@ -118,15 +117,13 @@ public abstract class BaseConverter { } catch (FileNotFoundException e) { throw new ConverterException("Error calculating checksum of file '" + jarFile.getPath() + "'", e); } finally { -try { -if(is != null) { +if(is != null) { +try { is.close(); +} catch(IOException e) { +// Ignore ... } } -catch(IOException e) { -//noinspection ThrowFromFinallyBlock -throw new ConverterException("Unable to close input stream for MD5 calculation", e); -} } } @@ -232,7 +229,7 @@ public abstract class BaseConverter { final File outputDirectory = target.getParentFile(); if(!outputDirectory.exists()) { if(!outputDirectory.mkdirs()) { -throw new RuntimeException("Could not create directory: " + outputDirectory.getAbsolutePath()); +throw new ConverterException("Could not create directory: " + outputDirectory.getAbsolutePath()); } } @@ -465,11 +462,11 @@ public abstract class BaseConverter { // In general the version consists of the content of the version element with an appended build-number. return (build.equals("0")) ? version + "-SNAPSHOT" : version; } catch (ParserConfigurationException pce) { -throw new RuntimeException(pce); +throw new ConverterException("Error parsing flex-sdk-description.xml", pce); } catch (SAXException se) { -throw new RuntimeException(se); +throw new ConverterException("Error parsing flex-sdk-description.xml", se); } catch (IOException ioe) { -throw new RuntimeException(ioe); +throw new ConverterException("Error parsing flex-sdk-description.xml", ioe); } } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2e676844/flex-maven-tools/flex-sdk-converter/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/flex-maven-tools/flex-sdk-converter/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java index cbe7e87..35013d0 100644 ---
[14/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Made it possible to also accept the license agreement by setting an environment variable
- Made it possible to also accept the license agreement by setting an environment variable Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ee771e65 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ee771e65 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ee771e65 Branch: refs/heads/feature/flash-downloader Commit: ee771e6579486521b86f22a9fb629ff127edcfcd Parents: 581567a Author: Christofer DutzAuthored: Tue Apr 11 08:43:08 2017 +0200 Committer: Christofer Dutz Committed: Tue Apr 11 08:43:08 2017 +0200 -- .../converter/retrievers/download/DownloadRetriever.java| 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ee771e65/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java -- diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java index a29e2f4..2700464 100644 --- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java +++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java @@ -453,7 +453,12 @@ public class DownloadRetriever extends BaseRetriever { String property = "com.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted"; // Implement the accepting the license by providing a system-id as system-property. +// Check a java property first ... String acceptedSystemIds = System.getProperty(property); +// Check an environment variable second ... +if(acceptedSystemIds == null) { +acceptedSystemIds = System.getenv("com.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted"); +} if(acceptedSystemIds != null) { String systemId = SystemIdHelper.getSystemId(); if(systemId != null) {
[09/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - Add support for latest google closure compiler
Add support for latest google closure compiler Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/5ed2c77d Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/5ed2c77d Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/5ed2c77d Branch: refs/heads/feature/flash-downloader Commit: 5ed2c77d64fa6c3a65a6c2a022762cff94945c4f Parents: 2e67684 Author: OmPrakash MuppiralaAuthored: Sun Dec 18 22:50:30 2016 -0800 Committer: OmPrakash Muppirala Committed: Sun Dec 18 22:51:14 2016 -0800 -- npm-flexjs/dependencies/ApacheFalcon.js | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed2c77d/npm-flexjs/dependencies/ApacheFalcon.js -- diff --git a/npm-flexjs/dependencies/ApacheFalcon.js b/npm-flexjs/dependencies/ApacheFalcon.js index 6a80291..82acb4c 100644 --- a/npm-flexjs/dependencies/ApacheFalcon.js +++ b/npm-flexjs/dependencies/ApacheFalcon.js @@ -125,9 +125,9 @@ var falconDependencies = [ }, { url:'http://dl.google.com/closure-compiler/', -remoteFileName:'compiler-20150609.zip', +remoteFileName:'compiler-20161201.zip', destinationPath:constants.DOWNLOADS_FOLDER, -destinationFileName:'compiler-20150609.zip', +destinationFileName:'compiler-20161201.zip', pathOfFileToBeCopiedFrom:'compiler.jar', pathOfFileToBeCopiedTo:googleClosureCompilerFolder + 'compiler.jar', unzip:true @@ -142,8 +142,8 @@ var falconDependencies = [ unzip:true }, { - url:'http://search.maven.org/remotecontent?filepath=com/google/guava/guava/17.0/', -remoteFileName:'guava-17.0.jar', + url:'http://search.maven.org/remotecontent?filepath=com/google/guava/guava/20.0/', +remoteFileName:'guava-20.0.jar', destinationPath:jsLibFolder, destinationFileName:'guava.jar', unzip:false
[13/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Added an expanation to ssl handshake errors when downloading from sourceforge.
- Added an expanation to ssl handshake errors when downloading from sourceforge. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/581567a9 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/581567a9 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/581567a9 Branch: refs/heads/feature/flash-downloader Commit: 581567a911b57eb576cac297439919751cfb52c3 Parents: 9b38938 Author: Christofer DutzAuthored: Fri Feb 10 17:19:49 2017 +0100 Committer: Christofer Dutz Committed: Fri Feb 10 17:19:49 2017 +0100 -- .../retrievers/download/DownloadRetriever.java | 31 1 file changed, 18 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/581567a9/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java -- diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java index f80c7f2..a29e2f4 100644 --- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java +++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java @@ -37,6 +37,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import javax.net.ssl.SSLHandshakeException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -85,34 +86,32 @@ public class DownloadRetriever extends BaseRetriever { confirmLicenseAcceptance(type); } -if(type.equals(SdkType.FONTKIT)) { +if (type.equals(SdkType.FONTKIT)) { File tmpTargetFile = File.createTempFile(UUID.randomUUID().toString(), ""); String tempSuffix = tmpTargetFile.getName().substring(tmpTargetFile.getName().lastIndexOf("-")); -if(!(tmpTargetFile.delete())) -{ +if (!(tmpTargetFile.delete())) { throw new IOException("Could not delete temp file: " + tmpTargetFile.getAbsolutePath()); } File targetRootDir = new File(tmpTargetFile.getParentFile(), type.toString() + tempSuffix); File targetDir = new File(targetRootDir, "/lib/external/optional"); -if(!(targetDir.mkdirs())) -{ +if (!(targetDir.mkdirs())) { throw new IOException("Could not create temp directory: " + targetDir.getAbsolutePath()); } -final URI afeUri = new URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw;); +final URI afeUri = new URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw;); final File afeFile = new File(targetDir, "afe.jar"); performSafeDownload(afeUri, afeFile); -final URI aglj40Uri = new URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw;); +final URI aglj40Uri = new URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw;); final File aglj40File = new File(targetDir, "aglj40.jar"); performSafeDownload(aglj40Uri, aglj40File); -final URI rideauUri = new URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw;); +final URI rideauUri = new URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw;); final File rideauFile = new File(targetDir, "rideau.jar"); performSafeDownload(rideauUri, rideauFile); -final URI flexFontkitUri = new URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw;); +final URI flexFontkitUri = new URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw;); final File flexFontkitFile = new File(targetDir, "flex-fontkit.jar"); performSafeDownload(flexFontkitUri,
[02/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Changed the AirFilter to also accept Windows type paths ("\" instead of "/")
- Changed the AirFilter to also accept Windows type paths ("\" instead of "/") Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/98b189d8 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/98b189d8 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/98b189d8 Branch: refs/heads/feature/flash-downloader Commit: 98b189d8820cf51f007d5779841b7f18970c3b88 Parents: fa9a4fe Author: Christofer DutzAuthored: Fri Oct 7 09:23:43 2016 +0200 Committer: Christofer Dutz Committed: Fri Oct 7 09:23:43 2016 +0200 -- .../utilities/converter/air/AirConverter.java | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/98b189d8/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java index d00986f..7e9fadf 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java @@ -416,15 +416,15 @@ public class AirConverter extends BaseConverter implements Converter { String relativePath = pathname.getAbsolutePath().substring( rootSourceDirectory.getAbsolutePath().length()); -boolean result = "/AIR SDK license.pdf".equals(relativePath) || -"/AIR SDK Readme.txt".equals(relativePath) || -"/airsdk.xml".equals(relativePath) || -relativePath.startsWith("/frameworks/projects/air/") || -relativePath.startsWith("/include/") || -relativePath.startsWith("/install/") || -relativePath.startsWith("/samples/"); - -if(relativePath.startsWith("/frameworks/libs/air/")) { +boolean result = "/AIR SDK license.pdf".equals(relativePath) || "\\AIR SDK license.pdf".equals(relativePath) || +"/AIR SDK Readme.txt".equals(relativePath) || "\\AIR SDK Readme.txt".equals(relativePath) || +"/airsdk.xml".equals(relativePath) || "\\airsdk.xml".equals(relativePath) || +relativePath.startsWith("/frameworks/projects/air/") || relativePath.startsWith("\\frameworks\\projects\\air\\") || +relativePath.startsWith("/include/") || relativePath.startsWith("\\include\\") || +relativePath.startsWith("/install/") || relativePath.startsWith("\\install\\") || +relativePath.startsWith("/samples/") || relativePath.startsWith("\\samples\\"); + +if(relativePath.startsWith("/frameworks/libs/air/") || relativePath.startsWith("\\frameworks\\libs\\air\\")) { result = !(pathname.getName().endsWith(".swc") || pathname.getName().endsWith(".swf")); }
[07/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - Fixed SonarQube findings ...
Fixed SonarQube findings ... Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/790b3556 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/790b3556 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/790b3556 Branch: refs/heads/feature/flash-downloader Commit: 790b355688dc0ada8c62cb1df91faf67f52126ea Parents: 4463329 Author: Christofer DutzAuthored: Sun Dec 18 15:18:01 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 18 15:18:01 2016 +0100 -- .../utilities/converter/air/AirConverter.java | 10 +- .../flex/utilities/converter/BaseConverter.java | 39 ++-- .../converter/retrievers/BaseRetriever.java | 41 +++-- .../retrievers/download/DownloadRetriever.java | 176 --- 4 files changed, 174 insertions(+), 92 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/790b3556/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java index 7e9fadf..46373c4 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java @@ -358,8 +358,9 @@ public class AirConverter extends BaseConverter implements Converter { } DataInputStream in = null; +FileInputStream descriptorInputStream = null; try { -final FileInputStream descriptorInputStream = new FileInputStream(sdkDescriptor); +descriptorInputStream = new FileInputStream(sdkDescriptor); in = new DataInputStream(descriptorInputStream); final BufferedReader br = new BufferedReader(new InputStreamReader(in)); final String strLine = br.readLine(); @@ -374,6 +375,13 @@ public class AirConverter extends BaseConverter implements Converter { // Ignore. } } +if (descriptorInputStream != null) { +try { +descriptorInputStream.close(); +} catch (IOException e) { +// Ignore. +} +} } } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/790b3556/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java index 1d92181..d3171fb 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java @@ -95,10 +95,11 @@ public abstract class BaseConverter { protected String calculateChecksum(File jarFile) throws ConverterException { // Implement the calculation of checksums for a given jar. final MessageDigest digest; +InputStream is = null; try { digest = MessageDigest.getInstance("SHA-1"); -final InputStream is = new FileInputStream(jarFile); +is = new FileInputStream(jarFile); final byte[] buffer = new byte[8192]; int read; try { @@ -110,21 +111,22 @@ public abstract class BaseConverter { return bigInt.toString(16); } catch(IOException e) { -throw new RuntimeException("Unable to process file for MD5", e); -} -finally { -try { -is.close(); -} -catch(IOException e) { -//noinspection ThrowFromFinallyBlock -throw new RuntimeException("Unable to close input stream for MD5 calculation", e); -} +throw new ConverterException("Unable to process file for MD5", e); } } catch (NoSuchAlgorithmException e) {
[11/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - npm-flexjs: put back duplicate Guava dependency because it's required, but updated to correct version
npm-flexjs: put back duplicate Guava dependency because it's required, but updated to correct version Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/30ef5fb3 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/30ef5fb3 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/30ef5fb3 Branch: refs/heads/feature/flash-downloader Commit: 30ef5fb36374060061739c402f55b3accc7aa019 Parents: 26cd3e6 Author: Josh TynjalaAuthored: Wed Dec 21 11:29:43 2016 -0800 Committer: Josh Tynjala Committed: Wed Dec 21 11:29:43 2016 -0800 -- npm-flexjs/dependencies/ApacheFalcon.js | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/30ef5fb3/npm-flexjs/dependencies/ApacheFalcon.js -- diff --git a/npm-flexjs/dependencies/ApacheFalcon.js b/npm-flexjs/dependencies/ApacheFalcon.js index 34b02f4..c336416 100644 --- a/npm-flexjs/dependencies/ApacheFalcon.js +++ b/npm-flexjs/dependencies/ApacheFalcon.js @@ -78,6 +78,13 @@ var falconDependencies = [ unzip:true }, { + url:'http://search.maven.org/remotecontent?filepath=com/google/guava/guava/20.0/', +remoteFileName:'guava-20.0.jar', +destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder, +destinationFileName:'guava.jar', +unzip:false +}, +{ url:'http://search.maven.org/remotecontent?filepath=net/sourceforge/jburg/jburg/1.10.2/', remoteFileName:'jburg-1.10.2.jar', destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder,
[01/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - - Renamed the classifier of the adt artifact from "-windows" to "-win"
Repository: flex-utilities Updated Branches: refs/heads/feature/flash-downloader 0b6dfdd69 -> d0cef4237 - Renamed the classifier of the adt artifact from "-windows" to "-win" Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fa9a4fe9 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fa9a4fe9 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fa9a4fe9 Branch: refs/heads/feature/flash-downloader Commit: fa9a4fe9341cbeee772e24789dc1ff1235b1b3c3 Parents: 522eafb Author: Christofer DutzAuthored: Thu Oct 6 15:51:32 2016 +0200 Committer: Christofer Dutz Committed: Thu Oct 6 15:51:44 2016 +0200 -- .../java/org/apache/flex/utilities/converter/air/AirConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fa9a4fe9/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java -- diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java index f1cb6a0..d00986f 100644 --- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java +++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java @@ -126,7 +126,7 @@ public class AirConverter extends BaseConverter implements Converter { if (windowsDir.exists() && windowsDir.isDirectory()) { final File windowsZip = new File(rootTargetDirectory, "com.adobe.air.compiler.adt.".replace(".", File.separator) + airSdkVersion + -File.separator + "adt-" + airSdkVersion + "-windows.zip"); +File.separator + "adt-" + airSdkVersion + "-win.zip"); generateCompilerPlatformArtifact(windowsDir, windowsZip); }
[10/15] git commit: [flex-utilities] [refs/heads/feature/flash-downloader] - npm-flexjs: removed duplicate Guava dependency
npm-flexjs: removed duplicate Guava dependency Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/26cd3e6d Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/26cd3e6d Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/26cd3e6d Branch: refs/heads/feature/flash-downloader Commit: 26cd3e6d6d2713cc52d1e31ca2b35cf80ce5c83d Parents: 5ed2c77 Author: Josh TynjalaAuthored: Wed Dec 21 11:27:33 2016 -0800 Committer: Josh Tynjala Committed: Wed Dec 21 11:27:33 2016 -0800 -- npm-flexjs/dependencies/ApacheFalcon.js | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/26cd3e6d/npm-flexjs/dependencies/ApacheFalcon.js -- diff --git a/npm-flexjs/dependencies/ApacheFalcon.js b/npm-flexjs/dependencies/ApacheFalcon.js index 82acb4c..34b02f4 100644 --- a/npm-flexjs/dependencies/ApacheFalcon.js +++ b/npm-flexjs/dependencies/ApacheFalcon.js @@ -78,13 +78,6 @@ var falconDependencies = [ unzip:true }, { - url:'http://search.maven.org/remotecontent?filepath=com/google/guava/guava/17.0/', -remoteFileName:'guava-17.0.jar', -destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder, -destinationFileName:'guava.jar', -unzip:false -}, -{ url:'http://search.maven.org/remotecontent?filepath=net/sourceforge/jburg/jburg/1.10.2/', remoteFileName:'jburg-1.10.2.jar', destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder,
[72/72] [abbrv] flex-blazeds git commit: [maven-release-plugin] prepare release blazeds-4.7.3
[maven-release-plugin] prepare release blazeds-4.7.3 Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/42ecd811 Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/42ecd811 Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/42ecd811 Branch: refs/heads/master Commit: 42ecd811bec2c7825da250c73b9d3c463f990320 Parents: f471e6a Author: Christofer DutzAuthored: Mon Mar 27 22:43:33 2017 +0200 Committer: Christofer Dutz Committed: Mon Mar 27 22:43:33 2017 +0200 -- archetypes/blazeds-spring-boot-archetype/pom.xml | 2 +- archetypes/pom.xml | 5 ++--- common/pom.xml | 5 ++--- core/pom.xml | 5 ++--- opt/blazeds-spring-boot-starter/pom.xml | 10 +- opt/pom.xml | 5 ++--- opt/tomcat/pom.xml | 5 ++--- opt/tomcat/tomcat-4/pom.xml | 5 ++--- opt/tomcat/tomcat-6/pom.xml | 5 ++--- opt/tomcat/tomcat-7/pom.xml | 5 ++--- opt/tomcat/tomcat-base/pom.xml | 5 ++--- pom.xml | 7 +++ proxy/pom.xml| 5 ++--- remoting/pom.xml | 5 ++--- 14 files changed, 31 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/42ecd811/archetypes/blazeds-spring-boot-archetype/pom.xml -- diff --git a/archetypes/blazeds-spring-boot-archetype/pom.xml b/archetypes/blazeds-spring-boot-archetype/pom.xml index 0343c03..34502c4 100644 --- a/archetypes/blazeds-spring-boot-archetype/pom.xml +++ b/archetypes/blazeds-spring-boot-archetype/pom.xml @@ -5,7 +5,7 @@ org.apache.flex.blazeds flex-messaging-archetypes -4.7.3-SNAPSHOT +4.7.3 blazeds-spring-boot-example-archetype http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/42ecd811/archetypes/pom.xml -- diff --git a/archetypes/pom.xml b/archetypes/pom.xml index f4f72b6..fc37b41 100755 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -16,14 +16,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 org.apache.flex.blazeds blazeds -4.7.3-SNAPSHOT +4.7.3 flex-messaging-archetypes http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/42ecd811/common/pom.xml -- diff --git a/common/pom.xml b/common/pom.xml index f7cc8f5..08b1df1 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -16,14 +16,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 org.apache.flex.blazeds blazeds -4.7.3-SNAPSHOT +4.7.3 flex-messaging-common http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/42ecd811/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 54761cd..1ccd966 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,14 +16,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 org.apache.flex.blazeds blazeds -4.7.3-SNAPSHOT +4.7.3
[32/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/MessageException.java -- diff --git a/core/src/flex/messaging/MessageException.java b/core/src/flex/messaging/MessageException.java deleted file mode 100644 index f3b565a..000 --- a/core/src/flex/messaging/MessageException.java +++ /dev/null @@ -1,447 +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 flex.messaging; - -import java.util.Map; - -import flex.messaging.log.Log; -import flex.messaging.log.LogCategories; -import flex.messaging.log.LogEvent; -import flex.messaging.messages.ErrorMessage; -import flex.messaging.messages.Message; -import flex.messaging.util.ExceptionUtil; -import flex.messaging.util.PropertyStringResourceLoader; -import flex.messaging.util.ResourceLoader; -import flex.messaging.util.StringUtils; - -/** - * The MessageException class is the basic exception type used throughout - * the server. This class is extended to support more specific exception types. - */ -public class MessageException extends LocalizedException -{ - //-- -// -// Static Constants -// - //-- - -// Message exception code strings. -public static final String CODE_SERVER_RESOURCE_UNAVAILABLE = "Server.ResourceUnavailable"; - - -static final long serialVersionUID = 3310842114461162689L; - - //-- -// -// Constructors -// - //-- - -/** - * Default constructor. - */ -public MessageException() -{ -} - -/** - * Construct a message specifying a ResourceLoader to be used to load localized strings. - * - * @param loader - */ -public MessageException(ResourceLoader loader) -{ -super(loader); -} - -/** - * Constructor with a message. - * - * @param message The detailed message for the exception. - */ -public MessageException(String message) -{ -setMessage(message); -} - -/** - * Constructs a new exception with the specified message and the Throwable as the root cause. - * - * @param message The detailed message for the exception. - * @param t The root cause of the exception. - */ -public MessageException(String message, Throwable t) -{ -setMessage(message); -setRootCause(t); -} - -/** - * Constructs a new exception with the specified Throwable as the root cause. - * - * @param t The root cause of the exception. - */ -public MessageException(Throwable t) -{ -String rootMessage = t.getMessage(); -if (rootMessage == null) -rootMessage = t.toString(); -setMessage(rootMessage); -setRootCause(t); -} - - //-- -// -// Properties -// - //-- - -//-- -// code -//-- - - -protected String code; - -/** - * Returns the code of the exception. - * - * @return Code of the exception. - */ -public String getCode() -{ -return code; -} - -/** - * Sets the code of the exception. - * - * @param code Code of the exception. - */ -public void setCode(String code) -{ -this.code = code; -} - -//-- -// defaultLogMessageIntro -//-- - -/** - * Returns the default initial text for use in the log output generated by logAtHingePoint(). - * - * @return the default initial text for use in the log output generated by logAtHingePoint(). - */ -public String getDefaultLogMessageIntro() -{ -return "Error handling message: "; -} - -
[65/72] [abbrv] flex-blazeds git commit: - Fixed some SonarQube findings
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/1a2c89d4/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java -- diff --git a/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java index c9134b5..4393145 100644 --- a/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java +++ b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java @@ -16,30 +16,24 @@ */ package flex.messaging.config; -import flex.messaging.validators.ClassDeserializationValidator; +import flex.messaging.config.ThrottleSettings.Policy; +import flex.messaging.util.LocaleUtils; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.StringTokenizer; -import flex.messaging.config.ThrottleSettings.Policy; -import flex.messaging.util.LocaleUtils; - /** * Processes DOM representation of a messaging configuration file. * * Note: Since reference ids are used between elements, certain * sections of the document need to be parsed first. * - * - * */ -public abstract class ServerConfigurationParser extends AbstractConfigurationParser -{ +public abstract class ServerConfigurationParser extends AbstractConfigurationParser { /** * Used to verify that advanced messaging support has been registered if necessary. * If other configuration requires it, but it was not registered a ConfigurationException is thrown. @@ -48,12 +42,10 @@ public abstract class ServerConfigurationParser extends AbstractConfigurationPar private boolean advancedMessagingSupportRegistered = false; @Override -protected void parseTopLevelConfig(Document doc) -{ +protected void parseTopLevelConfig(Document doc) { Node root = selectSingleNode(doc, "/" + SERVICES_CONFIG_ELEMENT); -if (root != null) -{ +if (root != null) { allowedChildElements(root, SERVICES_CONFIG_CHILDREN); securitySection(root); // Parse security before channels. @@ -79,15 +71,12 @@ public abstract class ServerConfigurationParser extends AbstractConfigurationPar validators(root); // Validate that any dependencies on advanced messaging support can be satisified at runtime. -if (verifyAdvancedMessagingSupport && !advancedMessagingSupportRegistered) -{ +if (verifyAdvancedMessagingSupport && !advancedMessagingSupportRegistered) { ConfigurationException e = new ConfigurationException(); e.setMessage(REQUIRE_ADVANCED_MESSAGING_SUPPORT); throw e; } -} -else -{ +} else { // The services configuration root element must be '{SERVICES_CONFIG_ELEMENT}'. ConfigurationException e = new ConfigurationException(); e.setMessage(INVALID_SERVICES_ROOT, new Object[]{SERVICES_CONFIG_ELEMENT}); @@ -95,16 +84,13 @@ public abstract class ServerConfigurationParser extends AbstractConfigurationPar } } -private void clusters(Node root) -{ +private void clusters(Node root) { Node clusteringNode = selectSingleNode(root, CLUSTERS_ELEMENT); -if (clusteringNode != null) -{ +if (clusteringNode != null) { allowedAttributesOrElements(clusteringNode, CLUSTERING_CHILDREN); NodeList clusters = selectNodeList(clusteringNode, CLUSTER_DEFINITION_ELEMENT); -for (int i = 0; i < clusters.getLength(); i++) -{ +for (int i = 0; i < clusters.getLength(); i++) { Node cluster = clusters.item(i); requiredAttributesOrElements(cluster, CLUSTER_DEFINITION_CHILDREN); String clusterName = getAttributeOrChildElement(cluster, ID_ATTR); @@ -120,48 +106,40 @@ public abstract class ServerConfigurationParser extends AbstractConfigurationPar clusterSettings.setImplementationClass(className); String defaultValue = getAttributeOrChildElement(cluster, ClusterSettings.DEFAULT_ELEMENT); -if (defaultValue != null && defaultValue.length() > 0) -{ +if (defaultValue != null && defaultValue.length() > 0) { if (defaultValue.equalsIgnoreCase(TRUE_STRING)) clusterSettings.setDefault(true); -else if (!defaultValue.equalsIgnoreCase(FALSE_STRING)) -{ +else if (!defaultValue.equalsIgnoreCase(FALSE_STRING)) { ConfigurationException e = new ConfigurationException(); -e.setMessage(10215, new Object[]
[21/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/BeanProxy.java -- diff --git a/core/src/flex/messaging/io/BeanProxy.java b/core/src/flex/messaging/io/BeanProxy.java deleted file mode 100644 index 05ccb01..000 --- a/core/src/flex/messaging/io/BeanProxy.java +++ /dev/null @@ -1,936 +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 flex.messaging.io; - -import flex.messaging.MessageException; -import flex.messaging.io.amf.ASObject; -import flex.messaging.log.Log; -import flex.messaging.log.Logger; -import flex.messaging.util.ClassUtil; -import flex.messaging.util.ExceptionUtil; - -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.AbstractCollection; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -/** - * Uses Bean introspection to collect the properties for a given instance. - */ -public class BeanProxy extends AbstractProxy -{ -static final long serialVersionUID = 7365078101695257715L; - -private static final int FAILED_PROPERTY_READ_ERROR = 10021; -private static final int FAILED_PROPERTY_WRITE_ERROR = 10022; -private static final int NON_READABLE_PROPERTY_ERROR = 10023; -private static final int NON_WRITABLE_PROPERTY_ERROR = 10024; -private static final int UNKNOWN_PROPERTY_ERROR = 10025; - -protected static final MaprwPropertyNamesCache = new IdentityHashMap (); -protected static final Map > rwBeanPropertyCache = new IdentityHashMap >(); -protected static final Map rwPropertyDescriptorCache = new IdentityHashMap (); - -protected static final Map roPropertyNamesCache = new IdentityHashMap (); -protected static final Map > roBeanPropertyCache = new IdentityHashMap >(); -protected static final Map roPropertyDescriptorCache = new IdentityHashMap (); - -protected boolean cacheProperties = true; -protected boolean cachePropertiesDescriptors = true; -protected Class stopClass = Object.class; - -protected static final Map ignoreProperties = new HashMap(); -static -{ -initializeIgnoreProperties(); -} - -private static void initializeIgnoreProperties() -{ -addIgnoreProperty(AbstractMap.class, "empty"); -addIgnoreProperty(AbstractCollection.class, "empty"); -addIgnoreProperty(ASObject.class, "type"); -addIgnoreProperty(Throwable.class, "stackTrace"); -addIgnoreProperty(File.class, "parentFile"); -addIgnoreProperty(File.class, "canonicalFile"); -addIgnoreProperty(File.class, "absoluteFile"); -} - -/** - * Constructor. - */ -public BeanProxy() -{ -this(null); -} - -/** - * Construct a new BeanProxy with the provided default instance. - * - * @param defaultInstance defines the alias if provided - */ -public BeanProxy(Object defaultInstance) -{ -super(defaultInstance); - -// Override default behavior here... standard Map implementations -// are treated as anonymous Objects, i.e. without an alias. -if (defaultInstance != null) -alias = getClassName(defaultInstance); -} - -/** {@inheritDoc} */ -public String getAlias(Object instance) -{ -return getClassName(instance); -} - -/** {@inheritDoc} */ -public List getPropertyNames(Object instance) -
[07/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java -- diff --git a/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java b/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java deleted file mode 100644 index 644771a..000 --- a/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java +++ /dev/null @@ -1,162 +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 flex.messaging.services.messaging.adapters; - -import flex.messaging.FlexContext; -import flex.messaging.MessageBroker; -import flex.messaging.config.ConfigurationConstants; -import flex.messaging.config.ConfigMap; -import flex.messaging.config.SecurityConstraint; -import flex.messaging.config.SecuritySettings; -import flex.messaging.security.LoginManager; -import flex.messaging.security.SecurityException; - -/** - * Messaging security constraint managers are used by messaging destinations - * to assert authorization of send and subscribe operations. - */ -public final class MessagingSecurityConstraintManager -{ -public static final String SEND_SECURITY_CONSTRAINT = "send-security-constraint"; -public static final String SUBSCRIBE_SECURITY_CONSTRAINT = "subscribe-security-constraint"; - -private static final int NO_SEC_CONSTRAINT = 10062; - -private LoginManager loginManager; -private SecuritySettings securitySettings; - -private SecurityConstraint sendConstraint; -private SecurityConstraint subscribeConstraint; - -/** - * Creates a new MessagingSecurityConstraintManager instance. - * - * @param broker Associated MessageBroker. - */ -public MessagingSecurityConstraintManager(MessageBroker broker) -{ -this.loginManager = broker.getLoginManager(); -this.securitySettings = broker.getSecuritySettings(); -} - -/** - * Sets the send constraint which is used when to assert authorization when - * sending a message. - * - * @param ref The reference id of the constraint - */ -public void setSendConstraint(String ref) -{ -validateConstraint(ref); -sendConstraint = securitySettings.getConstraint(ref); -} - -/** - * Sets the subscribe constraint which is used to assert authorization in - * subscribe, multi-subscribe, and unsubscribe operations. - * - * @param ref The reference id of the constraint - */ -public void setSubscribeConstraint(String ref) -{ - validateConstraint(ref); - subscribeConstraint = securitySettings.getConstraint(ref); -} - -/** - * - * Asserts send authorizations. - */ -public void assertSendAuthorization() -{ -checkConstraint(sendConstraint); -} - -/** - * - * Asserts subscribe authorizations. - */ -public void assertSubscribeAuthorization() -{ -checkConstraint(subscribeConstraint); -} - -/** - * - * Creates security constraints from the given server settings. - * - * @param serverSettings The ConfigMap of server settings. - */ -public void createConstraints(ConfigMap serverSettings) -{ -// Send constraint -ConfigMap send = serverSettings.getPropertyAsMap(SEND_SECURITY_CONSTRAINT, null); -if (send != null) -{ -String ref = send.getPropertyAsString(ConfigurationConstants.REF_ATTR, null); -createSendConstraint(ref); -} - -// Subscribe constraint -ConfigMap subscribe = serverSettings.getPropertyAsMap(SUBSCRIBE_SECURITY_CONSTRAINT, null); -if (subscribe != null) -{ -String ref = subscribe.getPropertyAsString(ConfigurationConstants.REF_ATTR, null); -createSubscribeConstraint(ref); -} -} - -void createSendConstraint(String ref) -{ -if (ref != null) -sendConstraint = securitySettings.getConstraint(ref); -} - -void createSubscribeConstraint(String
[01/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
Repository: flex-blazeds Updated Branches: refs/heads/master 561d84019 -> 42ecd811b http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/messaging/Destination.java -- diff --git a/core/src/main/java/flex/messaging/Destination.java b/core/src/main/java/flex/messaging/Destination.java new file mode 100644 index 000..312e371 --- /dev/null +++ b/core/src/main/java/flex/messaging/Destination.java @@ -0,0 +1,802 @@ +/* + * 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 flex.messaging; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import flex.management.ManageableComponent; +import flex.management.runtime.messaging.services.ServiceControl; +import flex.messaging.log.LogCategories; +import flex.messaging.log.Log; +import flex.messaging.services.Service; +import flex.messaging.services.ServiceAdapter; +import flex.messaging.util.ClassUtil; +import flex.messaging.cluster.ClusterManager; +import flex.messaging.config.ClusterSettings; +import flex.messaging.config.ConfigMap; +import flex.messaging.config.ConfigurationConstants; +import flex.messaging.config.ConfigurationException; +import flex.messaging.config.NetworkSettings; +import flex.messaging.config.SecurityConstraint; +/** + * The Destination class is a source and sink for messages sent through + * a service destination and uses an adapter to process messages. + */ +public class Destination extends ManageableComponent implements java.io.Serializable +{ +static final long serialVersionUID = -977001797620881435L; + +/** Default log category for Destination. */ +public static final String LOG_CATEGORY = LogCategories.SERVICE_GENERAL; + +/** Hard coded id for the push destination */ +public static final String PUSH_DESTINATION_ID = "_DS_PUSH_"; + +// Errors +private static final int NO_SERVICE = 7; + +// Destination's properties +protected ServiceAdapter adapter; +protected List channelIds; +protected NetworkSettings networkSettings; +protected SecurityConstraint securityConstraint; +protected String securityConstraintRef; +protected HashMapextraProperties; +protected boolean initialized; +protected boolean clustered; +protected boolean clusteredCalculated; + + //-- +// +// Constructor +// + //-- + +/** + * Constructs an unmanaged Destination instance. + */ +public Destination() +{ +this(false); +} + +/** + * Constructs a Destination with the indicated management. + * + * @param enableManagement true if the Destination + * is manageable; otherwise false. + */ +public Destination(boolean enableManagement) +{ +super(enableManagement); + +networkSettings = new NetworkSettings(); +} + + //-- +// +// Initialize, validate, start, and stop methods. +// + //-- + +/** + * Initializes the Destination with the properties. + * If subclasses override, they must call super.initialize(). + * + * @param id The id of the destination. + * @param properties Properties for the destination. + */ +@Override +public void initialize(String id, ConfigMap properties) +{ +super.initialize(id, properties); + +if (properties == null || properties.size() == 0) +{ +initialized = true; +return; +} + +ConfigMap network = properties.getPropertyAsMap(NetworkSettings.NETWORK_ELEMENT, null); + +if (network != null) +{ + networkSettings.setReliable(network.getPropertyAsBoolean(NetworkSettings.RELIABLE_ELEMENT, false)); + +ConfigMap clusterInfo =
[31/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/client/FlexClient.java -- diff --git a/core/src/flex/messaging/client/FlexClient.java b/core/src/flex/messaging/client/FlexClient.java deleted file mode 100644 index e212986..000 --- a/core/src/flex/messaging/client/FlexClient.java +++ /dev/null @@ -1,2240 +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 flex.messaging.client; - -import flex.messaging.ConnectionAwareSession; -import flex.messaging.FlexContext; -import flex.messaging.FlexSession; -import flex.messaging.FlexSessionListener; -import flex.messaging.HttpFlexSession; -import flex.messaging.MessageClient; -import flex.messaging.MessageClientListener; -import flex.messaging.MessageException; -import flex.messaging.endpoints.Endpoint; -import flex.messaging.log.Log; -import flex.messaging.log.LogCategories; -import flex.messaging.messages.CommandMessage; -import flex.messaging.messages.Message; -import flex.messaging.services.MessageService; -import flex.messaging.util.StringUtils; -import flex.messaging.util.TimeoutAbstractObject; - -import java.security.Principal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -/** - * Represents a Flex client application instance on the server. - */ -public class FlexClient extends TimeoutAbstractObject implements FlexSessionListener, MessageClientListener -{ - //-- -// -// Public Static Constants -// - //-- - -/** - * Log category for FlexClient related messages. - */ -public static final String FLEX_CLIENT_LOG_CATEGORY = LogCategories.CLIENT_FLEXCLIENT; - -/** - * This value is passed to the server in an initial client connect to - * indicate that the client needs a server-assigned FlexClient Id. - * - */ -public static final String NULL_FLEXCLIENT_ID = "nil"; - - //-- -// -// Private Static Constants -// - //-- - -/** - * Error string constants. - */ -private static final int FLEX_CLIENT_INVALIDATED = 10027; -private static final int ENDPOINT_PUSH_HANDLER_ALREADY_REGISTERED = 10033; - -private static final String POLL_WAIT_THREAD_NAME_EXTENSION = "-in-poll-wait"; - - //-- -// -// Private Static Variables -// - //-- - -/** - * List of registered FlexClient created listeners. - */ -private static final CopyOnWriteArrayList createdListeners = new CopyOnWriteArrayList(); - - //-- -// -// Public Static Methods -// - //-- - -/** - * Adds a create listener that will be notified when new FlexClients - * are created. - * - * @see flex.messaging.client.FlexClientListener - * - * @param listener The listener to add. - */ -public static void addClientCreatedListener(FlexClientListener listener) -{ -if (listener != null) -createdListeners.addIfAbsent(listener); -} - -/** - * Removes a FlexClient created listener. - * - * @see flex.messaging.client.FlexClientListener - * - * @param listener The listener to remove. - */ -public static void removeClientCreatedListener(FlexClientListener listener) -{ -if (listener != null) -createdListeners.remove(listener); -
[04/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java -- diff --git a/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java b/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java new file mode 100644 index 000..95a2474 --- /dev/null +++ b/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java @@ -0,0 +1,104 @@ +/* + * 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 flex.management.jmx; + +/** + * Remotable MBeanConstructorInfo class that complies with Flash serialization requirements. + */ +public class MBeanConstructorInfo +{ +/** + * The name of the constructor. + */ +public String name; + +/** + * The description of the constructor. + */ +public String description; + +/** + * The constructor's parameter signature. + */ +public MBeanParameterInfo[] signature; + +/** + * Constructs an empty MBeanConstructorInfo instance. + * + */ +public MBeanConstructorInfo() +{} + +/** + * Constructs a MBeanConstructorInfo instance based upon a + * javax.management.MBeanConstructorInfo instance. + * + * @param mbeanConstructorInfo The javax.management.MBeanConstructorInfo to base this instance on. + */ +public MBeanConstructorInfo(javax.management.MBeanConstructorInfo mbeanConstructorInfo) +{ +name = mbeanConstructorInfo.getName(); +description = mbeanConstructorInfo.getDescription(); +signature = convertSignature(mbeanConstructorInfo.getSignature()); +} + +/** + * Utility method to convert this MBeanConstructorInfo instance to a + * javax.management.MBeanConstructorInfo instance. + * + * @return A JMX MBeanConstructorInfo based upon this instance. + */ +public javax.management.MBeanConstructorInfo toMBeanConstructorInfo() +{ +return new javax.management.MBeanConstructorInfo(name, + description, + convertSignature(signature)); +} + +/** + * Utility method to convert the JMX constructor signature to our Flash friendly param type. + * + * @param source The JMX constructor signature params. + * @return Flash friendly signature params. + */ +private MBeanParameterInfo[] convertSignature(javax.management.MBeanParameterInfo[] source) +{ +MBeanParameterInfo[] signature = new MBeanParameterInfo[source.length]; +for (int i = 0; i < source.length; i++) +{ +signature[i] = new MBeanParameterInfo(source[i]); +} +return signature; +} + +/** + * Utility method to convert a Flash friendly construtor param signature to the JMX params. + * + * @param source The Flash friendly signature params. + * @return The JMX constructor signature params. + */ +private javax.management.MBeanParameterInfo[] convertSignature(MBeanParameterInfo[] source) +{ +javax.management.MBeanParameterInfo[] signature = new javax.management.MBeanParameterInfo[source.length]; +for (int i = 0; i < source.length; i++) +{ +signature[i] = source[i].toMBeanParameterInfo(); +} +return signature; +} + +} http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/management/jmx/MBeanInfo.java -- diff --git a/core/src/main/java/flex/management/jmx/MBeanInfo.java b/core/src/main/java/flex/management/jmx/MBeanInfo.java new file mode 100644 index 000..d44e507 --- /dev/null +++ b/core/src/main/java/flex/management/jmx/MBeanInfo.java @@ -0,0 +1,184 @@ +/* + * 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,
[57/72] [abbrv] flex-blazeds git commit: - Made BlazeDS use the ClassDeserializationValidator as default validator, if no validator is provided. - Adjusted the classes in the ClassDeserializationValid
- Made BlazeDS use the ClassDeserializationValidator as default validator, if no validator is provided. - Adjusted the classes in the ClassDeserializationValidator default classes to explicitly list each class instead of using wildcards. If you are getting errors, you need to explicitly list the classes you want to allow: ``` ... snip ... ``` Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/f861f099 Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/f861f099 Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/f861f099 Branch: refs/heads/master Commit: f861f0993c35e664906609cad275e45a71e2aaf1 Parents: e8560ab Author: Christofer DutzAuthored: Fri Feb 17 15:42:31 2017 +0100 Committer: Christofer Dutz Committed: Fri Feb 17 15:42:31 2017 +0100 -- .../main/java/flex/messaging/MessageBroker.java | 1 + .../config/ServerConfigurationParser.java | 27 ++- .../flex/messaging/io/SerializationContext.java | 1 + .../ClassDeserializationValidator.java | 184 .../test/java/amfclient/ClientCustomType.java | 45 .../io/amf/client/AMFConnectionIT.java | 9 +- .../messaging/io/amf/client/AMFDataTypeIT.java | 208 --- .../flex/messaging/util/TestServerWrapper.java | 17 +- .../remoting/amfclient/ClientCustomType.java| 45 .../services-config-customized-validation.xml | 65 ++ 10 files changed, 410 insertions(+), 192 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/f861f099/core/src/main/java/flex/messaging/MessageBroker.java -- diff --git a/core/src/main/java/flex/messaging/MessageBroker.java b/core/src/main/java/flex/messaging/MessageBroker.java index 80b061e..3ffd2e4 100644 --- a/core/src/main/java/flex/messaging/MessageBroker.java +++ b/core/src/main/java/flex/messaging/MessageBroker.java @@ -57,6 +57,7 @@ import flex.messaging.util.RedeployManager; import flex.messaging.util.StringUtils; import flex.messaging.util.UUIDGenerator; import flex.messaging.util.UUIDUtils; +import flex.messaging.validators.ClassDeserializationValidator; import flex.messaging.validators.DeserializationValidator; import javax.servlet.ServletContext; http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/f861f099/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java -- diff --git a/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java index 9ff3e1c..e8eb1a9 100644 --- a/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java +++ b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java @@ -16,6 +16,7 @@ */ package flex.messaging.config; +import flex.messaging.validators.ClassDeserializationValidator; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -1865,21 +1866,37 @@ public abstract class ServerConfigurationParser extends AbstractConfigurationPar private void validators(Node root) { Node validatorsNode = selectSingleNode(root, VALIDATORS_ELEMENT); -if (validatorsNode == null) +if (validatorsNode == null) { +// Default to the ClassDeserializationValidator +defaultValidator(); return; +} // Validation allowedChildElements(validatorsNode, VALIDATORS_CHILDREN); // Validator NodeList validators = selectNodeList(validatorsNode, VALIDATOR_ELEMENT); -for (int i = 0; i < validators.getLength(); i++) -{ -Node validator = validators.item(i); -validator(validator); +if(validators.getLength() > 0) { +for (int i = 0; i < validators.getLength(); i++) { +Node validator = validators.item(i); +validator(validator); +} +} else { +// Default to the ClassDeserializationValidator +defaultValidator(); } } +/** + * Initialize a efault validator that protects BlazeDS against the most obvious attacks. + */ +private void defaultValidator() { +ValidatorSettings validatorSettings = new ValidatorSettings(); + validatorSettings.setClassName(ClassDeserializationValidator.class.getName()); +
[41/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/main/java/flex/messaging/util/PropertyStringResourceLoader.java -- diff --git a/common/src/main/java/flex/messaging/util/PropertyStringResourceLoader.java b/common/src/main/java/flex/messaging/util/PropertyStringResourceLoader.java new file mode 100644 index 000..21c2f59 --- /dev/null +++ b/common/src/main/java/flex/messaging/util/PropertyStringResourceLoader.java @@ -0,0 +1,378 @@ +/* + * 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 flex.messaging.util; + +import java.io.InputStream; +import java.io.IOException; +import java.text.MessageFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; + +import flex.messaging.log.Log; +import flex.messaging.log.Logger; +import flex.messaging.log.LogCategories; + +/** + * Implementation of ResourceLoader that loads string resources + * from property files. + * + * This class uses MessageFormat to perform substitutions + * within parameterized strings. + * + * + * @see MessageFormat + * + */ +public class PropertyStringResourceLoader implements ResourceLoader +{ +// The property file bundle that contains localized error strings for BlazeDS. +public static final String PROPERTY_BUNDLE = "flex/messaging/errors"; + +// The property file bundle that contains localized error strings for BlazeDS +// code specific to vendors (eg. LoginCommands for specific application serves) +public static final String VENDORS_BUNDLE = "flex/messaging/vendors"; + +// The property file bundle that contains localized error strings for LCDS. +public static final String LCDS_PROPERTY_BUNDLE = "flex/data/errors"; + +// The category to write log entries under. +private static final String LOG_CATEGORY = LogCategories.RESOURCE; + +// The property bundle names to use in string lookups. +private String[] propertyBundles; + +// The default FDS locale. +private Locale defaultLocale; + +// The set of locales that have strings loaded. +private Set loadedLocales = new TreeSet(); + +// A map of all loaded strings. +private Map strings = new HashMap(); + +// The logger for this instance. +private Logger logger; + +/** + * Constructs a PropertyStringResourceLoader using the default + * property bundles specified by the PROPERTY_BUNDLE and + * LCDS_PROPERTY_BUNDLE fields. + */ +public PropertyStringResourceLoader() +{ +this(new String[] {PROPERTY_BUNDLE, LCDS_PROPERTY_BUNDLE}); +} + +/** + * Constructs a PropertyStringResourceLoader that will use the + * specified property bundle to use for string lookups. + * + * @param propertyBundle The property bundles to use for lookups. + */ +public PropertyStringResourceLoader(String propertyBundle) +{ +this(new String[] {propertyBundle}); +} + +/** + * Constructs a PropertyStringResourceLoader that will use the + * specified property bundles to use for string lookups. + * + * @param propertyBundles The list of the property bundles to use for lookups. + */ +public PropertyStringResourceLoader(String[] propertyBundles) +{ +this.propertyBundles = propertyBundles; +logger = Log.getLogger(LOG_CATEGORY); +} + +// Implements flex.messaging.util.ResourceLoader.init; inherits javadoc specification. +public void init(Map properties) +{} + +// Implements flex.messaging.util.ResourceLoader.getString; inherits javadoc specification. +public String getString(String key) +{ +return getString(key, null, null); +} + +// Implements flex.messaging.util.ResourceLoader.getString; inherits javadoc specification. +public String getString(String key, Object[] arguments) +{ +return getString(key, null, arguments); +} + +// Implements flex.messaging.util.ResourceLoader.getString; inherits javadoc specification. +public String getString(String key, Locale
[18/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/Amf3Input.java -- diff --git a/core/src/flex/messaging/io/amf/Amf3Input.java b/core/src/flex/messaging/io/amf/Amf3Input.java deleted file mode 100644 index 0e62b88..000 --- a/core/src/flex/messaging/io/amf/Amf3Input.java +++ /dev/null @@ -1,1045 +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 flex.messaging.io.amf; - -import java.io.ByteArrayOutputStream; -import java.io.Externalizable; -import java.io.IOException; -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Date; -import java.util.Dictionary; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; - -import flex.messaging.io.PropertyProxy; -import flex.messaging.io.SerializationContext; -import flex.messaging.io.SerializationException; -import flex.messaging.io.UnknownTypeException; -import flex.messaging.io.amf.AmfTrace.VectorType; -import flex.messaging.util.ClassUtil; -import flex.messaging.util.Trace; - -/** - * Reads AMF 3 formatted data stream. - * - * This class intends to matches the Flash Player 8 C++ code - * in avmglue/DataIO.cpp - * - * - * - */ -public class Amf3Input extends AbstractAmfInput implements Amf3Types -{ -/** - * - */ -protected List objectTable; - -/** - * - */ -protected List stringTable; - -/** - * - */ -protected List traitsTable; - -public Amf3Input(SerializationContext context) -{ -super(context); - -stringTable = new ArrayList(64); -objectTable = new ArrayList(64); -traitsTable = new ArrayList(10); -} - -/** - * Reset should be called before reading a top level object, - * such as a new header or a new body. - */ -@Override -public void reset() -{ -super.reset(); -stringTable.clear(); -objectTable.clear(); -traitsTable.clear(); -} - -public Object saveObjectTable() -{ -Object table = objectTable; -objectTable = new ArrayList(64); -return table; -} - -public void restoreObjectTable(Object table) -{ -objectTable = (ArrayList) table; -} - -public Object saveTraitsTable() -{ -Object table = traitsTable; -traitsTable = new ArrayList(10); -return table; -} - -public void restoreTraitsTable(Object table) -{ -traitsTable = (ArrayList) table; -} - -public Object saveStringTable() -{ -Object table = stringTable; -stringTable = new ArrayList(64); -return table; -} - -public void restoreStringTable(Object table) -{ -stringTable = (ArrayList) table; -} - -/** - * Public entry point to read a top level AMF Object, such as - * a header value or a message body. - * @return Object the object read - * @throws ClassNotFoundException, IOException when reading object process failed - */ -public Object readObject() throws ClassNotFoundException, IOException -{ -int type = in.readByte(); -Object value = readObjectValue(type); -return value; -} - -/** - * - */ -protected Object readObjectValue(int type) throws ClassNotFoundException, IOException -{ -Object value = null; - -switch (type) -{ -case kStringType: -ClassUtil.validateCreation(String.class); - -value = readString(); -if (isDebug) -trace.writeString((String)value); -break; - -case kObjectType: -value = readScriptObject(); -break; - -case kArrayType: -value = readArray(); -break; - -case kFalseType: -ClassUtil.validateCreation(Boolean.class); - -value = Boolean.FALSE; - -if (isDebug) -trace.write(value); -break; - -case kTrueType: -
[22/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/endpoints/amf/SerializationFilter.java -- diff --git a/core/src/flex/messaging/endpoints/amf/SerializationFilter.java b/core/src/flex/messaging/endpoints/amf/SerializationFilter.java deleted file mode 100644 index c15ab89..000 --- a/core/src/flex/messaging/endpoints/amf/SerializationFilter.java +++ /dev/null @@ -1,480 +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 flex.messaging.endpoints.amf; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.EOFException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; - -import javax.servlet.http.HttpServletRequest; - -import flex.messaging.FlexContext; -import flex.messaging.MessageException; -import flex.messaging.io.MessageDeserializer; -import flex.messaging.io.MessageIOConstants; -import flex.messaging.io.MessageSerializer; -import flex.messaging.io.SerializationContext; -import flex.messaging.io.SerializationException; -import flex.messaging.io.amf.ASObject; -import flex.messaging.io.amf.ActionContext; -import flex.messaging.io.amf.ActionMessage; -import flex.messaging.io.amf.AmfTrace; -import flex.messaging.io.amf.MessageBody; -import flex.messaging.log.Log; -import flex.messaging.log.LogCategories; -import flex.messaging.log.Logger; -import flex.messaging.messages.ErrorMessage; -import flex.messaging.messages.Message; -import flex.messaging.messages.MessagePerformanceInfo; -import flex.messaging.util.ExceptionUtil; -import flex.messaging.util.StringUtils; - - -/** - * Filter for serializing and deserializing action messages. - */ -public class SerializationFilter extends AMFFilter -{ - //-- -// -// Private Static Constants -// - //-- - -private static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); - -// Error codes. -private static final int UNHANDLED_ERROR = 10306; -private static final int REQUEST_ERROR = 10307; -private static final int RESPONSE_ERROR = 10308; - - //-- -// -// Constructor -// - //-- - -/** - * Constructs a SerializationFilter. - * - * @param logCategory Log category to use in logging. If null, the default values is Endpoint.General. - */ -public SerializationFilter(String logCategory) -{ -if (logCategory == null) -logCategory = LogCategories.ENDPOINT_GENERAL; -logger = Log.getLogger(logCategory); -} - - //-- -// -// Variables -// - //-- - -/** - * Used to log serialization/deserialization messages. - */ -private Logger logger; - - //-- -// -// Public Methods -// - //-- - -@Override -public void invoke(final ActionContext context) throws IOException -{ -boolean success = false; - -// Additional AMF packet tracing is enabled only at the debug logging level -// and only if there's a target listening for it. -AmfTrace debugTrace = Log.isDebug() && logger.hasTarget()? new AmfTrace() : null; - -// Create an empty ActionMessage object to hold our response -context.setResponseMessage(new ActionMessage()); -SerializationContext sc = SerializationContext.getSerializationContext(); - -try -{ -// Deserialize the input stream into an "ActionMessage" object. -MessageDeserializer deserializer =
[55/72] [abbrv] flex-blazeds git commit: - Moved the integration tests to the remoting module as they require remoting to run (not ideal solution) - Enabled the integation tests again - Implemented a
- Moved the integration tests to the remoting module as they require remoting to run (not ideal solution) - Enabled the integation tests again - Implemented a new serialization option "allow-xml" which is disabled per default which completely disables deserialization of xml documents. Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/a09196c2 Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/a09196c2 Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/a09196c2 Branch: refs/heads/master Commit: a09196c2c4c425cbc9bd46bdf849cd9d0518dfc1 Parents: 94728dd Author: Christofer DutzAuthored: Fri Feb 17 11:35:32 2017 +0100 Committer: Christofer Dutz Committed: Fri Feb 17 11:35:32 2017 +0100 -- core/pom.xml| 14 - .../messaging/endpoints/AbstractEndpoint.java | 2 + .../flex/messaging/io/SerializationContext.java | 2 + .../java/flex/messaging/io/amf/Amf0Input.java | 14 +- .../java/flex/messaging/io/amf/Amf3Input.java | 11 +- .../messaging/io/amf/client/AMFConnection.java | 31 +- .../test/java/amfclient/ClientCustomType.java | 45 -- .../io/amf/client/AMFConnectionIT.java | 778 --- .../messaging/io/amf/client/AMFDataTypeIT.java | 479 .../java/flex/messaging/util/TestServer.java| 53 -- .../flex/messaging/util/TestServerWrapper.java | 78 -- .../resources/WEB-INF/flex/remoting-config.xml | 58 -- .../resources/WEB-INF/flex/services-config.xml | 49 -- pom.xml | 5 +- remoting/pom.xml| 14 + .../test/java/amfclient/ClientCustomType.java | 45 ++ .../io/amf/client/AMFConnectionIT.java | 778 +++ .../messaging/io/amf/client/AMFDataTypeIT.java | 534 + .../java/flex/messaging/util/TestServer.java| 58 ++ .../flex/messaging/util/TestServerWrapper.java | 78 ++ .../resources/WEB-INF/flex/remoting-config.xml | 58 ++ .../resources/WEB-INF/flex/services-config.xml | 54 ++ 22 files changed, 1669 insertions(+), 1569 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/a09196c2/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 5a642bf..54761cd 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -60,20 +60,6 @@ limitations under the License. - org.eclipse.jetty - jetty-server - 9.1.0.v20131115 - test - - - - org.eclipse.jetty - jetty-servlet - 9.1.0.v20131115 - test - - - junit junit test http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/a09196c2/core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java -- diff --git a/core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java b/core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java index c265ea9..6bc8c88 100644 --- a/core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java +++ b/core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java @@ -109,6 +109,7 @@ public abstract class AbstractEndpoint extends ManageableComponent private static final String LEGACY_THROWABLE = "legacy-throwable"; private static final String LEGACY_BIG_NUMBERS = "legacy-big-numbers"; private static final String LEGACY_EXTERNALIZABLE = "legacy-externalizable"; +private static final String ALLOW_XML = "allow-xml"; private static final String ALLOW_XML_DOCTYPE_DECLARATION = "allow-xml-doctype-declaration"; private static final String ALLOW_XML_EXTERNAL_ENTITY_EXPANSION = "allow-xml-external-entity-expansion"; @@ -279,6 +280,7 @@ public abstract class AbstractEndpoint extends ManageableComponent serializationContext.legacyThrowable = serialization.getPropertyAsBoolean(LEGACY_THROWABLE, false); serializationContext.legacyBigNumbers = serialization.getPropertyAsBoolean(LEGACY_BIG_NUMBERS, false); serializationContext.legacyExternalizable = serialization.getPropertyAsBoolean(LEGACY_EXTERNALIZABLE, false); +serializationContext.allowXml = serialization.getPropertyAsBoolean(ALLOW_XML, false); serializationContext.allowXmlDoctypeDeclaration = serialization.getPropertyAsBoolean(ALLOW_XML_DOCTYPE_DECLARATION, false); serializationContext.allowXmlExternalEntityExpansion = serialization.getPropertyAsBoolean(ALLOW_XML_EXTERNAL_ENTITY_EXPANSION, false); serializationContext.maxObjectNestLevel =
[52/72] [abbrv] flex-blazeds git commit: - Added a blazeds-spring-boot-archetype
- Added a blazeds-spring-boot-archetype Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/62d99f33 Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/62d99f33 Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/62d99f33 Branch: refs/heads/master Commit: 62d99f33b47e7441ddd1b4b422b35e8408b65f2a Parents: 8315f8f Author: Christofer DutzAuthored: Fri Feb 17 10:00:07 2017 +0100 Committer: Christofer Dutz Committed: Fri Feb 17 10:00:07 2017 +0100 -- .../blazeds-spring-boot-archetype/README.md | 118 +++ .../blazeds-spring-boot-archetype/pom.xml | 35 ++ .../META-INF/maven/archetype-metadata.xml | 19 +++ .../main/resources/archetype-resources/pom.xml | 77 .../main/java/BlazeDSSpringBootApplication.java | 38 ++ .../src/main/java/services/ExampleService.java | 37 ++ .../resources/META-INF/flex/services-config.xml | 86 ++ .../projects/basic/archetype.properties | 5 + .../src/test/resources/projects/basic/goal.txt | 0 archetypes/pom.xml | 36 ++ pom.xml | 1 + 11 files changed, 452 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/62d99f33/archetypes/blazeds-spring-boot-archetype/README.md -- diff --git a/archetypes/blazeds-spring-boot-archetype/README.md b/archetypes/blazeds-spring-boot-archetype/README.md new file mode 100644 index 000..453caf8 --- /dev/null +++ b/archetypes/blazeds-spring-boot-archetype/README.md @@ -0,0 +1,118 @@ +# Usage + +## Create a new project using the blazeds-spring-boot-archetype + +Using the maven-archetype-plugin it is easy to generate a new project utilizing Spring-Boot to setup a BlazeDS server in order to get started with BlazeDS almost instantly. + +In order to creat such a project, you nee to execute the following command: +``` +mvn archetype:generate -DarchetypeGroupId=org.apache.flex.blazeds -DarchetypeArtifactId=blazeds-spring-boot-example-archetype -DarchetypeVersion=4.7.3-SNAPSHOT +``` +The archetype-plugin will ask you for a groupId, artifactId, version and package name. + +The first are used to fill the maven coordinates in the generated pom and the package will be used to set the package the generated classes are located in. + +## Run the generated application + +After having generated your application, just start it by executing the following command: +``` +mvn spring-boot:run +``` +The output should be something like this: +``` +[INFO] Scanning for projects... +[WARNING] +[WARNING] Some problems were encountered while building the effective model for mygroup:myartifact:war:1.0-SNAPSHOT +[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-war-plugin is missing. @ line 50, column 15 +[WARNING] +[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. +[WARNING] +[WARNING] For this reason, future Maven versions might no longer support building such malformed projects. +[WARNING] +[INFO] +[INFO] +[INFO] Building myartifact 1.0-SNAPSHOT +[INFO] +[INFO] +[INFO] >>> spring-boot-maven-plugin:1.3.3.RELEASE:run (default-cli) @ myartifact >>> +[INFO] +[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ myartifact --- +[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! +[INFO] Copying 1 resource +[INFO] +[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ myartifact --- +[WARNING] File encoding has not been set, using platform encoding UTF-8, i.e. build is platform dependent! +[INFO] Compiling 2 source files to /Users/christoferdutz/Temp/myartifact/target/classes +[INFO] +[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ myartifact --- +[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! +[INFO] skip non existing resourceDirectory /Users/christoferdutz/Temp/myartifact/src/test/resources +[INFO] +[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ myartifact --- +[INFO] No sources to compile +[INFO] +[INFO] <<< spring-boot-maven-plugin:1.3.3.RELEASE:run (default-cli) @ myartifact <<< +[INFO] +[INFO] --- spring-boot-maven-plugin:1.3.3.RELEASE:run (default-cli) @ myartifact --- + + .
[46/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/log/Logger.java -- diff --git a/common/src/flex/messaging/log/Logger.java b/common/src/flex/messaging/log/Logger.java deleted file mode 100644 index 8684a3e..000 --- a/common/src/flex/messaging/log/Logger.java +++ /dev/null @@ -1,402 +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 flex.messaging.log; - -import flex.messaging.util.PrettyPrinter; -import flex.messaging.util.StringUtils; - -import java.util.ArrayList; -import java.util.Iterator; - -/** - * The Logger class is used to log out information. It provides named - * methods to log information out at the desired level. Each Logger - * will log information out for a log category that is settable. - * - * - */ -public class Logger -{ -/** - * The category this logger send messages for. - */ -private volatile String category; - -/** - * The list of targets that this logger will dispatch log events to. - */ -private final ArrayList targets; - -/** - * Constructs a Logger instance that will log - * information out to the specified category. - * - * @param category The category to log information for. - */ -public Logger(String category) -{ -this.category = category; -targets = new ArrayList(); -} - -/** - * Returns the category this Logger logs information for. - * - * @return The category this Logger logs information for. - */ -public String getCategory() -{ -return category; -} - -/** - * Determines whether the Logger has at least one target. - * - * @return True if the Logger has one or more targets. - */ -public boolean hasTarget() -{ -synchronized (targets) -{ -return !targets.isEmpty(); -} -} -/** - * Adds a Target that will format and output log events - * generated by this Logger. - * - * @param target The Target to add. - */ -void addTarget(Target target) -{ -synchronized (targets) -{ -if (!targets.contains(target)) -targets.add(target); -} -} - -/** - * Removes a Target from this Logger. - * - * @param target The Target to remove. - */ -void removeTarget(Target target) -{ -synchronized (targets) -{ -targets.remove(target); -} -} - -/* - * DEBUG - */ -/** - * Logs out a debug message. - * - * @param message The message to log. - */ -public void debug(String message) -{ -log(LogEvent.DEBUG, message, null, null); -} - -/** - * Logs out a debug message associated with a Throwable. - * - * @param message The message to log. - * @param t The associated Throwable. - */ -public void debug(String message, Throwable t) -{ -log(LogEvent.DEBUG, message, null, t); -} - -/** - * Logs out a debug message supporting positional parameter substitutions. - * - * @param message The message to log. - * @param parameters Parameters to substitute into the message. - */ -public void debug(String message, Object[] parameters) -{ -log(LogEvent.DEBUG, message, parameters, null); -} - -/** - * Logs out a debug message supporting positional parameter substitutions and an - * associated Throwable. - * - * @param message The message to log. - * @param parameters Parameters to substitute into the message. - * @param t The associated Throwable. - */ -public void debug(String message, Object[] parameters, Throwable t) -{ -log(LogEvent.DEBUG, message, parameters, t); -} - -/* - * INFO - */ -/** - * Logs out an info message. - * - * @param message The message to log. - */ -public void info(String message) -{ -log(LogEvent.INFO, message, null, null); -} - -/** - * Logs out an info message associated with a Throwable. - * - * @param message The
[05/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java -- diff --git a/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java b/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java deleted file mode 100644 index 3298507..000 --- a/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java +++ /dev/null @@ -1,160 +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 flex.messaging.util.concurrent; - -import flex.messaging.log.Log; -import flex.messaging.log.LogCategories; - -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.RejectedExecutionException; - -/** - * Implements {@link Executor} and extends the ThreadPoolExecutor provided by the - * Java 1.4.x-friendly backport of the java.util.concurrent API. - * - * - */ -public class DefaultThreadPoolExecutor extends ThreadPoolExecutor implements Executor -{ - //-- -// -// Constructors -// - //-- - -/** - * Constructs a DefaultThreadPoolExecutor with configuration that - * matches the return from {@link java.util.concurrent.Executors#newCachedThreadPool()}. - */ -public DefaultThreadPoolExecutor() -{ -super(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue()); -} - -/** - * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue) - */ -public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue) -{ -super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue); -} - -/** - * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.RejectedExecutionHandler) - */ -public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, RejectedExecutionHandler handler) -{ -super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, handler); -} - -/** - * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.ThreadFactory) - */ -public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, ThreadFactory threadFactory) -{ -super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory); -} - -/** - * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.ThreadFactory, java.util.concurrent.RejectedExecutionHandler) - */ -public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, ThreadFactory threadFactory, RejectedExecutionHandler handler) -{ -super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler); -} - - //-- -// -// Variables -// - //-- - -/** - * Instance-level lock. - */ -private final Object lock = new Object(); - -
[09/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java -- diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java b/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java deleted file mode 100644 index d04539f..000 --- a/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java +++ /dev/null @@ -1,1114 +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 flex.messaging.services.messaging.adapters; - -import java.util.Collection; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - -import javax.jms.JMSException; -import javax.naming.Context; - -import flex.management.runtime.messaging.services.messaging.adapters.JMSAdapterControl; -import flex.messaging.Destination; -import flex.messaging.MessageClient; -import flex.messaging.MessageClientListener; -import flex.messaging.MessageDestination; -import flex.messaging.MessageException; -import flex.messaging.config.ConfigMap; -import flex.messaging.config.ConfigurationException; -import flex.messaging.log.Log; -import flex.messaging.log.LogCategories; -import flex.messaging.messages.CommandMessage; -import flex.messaging.messages.ErrorMessage; -import flex.messaging.messages.Message; -import flex.messaging.messages.MessagePerformanceInfo; -import flex.messaging.messages.MessagePerformanceUtils; -import flex.messaging.services.MessageService; -import flex.messaging.services.messaging.adapters.JMSSettings.DeliverySettings; - -/** - * This adapter for the MessageService integrates Flex messaging - * with Java Message Service destinations. - */ -public class JMSAdapter extends MessagingAdapter implements JMSConfigConstants, JMSExceptionListener, JMSMessageListener, MessageClientListener -{ -public static final String LOG_CATEGORY = LogCategories.SERVICE_MESSAGE_JMS; -private static final String DURABLE_SUBSCRIBER_NAME_PREFIX = "FlexClient_"; - -// Note that clientId is kept track as Object (instead of String) in all of -// these data structures because in clustering, clientId is not a String, -// it's an instance of org.jgroups.stack.IpAddress instead. -private MapconsumerToClientId; -private Map
[35/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/FlexSession.java -- diff --git a/core/src/flex/messaging/FlexSession.java b/core/src/flex/messaging/FlexSession.java deleted file mode 100644 index 4f34f8a..000 --- a/core/src/flex/messaging/FlexSession.java +++ /dev/null @@ -1,1064 +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 flex.messaging; - -import flex.messaging.client.FlexClient; -import flex.messaging.client.FlexClientListener; -import flex.messaging.log.LogCategories; -import flex.messaging.messages.Message; -import flex.messaging.util.TimeoutAbstractObject; - -import java.security.Principal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; - -/** - * The base for FlexSession implementations. - */ -public abstract class FlexSession extends TimeoutAbstractObject implements FlexClientListener, MessageClientListener -{ - //-- -// -// Public Static Variables -// - //-- - -/** - * Log category for FlexSession related messages. - */ -public static final String FLEX_SESSION_LOG_CATEGORY = LogCategories.ENDPOINT_FLEXSESSION; - -/** - * - */ -public static final int MAX_CONNECTIONS_PER_SESSION_UNLIMITED = -1; - - //-- -// -// Private Static Variables -// - //-- - -/** - * The set of session created listeners to notify upon a new session creation. - */ -private static final CopyOnWriteArrayList createdListeners = new CopyOnWriteArrayList(); - -/** - * Error string constants. - */ -private static final int FLEX_SESSION_INVALIDATED = 10019; - - //-- -// -// Constructor -// - //-- - -/** - * - * @deprecated Post 2.6.1 releases require use of the constructor that takes an AbstractFlexSessionProvider argument. - */ -public FlexSession() -{ -this(null); -} - -/** - * - * Constructs a new FlexSession instance. - * - * @param sessionProvider The provider that instantiated this instance. - */ -public FlexSession(AbstractFlexSessionProvider sessionProvider) -{ -this.sessionProvider = sessionProvider; -} - - //-- -// -// Static Methods -// - //-- - -/** - * Adds a session created listener that will be notified when new sessions - * are created. - * - * @see flex.messaging.FlexSessionListener - * - * @param listener The listener to add. - */ -public static void addSessionCreatedListener(FlexSessionListener listener) -{ -if (listener != null) -createdListeners.addIfAbsent(listener); -} - -/** - * Removes a session created listener. - * - * @see flex.messaging.FlexSessionListener - * - * @param listener The listener to remove. - */ -public static void removeSessionCreatedListener(FlexSessionListener listener) -{ -if (listener != null) -createdListeners.remove(listener); -} - - //-- -// -// Variables -// - //-- - -/** - * Flag used to break cycles during invalidation. - */ -protected boolean invalidating; - -/** - * Instance
[47/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/errors.properties -- diff --git a/common/src/flex/messaging/errors.properties b/common/src/flex/messaging/errors.properties deleted file mode 100644 index 6ff59b0..000 --- a/common/src/flex/messaging/errors.properties +++ /dev/null @@ -1,432 +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. - -# IMPORTANT: Error messages are now split between two files in BlazeDS and LCDS. -# This file is for BlazeDS error messages (which can be used by LCDS code as well). -# LCDS only messages now live in a separate file in the LCDS branch. While editing -# these files, keep in mind that both files are part of the same numeric sequence. -# -# Error and details messages for LocalizedMessageExceptions are stored in the following format: -# Error message: {number}[-{variant}]={message} -# Details message: {number}[-{variant}]-details={details} -# -# Server error numbers start at 1. -# -# Error numbers are chosen by taking the next available value in a numeric sequence. -# Each functional component or group of components should claim a unique block of 50 -# numbers to use for error and details messages. If this initial set of 50 values -# are exhausted, the component should claim the next available block of 50 values for -# its use. This means that an error-ridden component may well use a disjoint set of -# error numbers. Here's an example: -# FeatureError numbers claimed -# --- -# Security 10050-10099 -# Configuration 10100-10149 -# Security 10150-10199 <- Security exhausted its first block, so it claims the next -# available block of 50 values for its continued use. -# -# Constants to lookup error/details strings by 'number', and optional 'variant', -# should be defined in the classes that use them. When a class needs to define a new -# error and/or details string, add the necessary string(s) to this file using the next -# available numeric value in the corresponding range. -# -# The structure of this file should be maintained according to increasing error number. This -# means that for features that throw many errors, blocks of corresponding message strings -# won't necessarily be contiguous, but this simplifies identifying the starting value for -# the next available block of values and simplifies validation that duplicate error numbers -# are not being used. -# * Caution: Reusing a property key doesn't generate any error, so watch for typos. -#The last defined property with a duplicate key clobbers the earlier values. - -# 1-10049: General LocalizedException messages (in MessageBrokerFilter and MessageBroker). -1=There was an unhandled failure on the server. {0} -10001=Null endpoint id arrived on message. -10002=No such endpoint: {0} -10003=No configured channel has an endpoint path ''{0}''. -10004=The supplied destination id is not registered with any service. -10005=Destination ''{0}'' not accessible over channel ''{1}''. -10006=Error occurred while attempting to convert an input argument''s type. -10007=Cannot invoke method ''{0}''. -10007-0-details=Method ''{0}'' not found. -10007-1-details={0} arguments were sent but {1} were expected. -10007-2-details=The expected argument types are ({0}) but the supplied types were ({1}) and converted to ({2}). -10007-3-details=The expected argument types are ({0}) but the supplied types were ({1}) with none successfully converted. -10007-4-details=The expected argument types are ({0}) but no arguments were provided. -10007-5-details=No arguments were expected but the following types were supplied ({0}). -10008=Cannot create class of type ''{0}''. -10008-0-details=Type ''{0}'' not found. -10009=Given type ''{0}'' is not of expected type ''{1}''. -10010=Unable to create a new instance of type ''{0}''. -10010-0-details=Types must have a public, no arguments constructor. -10010-1-details=Interfaces cannot be instantiated. -10010-2-details=Abstract types cannot be instantiated. -10010-3-details=Types cannot be instantiated without a public, no arguments
[43/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/main/java/flex/messaging/config/FlexClientSettings.java -- diff --git a/common/src/main/java/flex/messaging/config/FlexClientSettings.java b/common/src/main/java/flex/messaging/config/FlexClientSettings.java new file mode 100644 index 000..bba7e5a --- /dev/null +++ b/common/src/main/java/flex/messaging/config/FlexClientSettings.java @@ -0,0 +1,134 @@ +/* + * 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 flex.messaging.config; + +/** + * + */ +public class FlexClientSettings extends PropertiesSettings +{ + //-- +// +// Constructor +// + //-- + +/** + * Constructs a FlexClientSettings instance. + */ +public FlexClientSettings() +{ +// Empty for now. +} + + //-- +// +// Properties +// + //-- + +private long timeoutMinutes = -1; + +/** + * Returns the number of minutes before an idle FlexClient is timed out. + * + * @return The number of minutes before an idle FlexClient is timed out. + */ +public long getTimeoutMinutes() +{ +return timeoutMinutes; +} + +/** + * Sets the number of minutes before an idle FlexClient is timed out. + * + * @param value The number of minutes before an idle FlexClient is timed out. + */ +public void setTimeoutMinutes(long value) +{ +timeoutMinutes = value; +} + +private String flexClientOutboundQueueProcessorClassName; + +/** + * Returns the name of the default FlexClientOutboundQueueProcessorClass. + * + * @return The the name of the default FlexClientOutboundQueueProcessorClass. + */ +public String getFlexClientOutboundQueueProcessorClassName() +{ +return flexClientOutboundQueueProcessorClassName; +} + +/** + * Sets the name of the default FlexClientOutboundQueueProcessor. + * + * @param flexClientOutboundQueueProcessorClassName The name of the default FlexClientOutboundQueueProcessor. + */ +public void setFlexClientOutboundQueueProcessorClassName(String flexClientOutboundQueueProcessorClassName) +{ +this.flexClientOutboundQueueProcessorClassName = flexClientOutboundQueueProcessorClassName; +} + +private ConfigMap flexClientOutboundQueueProcessorProperties; + +/** + * Returns the properties for the default FlexClientOutboundQueueProcessor. + * + * @return The properties for the default FlexClientOutboundQueueProcessor. + */ +public ConfigMap getFlexClientOutboundQueueProcessorProperties() +{ +return flexClientOutboundQueueProcessorProperties; +} + +/** + * Sets the properties for the default FlexClientOutboundQueueProcessor. + * + * @param flexClientOutboundQueueProcessorProperties properties for the default + * FlexClientOutboundQueueProcessor + */ +public void setFlexClientOutboundQueueProcessorProperties(ConfigMap flexClientOutboundQueueProcessorProperties) +{ +this.flexClientOutboundQueueProcessorProperties = flexClientOutboundQueueProcessorProperties; +} + +private int reliableReconnectDurationMillis; + +public int getReliableReconnectDurationMillis() +{ +return reliableReconnectDurationMillis; +} + +public void setReliableReconnectDurationMillis(int value) +{ +reliableReconnectDurationMillis = value; +} + +private int heartbeatIntervalMillis; + +public int getHeartbeatIntervalMillis() +{ +return heartbeatIntervalMillis; +} + +public void setHeartbeatIntervalMillis(int value) +{ +heartbeatIntervalMillis = value; +} +}
[58/72] [abbrv] flex-blazeds git commit: - Temporarily disabled the integration tests as these seem to be causing problems on Apache Jenkins
- Temporarily disabled the integration tests as these seem to be causing problems on Apache Jenkins Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/c4ffd05c Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/c4ffd05c Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/c4ffd05c Branch: refs/heads/master Commit: c4ffd05c36be87353510a4335674b58384751f8b Parents: f861f09 Author: Christofer DutzAuthored: Wed Feb 22 14:57:00 2017 +0100 Committer: Christofer Dutz Committed: Wed Feb 22 14:57:00 2017 +0100 -- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/c4ffd05c/pom.xml -- diff --git a/pom.xml b/pom.xml index 823f6d9..1b007b0 100755 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,8 @@ - + +
[69/72] [abbrv] flex-blazeds git commit: Updated the apache parent pom to the latest version
Updated the apache parent pom to the latest version Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/b9e5967b Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/b9e5967b Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/b9e5967b Branch: refs/heads/master Commit: b9e5967b29c88703e46f3242eeaf1b8fc3430b47 Parents: 0578e10 Author: Christofer DutzAuthored: Mon Mar 27 22:33:23 2017 +0200 Committer: Christofer Dutz Committed: Mon Mar 27 22:33:23 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/b9e5967b/pom.xml -- diff --git a/pom.xml b/pom.xml index dbb42c3..6c9d8c1 100755 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache apache -16 +18 org.apache.flex.blazeds
[67/72] [abbrv] flex-blazeds git commit: - Commented out the failsafe plugin (again) because I still haven't tested the file-lock problem on Windows
- Commented out the failsafe plugin (again) because I still haven't tested the file-lock problem on Windows Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/3e49fb35 Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/3e49fb35 Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/3e49fb35 Branch: refs/heads/master Commit: 3e49fb3522da3b003a87ef2f114c879d5ad6a366 Parents: 1a2c89d Author: Christofer DutzAuthored: Mon Feb 27 19:24:52 2017 +0100 Committer: Christofer Dutz Committed: Mon Feb 27 19:24:52 2017 +0100 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/3e49fb35/pom.xml -- diff --git a/pom.xml b/pom.xml index 842c431..dbb42c3 100755 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ - +
[70/72] [abbrv] flex-blazeds git commit: Updated the text documents in preparation to a new release.
Updated the text documents in preparation to a new release. Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/0238dc3f Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/0238dc3f Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/0238dc3f Branch: refs/heads/master Commit: 0238dc3f838eadf838c60ffc2f0edd945bba831b Parents: b9e5967 Author: Christofer DutzAuthored: Mon Mar 27 22:33:48 2017 +0200 Committer: Christofer Dutz Committed: Mon Mar 27 22:33:48 2017 +0200 -- README| 14 +- README-ANT| 41 RELEASE_NOTES | 80 +- readme.txt| 41 4 files changed, 127 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/0238dc3f/README -- diff --git a/README b/README index 7cabb38..1809f55 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ Apache Flex BlazeDS data and push data in real-time to Adobe® Flex® and Adobe AIR⢠applications for more responsive rich Internet application (RIA) experiences.. -Apache Flex BlazeDS 4.7.2 is an update to the initial release of BlazeDS +Apache Flex BlazeDS 4.7.3 is an update to the initial release of BlazeDS from the Apache Software Foundation. Prior to this, releases were provided by Adobe Systems Inc. It is compatible with most code written to target Adobe Flex 4.6. @@ -33,7 +33,7 @@ Getting the latest sources via Git For further information visit http://flex.apache.org/download-source.html -Building Apache Flex BlazeDS 4.7.2 +Building Apache Flex BlazeDS 4.7.3 == Apache Flex BlazeDS is a large project. It requires some build tools which must be @@ -100,27 +100,27 @@ Using the Binary Distribution org.apache.flex.blazeds flex-messaging-common -4.7.2 +4.7.3 org.apache.flex.blazeds flex-messaging-core -4.7.2 +4.7.3 org.apache.flex.blazeds flex-messaging-opt -4.7.2 +4.7.3 org.apache.flex.blazeds flex-messaging-proxy -4.7.2 +4.7.3 org.apache.flex.blazeds flex-messaging-remoting -4.7.2 +4.7.3 http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/0238dc3f/README-ANT -- diff --git a/README-ANT b/README-ANT new file mode 100755 index 000..e2e6a8f --- /dev/null +++ b/README-ANT @@ -0,0 +1,41 @@ +/* + * 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. + */ + +BlazeDS Build readme file + +BlazeDS build script requires that the following products are installed. +- ANT 1.7.0 +- ANT-CONTRIB-1.0b2 +- Sun JDK 5 +- JUnit (required in ANT_HOME/lib for "unit" target) + +BlazeDS build script requires that the following environment variable are set properly. +- JAVA_HOME +- ANT_HOME +- JAVA_HOME\bin and ANT_HOME\bin must be on the path. + +The build.xml at the top level of the installed BlazeDS will build the product. +The following steps will create a new version of BlazeDS and the sample applications. +- ant clean +- ant main +- ant checkintests + +NOTE: In order to build optional modules you need the following jars: + (1) For weblogic: weblogic.jar + +The ant checkintests will verify if the build was successful. This step runs all unit tests developed. + http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/0238dc3f/RELEASE_NOTES -- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ee94e7d..dc2aad7 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,8 +1,86 @@ +Apache Flex BlazeDS 4.7.3
[37/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/management/runtime/messaging/services/ServiceControl.java -- diff --git a/core/src/flex/management/runtime/messaging/services/ServiceControl.java b/core/src/flex/management/runtime/messaging/services/ServiceControl.java deleted file mode 100644 index da3c605..000 --- a/core/src/flex/management/runtime/messaging/services/ServiceControl.java +++ /dev/null @@ -1,143 +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 flex.management.runtime.messaging.services; - -import flex.management.BaseControl; -import flex.management.runtime.messaging.MessageBrokerControl; -import flex.messaging.Destination; -import flex.messaging.services.Service; - -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import javax.management.ObjectName; - -/** - * The ServiceControl class is the MBean implementation for - * monitoring and managing a Service at runtime. - */ -public abstract class ServiceControl extends BaseControl implements ServiceControlMBean -{ -protected Service service; -private List destinations; - -/** - * Constructs a ServiceControl, assigning its id, managed service and - * parent MBean. - * - * @param service The Service managed by this MBean. - * @param parent The parent MBean in the management hierarchy. - */ -public ServiceControl(Service service, BaseControl parent) -{ -super(parent); -this.service = service; -destinations = new ArrayList(); -} - -/* - * (non-Javadoc) - * @see flex.management.BaseControlMBean#getId() - */ -public String getId() -{ -return service.getId(); -} - -/* - * (non-Javadoc) - * @see flex.management.runtime.ServiceControlMBean#isRunning() - */ -public Boolean isRunning() -{ -return Boolean.valueOf(service.isStarted()); -} - - -/** - * Adds the ObjectName of a destination registered with the managed service. - * - * @param value The ObjectName of a destination registered with the managed service. - */ -public void addDestination(ObjectName value) -{ -destinations.add(value); -} - -/** - * Removes the ObjectName of a destination registered with the managed service. - * - * @param value The ObjectName of a destination registered with the managed service. - */ -public void removeDestination(ObjectName value) -{ -destinations.remove(value); -} - -/* - * (non-Javadoc) - * @see flex.management.runtime.ServiceControlMBean#getDestinations() - */ -public ObjectName[] getDestinations() -{ -int size = destinations.size(); -ObjectName[] destinationNames = new ObjectName[size]; -for (int i = 0; i < size; ++i) -{ -destinationNames[i] = (ObjectName)destinations.get(i); -} -return destinationNames; -} - - -/* - * (non-Javadoc) - * @see flex.management.runtime.ServiceControlMBean#getStartTimestamp() - */ -public Date getStartTimestamp() -{ -return startTimestamp; -} - - -/* - * (non-Javadoc) - * @see javax.management.MBeanRegistration#preDeregister() - */ -public void preDeregister() throws Exception -{ -MessageBrokerControl parent = (MessageBrokerControl)getParentControl(); -parent.removeService(getObjectName()); - -// Unregister destinations of the service -for (Iterator iter = service.getDestinations().values().iterator(); iter.hasNext();) { -Destination child = (Destination) iter.next(); -if (child.getControl() != null) -{ -child.getControl().unregister(); -child.setControl(null); -child.setManaged(false); -} - -} - -super.preDeregister(); -} - -}
[40/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/management/BaseControl.java -- diff --git a/core/src/flex/management/BaseControl.java b/core/src/flex/management/BaseControl.java deleted file mode 100644 index a66a104..000 --- a/core/src/flex/management/BaseControl.java +++ /dev/null @@ -1,514 +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 flex.management; - -import flex.management.runtime.AdminConsoleDisplayRegistrar; -import flex.messaging.FlexContext; - -import java.util.Date; -import java.util.List; -import java.util.ArrayList; -import javax.management.InstanceAlreadyExistsException; -import javax.management.InstanceNotFoundException; -import javax.management.MalformedObjectNameException; -import javax.management.MBeanRegistration; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.NotCompliantMBeanException; -import javax.management.ObjectName; -import javax.servlet.ServletConfig; - -/** - * The implementation of the BaseControlMBean interface. This - * abstract class provides the core functionality that all Flex control MBeans - * require. - * - * Defining concrete implementations of getId() and - * getType() are left to subclasses, but this base class does - * provide access to the parent MBean for each instance. This class also - * implements the MBeanRegistration interface, and it - * automatically stores a reference to the MBean server in each instance upon - * registration. Subclasses may choose to override none, any, or all of the - * methods defined by the MBeanRegistration interface, but any - * overrides should be sure to invoke the overridden method with a call to their - * superclass. - * - * The register() method provides a simple and consistent way to - * register instances with the MBean server, and the - * getObjectName() method gaurantees consistent, well-formed - * ObjectNames for all MBean instances. - */ -public abstract class BaseControl implements BaseControlMBean, -MBeanRegistration -{ -/** - * The prefix used for the domain part of control MBean names. - */ -public static final String DOMAIN_PREFIX = "flex.runtime"; -private static final int MALFORMED_OBJECTNAME = 10400; -private static final int UNREG_EXCEPTION = 10401; -private static final int UNREG_NOTFOUND = 10402; -private static final int REG_EXCEPTION = 10403; -private static final int REG_ALREADYEXISTS = 10404; -private static final int REG_NOTCOMPLIANT = 10405; -private static final int DISABLE_MANAGEMENT = 10426; - -protected Date startTimestamp; -private BaseControl parent; -private ObjectName objectName; -private ObjectName registeredObjectName; -private MBeanServer server; -private boolean registered = false; - -private AdminConsoleDisplayRegistrar registrar; - -// Implements flex.management.BaseControlMBean.getId; inherits javadoc -// specification. -public abstract String getId(); - -// Implements flex.management.BaseControlMBean.getType; inherits javadoc -// specification. -public abstract String getType(); - -// Implements flex.management.BaseControlMBean.getParent; inherits javadoc -// specification. -public final ObjectName getParent() -{ -return (parent != null) ? parent.getObjectName() : null; -} - -/** - * Returns an identifier for the application that hosts the component that - * this control manages. - * - * @return An identifier for the application that hosts the component this - * control manages. - */ -public String getApplicationId() -{ -String id = null; -// Our base implementation attempts to use the current servlet context -// name as our application identifier. -ServletConfig config = FlexContext.getServletConfig(); -if (config != null) -{ -id = config.getServletContext().getServletContextName(); -} -return (id != null) ? id.replace(":", "") : ""; -} - -/** - * Set the register object. -
[27/72] [abbrv] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/config/ServerConfigurationParser.java -- diff --git a/core/src/flex/messaging/config/ServerConfigurationParser.java b/core/src/flex/messaging/config/ServerConfigurationParser.java deleted file mode 100644 index 9ff3e1c..000 --- a/core/src/flex/messaging/config/ServerConfigurationParser.java +++ /dev/null @@ -1,1920 +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 flex.messaging.config; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.StringTokenizer; - -import flex.messaging.config.ThrottleSettings.Policy; -import flex.messaging.util.LocaleUtils; - -/** - * Processes DOM representation of a messaging configuration file. - * - * Note: Since reference ids are used between elements, certain - * sections of the document need to be parsed first. - * - * - * - */ -public abstract class ServerConfigurationParser extends AbstractConfigurationParser -{ -/** - * Used to verify that advanced messaging support has been registered if necessary. - * If other configuration requires it, but it was not registered a ConfigurationException is thrown. - */ -private boolean verifyAdvancedMessagingSupport = false; -private boolean advancedMessagingSupportRegistered = false; - -@Override -protected void parseTopLevelConfig(Document doc) -{ -Node root = selectSingleNode(doc, "/" + SERVICES_CONFIG_ELEMENT); - -if (root != null) -{ -allowedChildElements(root, SERVICES_CONFIG_CHILDREN); - -securitySection(root); // Parse security before channels. - -serversSection(root); - -channelsSection(root); - -services(root); - -clusters(root); - -logging(root); - -system(root); - -flexClient(root); - -factories(root); - -messageFilters(root); - -validators(root); - -// Validate that any dependencies on advanced messaging support can be satisified at runtime. -if (verifyAdvancedMessagingSupport && !advancedMessagingSupportRegistered) -{ -ConfigurationException e = new ConfigurationException(); -e.setMessage(REQUIRE_ADVANCED_MESSAGING_SUPPORT); -throw e; -} -} -else -{ -// The services configuration root element must be '{SERVICES_CONFIG_ELEMENT}'. -ConfigurationException e = new ConfigurationException(); -e.setMessage(INVALID_SERVICES_ROOT, new Object[]{SERVICES_CONFIG_ELEMENT}); -throw e; -} -} - -private void clusters(Node root) -{ -Node clusteringNode = selectSingleNode(root, CLUSTERS_ELEMENT); -if (clusteringNode != null) -{ -allowedAttributesOrElements(clusteringNode, CLUSTERING_CHILDREN); - -NodeList clusters = selectNodeList(clusteringNode, CLUSTER_DEFINITION_ELEMENT); -for (int i = 0; i < clusters.getLength(); i++) -{ -Node cluster = clusters.item(i); -requiredAttributesOrElements(cluster, CLUSTER_DEFINITION_CHILDREN); -String clusterName = getAttributeOrChildElement(cluster, ID_ATTR); -if (!isValidID(clusterName)) -continue; - -String propsFileName = getAttributeOrChildElement(cluster, CLUSTER_PROPERTIES_ATTR); -ClusterSettings clusterSettings = new ClusterSettings(); -clusterSettings.setClusterName(clusterName); -clusterSettings.setPropsFileName(propsFileName); -String className = getAttributeOrChildElement(cluster, CLASS_ATTR); -if (className != null && className.length() > 0) -clusterSettings.setImplementationClass(className); - -String defaultValue =