From: Roland Haeder Date: Tue, 8 Sep 2015 13:39:17 +0000 (+0200) Subject: More cleanup X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d2ca865768d5c10981feafbf8c270ff698a9478;p=jcoreee.git More cleanup Signed-off-by:Roland Häder --- diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar deleted file mode 100644 index 1d7417c..0000000 Binary files a/lib/commons-codec-1.10.jar and /dev/null differ diff --git a/lib/commons-codec-LICENSE.txt b/lib/commons-codec-LICENSE.txt deleted file mode 100644 index 75b5248..0000000 --- a/lib/commons-codec-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/lib/commons-lang3-3.4.jar b/lib/commons-lang3-3.4.jar deleted file mode 100644 index 8ec91d4..0000000 Binary files a/lib/commons-lang3-3.4.jar and /dev/null differ diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar new file mode 100644 index 0000000..b7c4751 Binary files /dev/null and b/lib/jcore-ee-logger.jar differ diff --git a/lib/jcore.jar b/lib/jcore.jar index 1e4a78b..7318d47 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/log4j-LICENSE.txt b/lib/log4j-LICENSE.txt deleted file mode 100644 index 6279e52..0000000 --- a/lib/log4j-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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. diff --git a/lib/log4j-api-2.3.jar b/lib/log4j-api-2.3.jar deleted file mode 100644 index 2a61bbe..0000000 Binary files a/lib/log4j-api-2.3.jar and /dev/null differ diff --git a/lib/log4j-core-2.3.jar b/lib/log4j-core-2.3.jar deleted file mode 100644 index 5438b0b..0000000 Binary files a/lib/log4j-core-2.3.jar and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 5ba63b1..f7691d6 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -921,6 +921,14 @@ is divided into following sections: + + + + + + + + @@ -1406,6 +1414,14 @@ is divided into following sections: + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 622716b..e465cdb 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=4032bd34 +build.xml.data.CRC32=0ce5255b build.xml.script.CRC32=3357aa22 build.xml.stylesheet.CRC32=8064a381@1.75.2.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=4032bd34 -nbproject/build-impl.xml.script.CRC32=29041c33 +nbproject/build-impl.xml.data.CRC32=0ce5255b +nbproject/build-impl.xml.script.CRC32=00a5f845 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 8f29e6f..47784ba 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,17 +30,12 @@ dist.jar=${dist.dir}/jcoreee.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.jcore.jar=lib/jcore.jar -file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar -file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ - ${file.reference.jcore.jar}:\ - ${file.reference.log4j-api-2.3.jar}:\ - ${file.reference.log4j-core-2.3.jar}:\ + ${reference.jcore-ee-logger.jar}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation @@ -81,7 +76,9 @@ manifest.custom.permissions= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform +project.jcore-ee-logger=../jcore-ee-logger project.license=gpl30 +reference.jcore-ee-logger.jar=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -93,6 +90,5 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 -source.reference.jcore.jar=../jcore/src src.dir=src test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 386475b..b742a85 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -14,5 +14,15 @@ ./lib/nblibraries.properties + + + jcore-ee-logger + jar + + jar + clean + jar + + diff --git a/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java b/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java index 9d70e50..0aa4843 100644 --- a/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java +++ b/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java @@ -17,6 +17,7 @@ package org.mxchange.jcoreee.beans; import java.io.Serializable; +import org.mxchange.jcoree.BaseEeSystem; /** * A general bean class. Do not put things in here that are not serializable. @@ -24,7 +25,7 @@ import java.io.Serializable; * * @author Roland Haeder */ -public abstract class BaseFrameworkBean implements Serializable { +public abstract class BaseFrameworkBean extends BaseEeSystem implements Serializable { /** * Serial number diff --git a/src/org/mxchange/jcoreee/filter/servlet/BaseServletFilter.java b/src/org/mxchange/jcoreee/filter/servlet/BaseServletFilter.java index f0f33ef..b7656c0 100644 --- a/src/org/mxchange/jcoreee/filter/servlet/BaseServletFilter.java +++ b/src/org/mxchange/jcoreee/filter/servlet/BaseServletFilter.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import javax.servlet.Filter; import javax.servlet.FilterConfig; import javax.servlet.ServletException; -import org.mxchange.jcore.BaseFrameworkSystem; +import org.mxchange.jcoree.BaseEeSystem; /** * A general servlet filter class. If you need to override init() or @@ -29,7 +29,7 @@ import org.mxchange.jcore.BaseFrameworkSystem; * * @author Roland Haeder */ -public abstract class BaseServletFilter extends BaseFrameworkSystem implements Filter { +public abstract class BaseServletFilter extends BaseEeSystem implements Filter { /** * Configuration instance */ @@ -53,13 +53,13 @@ public abstract class BaseServletFilter extends BaseFrameworkSystem implements F @Override public void init (final FilterConfig filterConfig) throws ServletException { // Trace message - this.getLogger().trace(MessageFormat.format("filterConfig={0} - CALLED!", filterConfig)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("filterConfig={0} - CALLED!", filterConfig)); //NOI18N // Set config instance this.setConfig(filterConfig); // Trace message - this.getLogger().trace("EXIT!"); //NOI18N + this.getLogger().logTrace("EXIT!"); //NOI18N } /** diff --git a/src/org/mxchange/jcoreee/filter/servlet/utf8/Utf8ServletFilter.java b/src/org/mxchange/jcoreee/filter/servlet/utf8/Utf8ServletFilter.java index 9489991..4e53964 100644 --- a/src/org/mxchange/jcoreee/filter/servlet/utf8/Utf8ServletFilter.java +++ b/src/org/mxchange/jcoreee/filter/servlet/utf8/Utf8ServletFilter.java @@ -43,7 +43,7 @@ public class Utf8ServletFilter extends BaseServletFilter implements Filter { @Override public void doFilter (final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException { // Trace message - this.getLogger().trace(MessageFormat.format("request={0},response={1},chain={2} - CALLED!", request, response, chain)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("request={0},response={1},chain={2} - CALLED!", request, response, chain)); //NOI18N // Call super method chain.doFilter(request, response); @@ -53,6 +53,6 @@ public class Utf8ServletFilter extends BaseServletFilter implements Filter { response.setCharacterEncoding("UTF-8"); //NOI18N // Trace message - this.getLogger().trace("EXIT!"); //NOI18N + this.getLogger().logTrace("EXIT!"); //NOI18N } } diff --git a/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java b/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java index d1eb115..67e5508 100644 --- a/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java +++ b/src/org/mxchange/jcoreee/validator/BaseObjectValidator.java @@ -18,14 +18,12 @@ package org.mxchange.jcoreee.validator; import java.text.MessageFormat; import java.util.Arrays; -import java.util.ResourceBundle; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; -import org.mxchange.jcore.BaseFrameworkSystem; -import org.mxchange.jcore.FrameworkInterface; +import org.mxchange.jcoree.BaseEeSystem; /** * A general object validation class. Please implement javax.faces.validator.Validator @@ -34,7 +32,7 @@ import org.mxchange.jcore.FrameworkInterface; * * @author Roland Haeder */ -public abstract class BaseObjectValidator extends BaseFrameworkSystem implements FrameworkInterface, Validator { +public abstract class BaseObjectValidator extends BaseEeSystem implements Validator { /** * Needs to be implemented as the Validator interface needs to be implemented. @@ -47,19 +45,6 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements @Override abstract public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException; - /** - * Initializes resource bundle - * - * @param FacesContext instance - */ - private void initResourceBundle (final FacesContext context) { - // Is it set? - if (null == this.getBundle()) { - // Set it now - setBundle(ResourceBundle.getBundle("org.mxchange.localization.bundle", context.getViewRoot().getLocale())); - } - } - /** * The method pre-validates the given value. It makes sure that the component's id is found in * requiredFields and is not null. Once the component's id has been found, it stops iteration on @@ -73,10 +58,7 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements */ protected void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException { // Trace message - this.getLogger().trace(MessageFormat.format("context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N - - // Set resource bundle - this.initResourceBundle(context); + this.getLogger().logTrace(MessageFormat.format("context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N // Init message and key FacesMessage facesMessage = null; @@ -91,7 +73,7 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements // Check component's id against required fields and find a match for (final String field : requiredFields) { // Get logger - this.getLogger().debug(MessageFormat.format("field={0},clientId={1}", field, clientId)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("field={0},clientId={1}", field, clientId)); //NOI18N // Is it the same? if (clientId.endsWith(field)) { @@ -103,7 +85,7 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements errKey = String.format("error.%s.is_null", field); //NOI18N // Value it null - facesMessage = new FacesMessage(this.getMessageStringFromKey(errKey)); + facesMessage = new FacesMessage(BaseEeSystem.getMessageStringFromKey(errKey)); } // Abort here @@ -112,7 +94,7 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements } // Debug message - this.getLogger().debug(MessageFormat.format("isValidField={0}", isValidField)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("isValidField={0}", isValidField)); //NOI18N // Valid field? if (!isValidField) { @@ -121,7 +103,7 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements } // Debug message - this.getLogger().debug(MessageFormat.format("facesMessage={0}", facesMessage)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("facesMessage={0}", facesMessage)); //NOI18N // Is it not null? if (null != facesMessage) { @@ -129,6 +111,6 @@ public abstract class BaseObjectValidator extends BaseFrameworkSystem implements } // Trace message - this.getLogger().trace("EXIT!"); //NOI18N + this.getLogger().logTrace("EXIT!"); //NOI18N } } diff --git a/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java b/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java index b67b5e7..194686a 100644 --- a/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java +++ b/src/org/mxchange/jcoreee/validator/bool/BaseBooleanValidator.java @@ -25,6 +25,7 @@ import javax.faces.component.ValueHolder; import javax.faces.context.FacesContext; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; +import org.mxchange.jcoree.BaseEeSystem; import org.mxchange.jcoreee.validator.BaseObjectValidator; /** @@ -38,7 +39,7 @@ public abstract class BaseBooleanValidator extends BaseObjectValidator implement @Override public void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException { // Trace message - this.getLogger().trace(MessageFormat.format("context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N + this.getLogger().logTrace(MessageFormat.format("context={0},component={1},value={2},requiredFields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N // Pre-validate super.preValidate(context, component, value, requiredFields); @@ -50,14 +51,14 @@ public abstract class BaseBooleanValidator extends BaseObjectValidator implement // So far all fine, no check if the field is fine for (final String field : requiredFields) { // Debug message - this.getLogger().debug(MessageFormat.format("field={0},clientId={1}", field, clientId)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("field={0},clientId={1}", field, clientId)); //NOI18N // Is it the same? if (clientId.endsWith(field)) { // Compare value's type if (!(value instanceof Boolean)) { // Value is not right type - facesMessage = new FacesMessage(this.getMessageStringFromKey(String.format("error.%s.is_not_boolean", field))); //NOI18N + facesMessage = new FacesMessage(BaseEeSystem.getMessageStringFromKey(String.format("error.%s.is_not_boolean", field))); //NOI18N break; } diff --git a/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java b/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java index 9b14869..17476d0 100644 --- a/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java +++ b/src/org/mxchange/jcoreee/validator/bool/privacy_terms/PrivacyTermsCheckboxValidator.java @@ -33,7 +33,7 @@ public class PrivacyTermsCheckboxValidator extends BaseBooleanValidator implemen @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Trace message - this.getLogger().trace(MessageFormat.format("context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N // All accepted, required fields String[] requiredFileds = {"privacy", "terms"}; //NOI18N @@ -42,6 +42,6 @@ public class PrivacyTermsCheckboxValidator extends BaseBooleanValidator implemen super.preValidate(context, component, value, requiredFileds); // Trace message - this.getLogger().trace("EXIT!"); //NOI18N + this.getLogger().logTrace("EXIT!"); //NOI18N } } diff --git a/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java b/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java index c7316a2..83dc8a6 100644 --- a/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java +++ b/src/org/mxchange/jcoreee/validator/string/BaseStringValidator.java @@ -22,6 +22,7 @@ import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.ValidatorException; +import org.mxchange.jcoree.BaseEeSystem; import org.mxchange.jcoreee.validator.BaseObjectValidator; /** @@ -35,7 +36,7 @@ public abstract class BaseStringValidator extends BaseObjectValidator { @Override protected void preValidate (final FacesContext context, final UIComponent component, final Object value, final String[] requiredFields) throws ValidatorException { // Trace message - this.getLogger().trace(MessageFormat.format("context={0},component={1},value={2},fields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N + this.getLogger().logTrace(MessageFormat.format("context={0},component={1},value={2},fields={3} - CALLED!", context, component, value, Arrays.toString(requiredFields))); //NOI18N // Pre-validate (e.g. on null) super.preValidate(context, component, value, requiredFields); @@ -48,7 +49,7 @@ public abstract class BaseStringValidator extends BaseObjectValidator { // So far all fine, no check if the field is fine for (final String field : requiredFields) { // Debug message - this.getLogger().debug(MessageFormat.format("field={0},clientId={1}", field, clientId)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("field={0},clientId={1}", field, clientId)); //NOI18N // Is it the same? if (clientId.endsWith(field)) { @@ -57,7 +58,7 @@ public abstract class BaseStringValidator extends BaseObjectValidator { // Value is empty errKey = String.format("error.%s.is_not_string", field); //NOI18N - facesMessage = new FacesMessage(this.getMessageStringFromKey(errKey)); + facesMessage = new FacesMessage(BaseEeSystem.getMessageStringFromKey(errKey)); } // Cast to string @@ -68,13 +69,13 @@ public abstract class BaseStringValidator extends BaseObjectValidator { // Value is empty errKey = String.format("error.%s.is_empty", field); //NOI18N - facesMessage = new FacesMessage(this.getMessageStringFromKey(errKey)); + facesMessage = new FacesMessage(BaseEeSystem.getMessageStringFromKey(errKey)); } } } // Debug message - this.getLogger().debug(MessageFormat.format("facesMessage={0}", facesMessage)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("facesMessage={0}", facesMessage)); //NOI18N // Is it not null? if (null != facesMessage) { @@ -82,6 +83,6 @@ public abstract class BaseStringValidator extends BaseObjectValidator { } // Trace message - this.getLogger().trace("EXIT!"); //NOI18N + this.getLogger().logTrace("EXIT!"); //NOI18N } } diff --git a/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java b/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java index 8325169..b512c3a 100644 --- a/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java +++ b/src/org/mxchange/jcoreee/validator/string/names/NameValidator.java @@ -32,7 +32,7 @@ public class NameValidator extends BaseStringValidator implements Validator { @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Trace message - this.getLogger().trace(MessageFormat.format("context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N // All accepted, required fields String[] requiredFileds = {"firstName", "familyName", "city", "street"}; //NOI18N @@ -41,6 +41,6 @@ public class NameValidator extends BaseStringValidator implements Validator { super.preValidate(context, component, value, requiredFileds); // Trace message - this.getLogger().trace("EXIT!"); //NOI18N + this.getLogger().logTrace("EXIT!"); //NOI18N } }