You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2019/01/02 13:20:36 UTC
[myfaces-tobago] branch master updated (d70b4e0 -> db449d1)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from d70b4e0 TOBAGO-1633: Use TypeScript instead of JavaScript.
new 85f240d TOBAGO-1968: Using unified initialiser for logger constant
new db449d1 cleanup
The 2 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.
Summary of changes:
.../myfaces/tobago/component/Attributes.java | 4 +-
.../apache/myfaces/tobago/component/Sorter.java | 3 +-
.../org/apache/myfaces/tobago/context/Markup.java | 3 +-
.../apache/myfaces/tobago/context/ThemeImpl.java | 3 +-
.../myfaces/tobago/context/TobagoContext.java | 3 +-
.../tobago/context/TobagoExceptionHandler.java | 3 +-
.../apache/myfaces/tobago/context/UserAgent.java | 3 +-
.../myfaces/tobago/convert/DateTimeConverter.java | 3 +-
.../myfaces/tobago/convert/DurationConverter.java | 3 +-
.../myfaces/tobago/convert/ThemeConverter.java | 7 +-
.../org/apache/myfaces/tobago/el/UserWrapper.java | 3 +-
.../tobago/event/CollapsibleActionListener.java | 3 +-
.../myfaces/tobago/event/TobagoActionSource.java | 3 +-
.../ValueExpressionResetInputActionListener.java | 3 +-
.../ValueExpressionSheetStateChangeListener.java | 3 +-
.../event/ValueExpressionTabChangeListener.java | 3 +-
.../myfaces/tobago/facelets/AttributeHandler.java | 3 +-
.../tobago/facelets/ConvertDateTimeHandler.java | 3 +-
.../facelets/FixCharacterEncodingFilter.java | 3 +-
.../apache/myfaces/tobago/facelets/Resource.java | 3 +-
.../internal/component/AbstractUICommand.java | 4 --
.../tobago/internal/component/AbstractUIData.java | 3 +-
.../tobago/internal/component/AbstractUIDate.java | 3 +-
.../internal/component/AbstractUIFormBase.java | 3 +-
.../internal/component/AbstractUIGridLayout.java | 3 +-
.../tobago/internal/component/AbstractUIPage.java | 3 +-
.../internal/component/AbstractUIProgress.java | 4 --
.../internal/component/AbstractUISection.java | 4 --
.../internal/component/AbstractUISelectItem.java | 3 +-
.../tobago/internal/component/AbstractUISheet.java | 3 +-
.../tobago/internal/component/AbstractUIStars.java | 4 --
.../tobago/internal/component/AbstractUIStyle.java | 3 +-
.../internal/component/AbstractUISuggest.java | 3 +-
.../internal/component/AbstractUITabGroup.java | 3 +-
.../internal/config/TobagoConfigBuilder.java | 3 +-
.../config/TobagoConfigEntityResolver.java | 3 +-
.../internal/config/TobagoConfigFragment.java | 4 --
.../tobago/internal/config/TobagoConfigImpl.java | 3 +-
.../tobago/internal/config/TobagoConfigParser.java | 3 +-
.../tobago/internal/config/TobagoConfigSorter.java | 3 +-
.../tobago/internal/context/DateTimeI18n.java | 3 +-
.../myfaces/tobago/internal/context/Nonce.java | 3 +-
.../myfaces/tobago/internal/layout/Grid.java | 3 +-
.../myfaces/tobago/internal/renderkit/Command.java | 3 +-
.../renderkit/renderer/CommandRendererBase.java | 4 --
.../internal/renderkit/renderer/DateRenderer.java | 3 +-
.../renderer/DecodingCommandRendererBase.java | 5 +-
.../renderer/DecodingInputRendererBase.java | 3 +-
.../internal/renderkit/renderer/FileRenderer.java | 3 +-
.../internal/renderkit/renderer/InRenderer.java | 3 +-
.../renderkit/renderer/MessagesRenderer.java | 3 +-
.../internal/renderkit/renderer/PageRenderer.java | 3 +-
.../renderkit/renderer/ProgressRenderer.java | 4 --
.../renderer/SelectBooleanCheckboxRenderer.java | 3 +-
.../renderkit/renderer/SelectManyRendererBase.java | 3 +-
.../renderkit/renderer/SelectOneRendererBase.java | 3 +-
.../renderer/SheetPageCommandRenderer.java | 6 --
.../internal/renderkit/renderer/SheetRenderer.java | 3 +-
.../renderkit/renderer/SplitLayoutRenderer.java | 3 +-
.../internal/renderkit/renderer/StarsRenderer.java | 3 -
.../internal/renderkit/renderer/StyleRenderer.java | 4 --
.../renderkit/renderer/SubviewRenderer.java | 3 +-
.../renderkit/renderer/SuggestRenderer.java | 7 +-
.../renderkit/renderer/TabGroupRenderer.java | 3 +-
.../renderkit/renderer/TextareaRenderer.java | 3 +-
.../renderer/TobagoClientBehaviorRenderer.java | 3 +-
.../renderkit/renderer/TreeLabelRenderer.java | 4 --
.../renderkit/renderer/TreeNodeRenderer.java | 3 +-
.../internal/renderkit/renderer/TreeRenderer.java | 3 +-
.../renderkit/renderer/TreeSelectRenderer.java | 3 +-
.../tobago/internal/util/AccessKeyLogger.java | 3 +-
.../tobago/internal/util/AuthorizationHelper.java | 3 +-
.../myfaces/tobago/internal/util/CookieUtils.java | 3 +-
.../tobago/internal/util/HtmlRendererUtils.java | 3 +-
.../myfaces/tobago/internal/util/JndiUtils.java | 78 --------------------
.../myfaces/tobago/internal/util/JsonUtils.java | 3 +-
.../myfaces/tobago/internal/util/PartUtils.java | 3 +-
.../myfaces/tobago/internal/util/RenderUtils.java | 3 +-
.../tobago/internal/util/ResponseUtils.java | 3 +-
.../tobago/internal/util/StyleRenderUtils.java | 3 +-
.../internal/webapp/DebugContentTypeFilter.java | 3 +-
.../internal/webapp/DebugContentTypeResponse.java | 4 +-
.../webapp/DebugResponseWriterWrapper.java | 3 +-
.../tobago/internal/webapp/LoggingMdcFilter.java | 3 +-
.../internal/webapp/TobagoResponseWriterBase.java | 3 +-
.../apache/myfaces/tobago/layout/MarginTokens.java | 3 +-
.../org/apache/myfaces/tobago/layout/Measure.java | 3 +-
.../apache/myfaces/tobago/layout/PixelMeasure.java | 82 ----------------------
.../tobago/lifecycle/SecretPhaseListener.java | 3 +-
.../myfaces/tobago/model/ScrollPosition.java | 3 +-
.../apache/myfaces/tobago/model/SheetState.java | 3 +-
.../myfaces/tobago/model/TreeNodeDataModel.java | 3 +-
.../tobago/renderkit/LabelWithAccessKey.java | 3 +-
.../myfaces/tobago/renderkit/TobagoRenderKit.java | 4 +-
.../tobago/renderkit/css/BootstrapClass.java | 3 +-
.../myfaces/tobago/renderkit/css/CustomClass.java | 3 +-
.../renderkit/css/FontAwesomeIconEncoder.java | 3 +-
.../apache/myfaces/tobago/renderkit/css/Icons.java | 3 +-
.../tobago/sanitizer/IgnoringSanitizer.java | 3 +-
.../myfaces/tobago/sanitizer/JsoupSanitizer.java | 3 +-
.../tobago/servlet/NonFacesRequestServlet.java | 3 +-
.../myfaces/tobago/servlet/ResourceServlet.java | 3 +-
.../apache/myfaces/tobago/util/BeanComparator.java | 3 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 3 +-
.../myfaces/tobago/util/DebugActionListener.java | 3 +-
.../tobago/util/DebugNavigationHandler.java | 3 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 3 +-
.../tobago/util/ValueExpressionComparator.java | 3 +-
.../validator/ClearValidatorsActionListener.java | 3 +-
.../tobago/webapp/AjaxExceptionHandler.java | 3 +-
.../tobago/webapp/LogoutActionListener.java | 3 +-
.../webapp/TobagoServletContextListener.java | 3 +-
.../internal/config/AbstractTobagoTestBase.java | 4 --
.../apache/myfaces/tobago/example/blank/Hello.java | 3 +-
.../myfaces/tobago/example/demo/ApiController.java | 3 +-
.../tobago/example/demo/BehaviorController.java | 3 +-
.../tobago/example/demo/ButtonLinkController.java | 3 +-
.../tobago/example/demo/CollapsibleController.java | 3 +-
.../example/demo/ConversationController.java | 5 --
.../example/demo/CurrentValueController.java | 3 +-
.../tobago/example/demo/DateController.java | 3 +-
.../tobago/example/demo/DemoController.java | 3 +-
.../example/demo/ExceptionHandlerController.java | 4 +-
.../tobago/example/demo/ExecuteController.java | 3 +-
.../tobago/example/demo/FormController.java | 5 --
.../tobago/example/demo/GroupController.java | 3 +-
.../myfaces/tobago/example/demo/InController.java | 3 +-
.../example/demo/InputSuggestController.java | 3 +-
.../myfaces/tobago/example/demo/Jsr303Bean.java | 3 +-
.../tobago/example/demo/LocaleController.java | 3 +-
.../tobago/example/demo/LoginController.java | 3 +-
.../tobago/example/demo/ManifestReader.java | 3 +-
.../myfaces/tobago/example/demo/NamedNode.java | 3 +-
.../tobago/example/demo/NavigationNode.java | 4 --
.../tobago/example/demo/NavigationState.java | 3 +-
.../tobago/example/demo/NavigationTree.java | 3 +-
.../apache/myfaces/tobago/example/demo/Node.java | 4 +-
.../tobago/example/demo/OldLinksServlet.java | 3 +-
.../tobago/example/demo/OnOffConverter.java | 3 +-
.../example/demo/PartialReloadController.java | 3 +-
.../tobago/example/demo/ProgressController.java | 5 --
.../tobago/example/demo/ResizeController.java | 3 +-
.../myfaces/tobago/example/demo/ServerInfo.java | 3 +-
.../tobago/example/demo/SheetController.java | 3 +-
.../tobago/example/demo/SheetFilterController.java | 3 +-
.../example/demo/SheetSortingController.java | 3 +-
.../myfaces/tobago/example/demo/SolarObject.java | 3 +-
.../tobago/example/demo/SourceFileReader.java | 3 +-
.../tobago/example/demo/SuggestController.java | 3 +-
.../example/demo/SuggestQuotMarkController.java | 3 +-
.../myfaces/tobago/example/demo/TabController.java | 3 +-
.../tobago/example/demo/TestController.java | 3 +-
.../tobago/example/demo/ThemeController.java | 3 +-
.../tobago/example/demo/TreeEditorController.java | 3 +-
.../tobago/example/demo/UploadController.java | 3 +-
.../myfaces/tobago/example/demo/UploadItem.java | 5 --
.../demo/bestpractice/BestPracticeController.java | 3 +-
.../demo/bestpractice/TransitionController.java | 3 +-
.../tobago/example/demo/info/ActivityList.java | 3 +-
.../example/demo/nonfacesrequest/FishPond.java | 3 +-
.../myfaces/tobago/example/demo/sudoku/Sudoku.java | 3 +-
.../tobago/example/test/ScriptEventItem.java | 3 +-
.../tobago/example/test/ScriptEventServlet.java | 3 +-
.../tobago/example/test/SheetSortController.java | 3 +-
.../myfaces/tobago/example/test/WaitFilter.java | 3 +-
.../example/demo/qunit/AccessAllPagesTest.java | 3 +-
.../tobago/example/demo/qunit/SeleniumBase.java | 3 +-
.../tobago/example/demo/qunit/StandardTest.java | 3 +-
168 files changed, 308 insertions(+), 387 deletions(-)
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
delete mode 100644 tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
[myfaces-tobago] 01/02: TOBAGO-1968: Using unified initialiser for
logger constant
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 85f240d303b1a24f00d48b02126c83e236a9069c
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Jan 2 14:18:40 2019 +0100
TOBAGO-1968: Using unified initialiser for logger constant
---
.../main/java/org/apache/myfaces/tobago/component/Attributes.java | 4 +++-
.../src/main/java/org/apache/myfaces/tobago/component/Sorter.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/context/Markup.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/context/TobagoContext.java | 3 ++-
.../org/apache/myfaces/tobago/context/TobagoExceptionHandler.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/context/UserAgent.java | 3 ++-
.../java/org/apache/myfaces/tobago/convert/DateTimeConverter.java | 3 ++-
.../java/org/apache/myfaces/tobago/convert/DurationConverter.java | 3 ++-
.../java/org/apache/myfaces/tobago/convert/ThemeConverter.java | 7 ++++---
.../src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java | 3 ++-
.../org/apache/myfaces/tobago/event/CollapsibleActionListener.java | 3 ++-
.../java/org/apache/myfaces/tobago/event/TobagoActionSource.java | 3 ++-
.../tobago/event/ValueExpressionResetInputActionListener.java | 3 ++-
.../tobago/event/ValueExpressionSheetStateChangeListener.java | 3 ++-
.../myfaces/tobago/event/ValueExpressionTabChangeListener.java | 3 ++-
.../java/org/apache/myfaces/tobago/facelets/AttributeHandler.java | 3 ++-
.../org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java | 3 ++-
.../apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/facelets/Resource.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUICommand.java | 4 ----
.../apache/myfaces/tobago/internal/component/AbstractUIData.java | 3 ++-
.../apache/myfaces/tobago/internal/component/AbstractUIDate.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUIFormBase.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUIGridLayout.java | 3 ++-
.../apache/myfaces/tobago/internal/component/AbstractUIPage.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUIProgress.java | 4 ----
.../myfaces/tobago/internal/component/AbstractUISection.java | 4 ----
.../myfaces/tobago/internal/component/AbstractUISelectItem.java | 3 ++-
.../apache/myfaces/tobago/internal/component/AbstractUISheet.java | 3 ++-
.../apache/myfaces/tobago/internal/component/AbstractUIStars.java | 4 ----
.../apache/myfaces/tobago/internal/component/AbstractUIStyle.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUISuggest.java | 3 ++-
.../myfaces/tobago/internal/component/AbstractUITabGroup.java | 3 ++-
.../apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java | 3 ++-
.../myfaces/tobago/internal/config/TobagoConfigEntityResolver.java | 3 ++-
.../myfaces/tobago/internal/config/TobagoConfigFragment.java | 4 ----
.../apache/myfaces/tobago/internal/config/TobagoConfigImpl.java | 3 ++-
.../apache/myfaces/tobago/internal/config/TobagoConfigParser.java | 3 ++-
.../apache/myfaces/tobago/internal/config/TobagoConfigSorter.java | 3 ++-
.../org/apache/myfaces/tobago/internal/context/DateTimeI18n.java | 3 ++-
.../java/org/apache/myfaces/tobago/internal/context/Nonce.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/internal/layout/Grid.java | 3 ++-
.../java/org/apache/myfaces/tobago/internal/renderkit/Command.java | 3 ++-
.../tobago/internal/renderkit/renderer/CommandRendererBase.java | 4 ----
.../myfaces/tobago/internal/renderkit/renderer/DateRenderer.java | 3 ++-
.../internal/renderkit/renderer/DecodingCommandRendererBase.java | 5 +++--
.../internal/renderkit/renderer/DecodingInputRendererBase.java | 3 ++-
.../myfaces/tobago/internal/renderkit/renderer/FileRenderer.java | 3 ++-
.../myfaces/tobago/internal/renderkit/renderer/InRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/MessagesRenderer.java | 3 ++-
.../myfaces/tobago/internal/renderkit/renderer/PageRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/ProgressRenderer.java | 4 ----
.../internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/SelectManyRendererBase.java | 3 ++-
.../tobago/internal/renderkit/renderer/SelectOneRendererBase.java | 3 ++-
.../internal/renderkit/renderer/SheetPageCommandRenderer.java | 6 ------
.../myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/SplitLayoutRenderer.java | 3 ++-
.../myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java | 3 ---
.../myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java | 4 ----
.../tobago/internal/renderkit/renderer/SubviewRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/SuggestRenderer.java | 7 ++++---
.../tobago/internal/renderkit/renderer/TabGroupRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/TextareaRenderer.java | 3 ++-
.../internal/renderkit/renderer/TobagoClientBehaviorRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/TreeLabelRenderer.java | 4 ----
.../tobago/internal/renderkit/renderer/TreeNodeRenderer.java | 3 ++-
.../myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/TreeSelectRenderer.java | 3 ++-
.../org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java | 3 ++-
.../apache/myfaces/tobago/internal/util/AuthorizationHelper.java | 3 ++-
.../java/org/apache/myfaces/tobago/internal/util/CookieUtils.java | 3 ++-
.../org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java | 3 ++-
.../java/org/apache/myfaces/tobago/internal/util/JsonUtils.java | 3 ++-
.../java/org/apache/myfaces/tobago/internal/util/PartUtils.java | 3 ++-
.../java/org/apache/myfaces/tobago/internal/util/RenderUtils.java | 3 ++-
.../org/apache/myfaces/tobago/internal/util/ResponseUtils.java | 3 ++-
.../org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java | 3 ++-
.../myfaces/tobago/internal/webapp/DebugContentTypeFilter.java | 3 ++-
.../myfaces/tobago/internal/webapp/DebugContentTypeResponse.java | 4 +++-
.../myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java | 3 ++-
.../apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java | 3 ++-
.../myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/layout/MarginTokens.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/layout/Measure.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java | 5 -----
.../org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/model/ScrollPosition.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/model/SheetState.java | 3 ++-
.../java/org/apache/myfaces/tobago/model/TreeNodeDataModel.java | 3 ++-
.../org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java | 3 ++-
.../java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java | 4 +++-
.../org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java | 3 ++-
.../java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java | 3 ++-
.../myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java | 3 ++-
.../org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java | 3 ++-
.../java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java | 3 ++-
.../org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java | 3 ++-
.../java/org/apache/myfaces/tobago/servlet/ResourceServlet.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/util/BeanComparator.java | 3 ++-
.../main/java/org/apache/myfaces/tobago/util/ComponentUtils.java | 3 ++-
.../java/org/apache/myfaces/tobago/util/DebugActionListener.java | 3 ++-
.../org/apache/myfaces/tobago/util/DebugNavigationHandler.java | 3 ++-
.../java/org/apache/myfaces/tobago/util/DebugPhaseListener.java | 3 ++-
.../org/apache/myfaces/tobago/util/ValueExpressionComparator.java | 3 ++-
.../myfaces/tobago/validator/ClearValidatorsActionListener.java | 3 ++-
.../org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java | 3 ++-
.../org/apache/myfaces/tobago/webapp/LogoutActionListener.java | 3 ++-
.../apache/myfaces/tobago/webapp/TobagoServletContextListener.java | 3 ++-
.../myfaces/tobago/internal/config/AbstractTobagoTestBase.java | 4 ----
.../main/java/org/apache/myfaces/tobago/example/blank/Hello.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/ApiController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/BehaviorController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/ButtonLinkController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/CollapsibleController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/ConversationController.java | 5 -----
.../apache/myfaces/tobago/example/demo/CurrentValueController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/DateController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/DemoController.java | 3 ++-
.../myfaces/tobago/example/demo/ExceptionHandlerController.java | 4 +++-
.../org/apache/myfaces/tobago/example/demo/ExecuteController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/FormController.java | 5 -----
.../org/apache/myfaces/tobago/example/demo/GroupController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/InController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/InputSuggestController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/LocaleController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/LoginController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/ManifestReader.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/NamedNode.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/NavigationNode.java | 4 ----
.../org/apache/myfaces/tobago/example/demo/NavigationState.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/NavigationTree.java | 3 ++-
.../src/main/java/org/apache/myfaces/tobago/example/demo/Node.java | 4 +++-
.../org/apache/myfaces/tobago/example/demo/OldLinksServlet.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/OnOffConverter.java | 3 ++-
.../myfaces/tobago/example/demo/PartialReloadController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/ProgressController.java | 5 -----
.../org/apache/myfaces/tobago/example/demo/ResizeController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/ServerInfo.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/SheetController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/SheetFilterController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/SheetSortingController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/SolarObject.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/SourceFileReader.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/SuggestController.java | 3 ++-
.../myfaces/tobago/example/demo/SuggestQuotMarkController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/TabController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/TestController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/ThemeController.java | 3 ++-
.../apache/myfaces/tobago/example/demo/TreeEditorController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/UploadController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/UploadItem.java | 5 -----
.../tobago/example/demo/bestpractice/BestPracticeController.java | 3 ++-
.../tobago/example/demo/bestpractice/TransitionController.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/info/ActivityList.java | 3 ++-
.../myfaces/tobago/example/demo/nonfacesrequest/FishPond.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java | 3 ++-
.../org/apache/myfaces/tobago/example/test/ScriptEventItem.java | 3 ++-
.../org/apache/myfaces/tobago/example/test/ScriptEventServlet.java | 3 ++-
.../apache/myfaces/tobago/example/test/SheetSortController.java | 3 ++-
.../java/org/apache/myfaces/tobago/example/test/WaitFilter.java | 3 ++-
.../myfaces/tobago/example/demo/qunit/AccessAllPagesTest.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/qunit/SeleniumBase.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java | 3 ++-
167 files changed, 308 insertions(+), 232 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
index c48c9e9..cfeb6e3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
@@ -22,6 +22,8 @@ package org.apache.myfaces.tobago.component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
+
/**
* Name constants of the attributes of the Tobago components.
*/
@@ -418,7 +420,7 @@ public enum Attributes {
/** This constants are needed for annotations, because they can't use the enums. */
public static final String EXECUTE = "execute";
- private static final Logger LOG = LoggerFactory.getLogger(Attributes.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final String explicit;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
index 7a987e8..326d614 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
@@ -42,6 +42,7 @@ import javax.faces.component.UISelectMany;
import javax.faces.component.UISelectOne;
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -50,7 +51,7 @@ import java.util.List;
public class Sorter {
- private static final Logger LOG = LoggerFactory.getLogger(Sorter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Comparator comparator;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
index 089b567..4b870df 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
@@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -56,7 +57,7 @@ import java.util.List;
*/
public final class Markup implements Serializable, Iterable<String> {
- private static final Logger LOG = LoggerFactory.getLogger(Markup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final Markup NULL = new Markup((String) null);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
index b39fe5e..696febb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -32,7 +33,7 @@ public class ThemeImpl implements Theme, Serializable {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = LoggerFactory.getLogger(ThemeImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String name;
private String displayName;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
index 8cb9e13..3ff648e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
@@ -32,6 +32,7 @@ import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -41,7 +42,7 @@ public class TobagoContext implements Serializable {
public static final String BEAN_NAME = "tobagoContext";
- private static final Logger LOG = LoggerFactory.getLogger(TobagoContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Theme theme;
private UserAgent userAgent;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java
index 67094f4..f2f6040 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java
@@ -38,11 +38,12 @@ import javax.faces.event.PreRenderViewEvent;
import javax.faces.view.ViewDeclarationLanguage;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
public class TobagoExceptionHandler extends ExceptionHandlerWrapper {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoExceptionHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ExceptionHandler wrapped;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
index 927d85e..81cf589 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
@@ -185,7 +186,7 @@ public final class UserAgent implements Serializable {
private static final long serialVersionUID = 2L;
- private static final Logger LOG = LoggerFactory.getLogger(UserAgent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final String name;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java
index 3137116..85f0573 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java
@@ -27,6 +27,7 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -46,7 +47,7 @@ import static org.apache.myfaces.tobago.convert.DateTimeConverter.CONVERTER_ID;
@org.apache.myfaces.tobago.apt.annotation.Converter(id = CONVERTER_ID)
public class DateTimeConverter extends javax.faces.convert.DateTimeConverter {
- private static final Logger LOG = LoggerFactory.getLogger(DateTimeConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String CONVERTER_ID = "org.apache.myfaces.tobago.DateTime";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
index dda774c..d46322a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
@@ -28,6 +28,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
+import java.lang.invoke.MethodHandles;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
@@ -37,7 +38,7 @@ import java.util.StringTokenizer;
@org.apache.myfaces.tobago.apt.annotation.Converter(id = DurationConverter.CONVERTER_ID)
public class DurationConverter implements Converter {
- private static final Logger LOG = LoggerFactory.getLogger(DurationConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String CONVERTER_ID = "org.apache.myfaces.tobago.Duration";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
index d5f4c7a..3f55c3e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
@@ -19,20 +19,21 @@
package org.apache.myfaces.tobago.convert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.Theme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
+import java.lang.invoke.MethodHandles;
@org.apache.myfaces.tobago.apt.annotation.Converter(forClass = "org.apache.myfaces.tobago.context.Theme")
public class ThemeConverter implements Converter {
- private static final Logger LOG = LoggerFactory.getLogger(ThemeConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String CONVERTER_ID = "org.apache.myfaces.tobago.Theme";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java
index eba0ae3..3db49d9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.Collection;
import java.util.Map;
@@ -30,7 +31,7 @@ import java.util.Set;
public class UserWrapper {
- private static final Logger LOG = LoggerFactory.getLogger(UserWrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Map roles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
index 3028eb0..5cd52b2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
@@ -31,10 +31,11 @@ import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
+import java.lang.invoke.MethodHandles;
public class CollapsibleActionListener implements ActionListener, StateHolder {
- private static final Logger LOG = LoggerFactory.getLogger(CollapsibleActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String forId;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
index 98fa2e2..a4c9ae8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
@@ -24,10 +24,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.ActionSource2;
import javax.faces.el.MethodBinding;
+import java.lang.invoke.MethodHandles;
public interface TobagoActionSource extends ActionSource2 {
- Logger LOG = LoggerFactory.getLogger(TobagoActionSource.class);
+ Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* @deprecated Replaced by ActionSource2.getActionExpression
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
index a9e9877..d12eb7f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
@@ -31,10 +31,11 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import java.lang.invoke.MethodHandles;
public class ValueExpressionResetInputActionListener extends AbstractResetInputActionListener implements StateHolder {
- private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionResetInputActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ValueExpression clientIdsExpression;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
index 939dcab..937457a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
@@ -26,10 +26,11 @@ import javax.el.ValueExpression;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
public class ValueExpressionSheetStateChangeListener implements SheetStateChangeListener, StateHolder {
- private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionSheetStateChangeListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String type;
private ValueExpression valueExpression;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
index ba0e929..33e96c6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
@@ -26,10 +26,11 @@ import javax.el.ValueExpression;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
public class ValueExpressionTabChangeListener implements TabChangeListener, StateHolder {
- private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionTabChangeListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String type;
private ValueExpression valueExpression;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
index 1efa65a..3b4319f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
@@ -50,10 +50,11 @@ import javax.faces.view.facelets.TagException;
import javax.faces.view.facelets.TagHandler;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
+import java.lang.invoke.MethodHandles;
public final class AttributeHandler extends TagHandler {
- private static final Logger LOG = LoggerFactory.getLogger(AttributeHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final TagAttribute name;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java
index c49ecc2..3012204 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java
@@ -35,12 +35,13 @@ import javax.faces.view.facelets.ConverterHandler;
import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagException;
+import java.lang.invoke.MethodHandles;
import java.util.Locale;
import java.util.TimeZone;
public class ConvertDateTimeHandler extends ConverterHandler {
- private static final Logger LOG = LoggerFactory.getLogger(ConvertDateTimeHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final TagAttribute binding;
private final TagAttribute locale;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
index e2684da..3319f5e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
@@ -30,12 +30,13 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
@WebFilter(urlPatterns = "/*")
public class FixCharacterEncodingFilter implements Filter {
- private static final Logger LOG = LoggerFactory.getLogger(FixCharacterEncodingFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(final FilterConfig filterConfig) throws ServletException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
index a8d07d5..34f19be 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
@@ -28,6 +28,7 @@ import javax.servlet.ServletContext;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
@@ -38,7 +39,7 @@ import java.net.URLStreamHandler;
*/
public final class Resource {
- private static final Logger LOG = LoggerFactory.getLogger(Resource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Resource() {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
index 5c07171..86579dc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
@@ -24,8 +24,6 @@ import org.apache.myfaces.tobago.component.SupportsAccessKey;
import org.apache.myfaces.tobago.component.UIEvent;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -39,8 +37,6 @@ import javax.faces.context.FacesContext;
public abstract class AbstractUICommand extends AbstractUICommandBase
implements SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUICommand.class);
-
enum PropertyKeys {
disabled,
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
index 4d4d0bc..5453e4a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
@@ -38,6 +38,7 @@ import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.swing.tree.TreeNode;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.List;
/**
@@ -45,7 +46,7 @@ import java.util.List;
*/
public abstract class AbstractUIData extends javax.faces.component.UIData implements Visual {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIData.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* @deprecated since 2.0.0. The marked concept has been replaced by "selected".
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java
index b26725b..6ccdfaf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIDate.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
/**
@@ -34,7 +35,7 @@ import java.util.Date;
*/
public abstract class AbstractUIDate extends AbstractUIInput {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIDate.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public String getPattern() {
final FacesContext facesContext = getFacesContext();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
index 108dbb4..798c7d3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
/**
@@ -35,7 +36,7 @@ import java.util.Iterator;
*/
public abstract class AbstractUIFormBase extends UIForm implements Visual {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIFormBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void processDecodes(final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
index 324f129..ab9ee39 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
@@ -39,6 +39,7 @@ import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.ComponentSystemEventListener;
import javax.faces.event.ListenerFor;
import javax.faces.event.PreRenderComponentEvent;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.Map;
@@ -54,7 +55,7 @@ import java.util.Map;
@ListenerFor(systemEventClass = PreRenderComponentEvent.class)
public abstract class AbstractUIGridLayout extends AbstractUILayoutBase implements ComponentSystemEventListener {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIGridLayout.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.GridLayout";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
index a6a1c75..d60b6be 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
@@ -28,6 +28,7 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
@@ -37,7 +38,7 @@ import java.util.Iterator;
*/
public abstract class AbstractUIPage extends AbstractUIFormBase implements ClientBehaviorHolder {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIPage.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Page";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
index 0dba23b..5db376d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
@@ -20,8 +20,6 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIOutput;
import javax.faces.component.behavior.ClientBehaviorHolder;
@@ -39,8 +37,6 @@ import javax.swing.BoundedRangeModel;
public abstract class AbstractUIProgress extends UIOutput
implements Visual, ComponentSystemEventListener, ClientBehaviorHolder {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIProgress.class);
-
private double rangeValue;
private double rangeMax;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
index 75882dc..12f253b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
@@ -20,8 +20,6 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import java.io.IOException;
@@ -31,8 +29,6 @@ import java.io.IOException;
*/
public abstract class AbstractUISection extends AbstractUICollapsiblePanel {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUISection.class);
-
public abstract String getLabel();
public abstract Integer getLevel();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
index ada1195..6795c48 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
@@ -27,13 +27,14 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UISelectItem;
import javax.faces.component.UISelectMany;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SelectItemTagDeclaration}
*/
public abstract class AbstractUISelectItem extends UISelectItem implements Visual {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUISelectItem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean itemValueLiteral;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
index fc0fc87..a2177e1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
@@ -55,6 +55,7 @@ import javax.faces.event.ListenerFor;
import javax.faces.event.PhaseId;
import javax.faces.event.PreRenderComponentEvent;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -67,7 +68,7 @@ public abstract class AbstractUISheet extends AbstractUIData
implements SheetStateChangeSource, SortActionSource, ClientBehaviorHolder, Visual,
ComponentSystemEventListener {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUISheet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Data";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java
index 0e3abdf..736dd7a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java
@@ -24,8 +24,6 @@ import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIInput;
import javax.faces.component.behavior.ClientBehaviorHolder;
@@ -40,8 +38,6 @@ import javax.swing.BoundedRangeModel;
public abstract class AbstractUIStars extends UIInput
implements SupportFieldId, SupportsLabelLayout, Visual, ClientBehaviorHolder {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIStars.class);
-
private int rangeValue;
private int rangeMax;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
index 0a3b526..8b980e8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
@@ -42,6 +42,7 @@ import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.ListenerFor;
import javax.faces.event.PostAddToViewEvent;
import javax.faces.event.PreRenderViewEvent;
+import java.lang.invoke.MethodHandles;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.StyleTagDeclaration}
@@ -51,7 +52,7 @@ import javax.faces.event.PreRenderViewEvent;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public abstract class AbstractUIStyle extends UIComponentBase {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUIStyle.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void processEvent(final ComponentSystemEvent event) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
index 8256406..5f2d59a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
@@ -28,6 +28,7 @@ import javax.el.ValueExpression;
import javax.faces.component.UIComponentBase;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SuggestTagDeclaration}
@@ -35,7 +36,7 @@ import javax.faces.context.FacesContext;
public abstract class AbstractUISuggest
extends UIComponentBase implements InputSuggest, ClientBehaviorHolder {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUISuggest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Suggest";
public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.Suggest";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index 353cb88..0252413 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -40,6 +40,7 @@ import javax.faces.event.ActionListener;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -49,7 +50,7 @@ import java.util.List;
public abstract class AbstractUITabGroup extends AbstractUIPanelBase
implements TabChangeSource, TobagoActionSource, ClientBehaviorHolder {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUITabGroup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void encodeChildren(final FacesContext facesContext) throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
index 3545444..7fffb4f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
@@ -29,6 +29,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
@@ -37,7 +38,7 @@ import java.util.List;
public class TobagoConfigBuilder {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String WEB_INF_TOBAGO_CONFIG_XML = "WEB-INF/tobago-config.xml";
private static final String META_INF_TOBAGO_CONFIG_XML = "META-INF/tobago-config.xml";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
index dbfe4d4..535ed1a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
@@ -27,6 +27,7 @@ import org.xml.sax.helpers.DefaultHandler;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
public class TobagoConfigEntityResolver extends DefaultHandler {
@@ -46,7 +47,7 @@ public class TobagoConfigEntityResolver extends DefaultHandler {
protected static final String TOBAGO_CONFIG_XSD_4_0 = "/org/apache/myfaces/tobago/config/tobago-config-4.0.xsd";
protected static final String TOBAGO_CONFIG_XSD_5_0 = "/org/apache/myfaces/tobago/config/tobago-config-5.0.xsd";
- private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigEntityResolver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public InputSource resolveEntity(final String publicId, final String systemId) throws IOException, SAXException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
index 960fcf3..064bb4c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
@@ -20,8 +20,6 @@
package org.apache.myfaces.tobago.internal.config;
import org.apache.myfaces.tobago.context.ThemeImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.net.URL;
import java.util.ArrayList;
@@ -32,8 +30,6 @@ import java.util.Properties;
public class TobagoConfigFragment {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigFragment.class);
-
private String name;
private List<String> before;
private List<String> after;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
index a6ca247..c850fae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
import javax.faces.application.Application;
import javax.faces.application.ProjectStage;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -48,7 +49,7 @@ import java.util.Set;
*/
public class TobagoConfigImpl extends TobagoConfig {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<Theme> supportedThemes;
private List<String> supportedThemeNames;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
index 3e387ad..7db2ccf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
@@ -40,6 +40,7 @@ import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
@@ -47,7 +48,7 @@ import java.util.Stack;
public class TobagoConfigParser extends TobagoConfigEntityResolver {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int TOBAGO_CONFIG = -1498874611;
private static final int NAME = 3373707;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
index fdb0ec7..b45e985 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
@@ -27,6 +27,7 @@ import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -35,7 +36,7 @@ import java.util.Properties;
public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigSorter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<TobagoConfigFragment> list;
private List<Pair> pairs;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
index 3ae814d..8d01fbe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.tobago.internal.context;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.HashMap;
@@ -30,7 +31,7 @@ import java.util.Map;
public class DateTimeI18n {
- private static final Logger LOG = LoggerFactory.getLogger(DateTimeI18n.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Map<Locale, DateTimeI18n> CACHE = new HashMap<>();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
index 0d97bfa..60e4d0a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
@@ -26,10 +26,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
public class Nonce implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(Nonce.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String KEY = Nonce.class.getName();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
index 87b5385..3f3337e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
@@ -24,6 +24,7 @@ import org.apache.myfaces.tobago.layout.MeasureList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +34,7 @@ import java.util.List;
@Deprecated
public class Grid {
- private static final Logger LOG = LoggerFactory.getLogger(Grid.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// TODO: check if it is faster with arrays.
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java
index 07cb7db..789784e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/Command.java
@@ -30,13 +30,14 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
/**
* @since 2.0.0
*/
public class Command {
- private static final Logger LOG = LoggerFactory.getLogger(Command.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* The action is only needed if the action is not the HTML element itself.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
index 560930a..c553a63 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
@@ -45,8 +45,6 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIParameter;
@@ -57,8 +55,6 @@ import java.util.List;
public abstract class CommandRendererBase extends DecodingCommandRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(CommandRendererBase.class);
-
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
index 172bce5..91809fd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
@@ -39,12 +39,13 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Date;
public class DateRenderer extends InRenderer {
- private static final Logger LOG = LoggerFactory.getLogger(DateRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void writeAdditionalAttributes(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java
index bed16f5..2c3716c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.internal.renderkit.renderer;
-import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.internal.util.RenderUtils;
+import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,10 +28,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import java.lang.invoke.MethodHandles;
public abstract class DecodingCommandRendererBase extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(DecodingCommandRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
index 203897c..8542a3f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
@@ -30,11 +30,12 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
public abstract class DecodingInputRendererBase extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(DecodingInputRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index 71c0973..085d25b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -51,13 +51,14 @@ import javax.faces.validator.Validator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public class FileRenderer extends MessageLayoutRendererBase implements ComponentSystemEventListener {
- private static final Logger LOG = LoggerFactory.getLogger(FileRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void processEvent(final ComponentSystemEvent event) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
index caf411b..f0653e7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
@@ -49,10 +49,11 @@ import javax.faces.validator.LengthValidator;
import javax.faces.validator.RegexValidator;
import javax.faces.validator.Validator;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class InRenderer extends MessageLayoutRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(InRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void encodeBeginField(final FacesContext facesContext, final UIComponent component)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
index 4d177f0..536abdf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
@@ -42,11 +42,12 @@ import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.List;
public class MessagesRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(MessagesRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
index 479c97c..16be451 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
@@ -69,6 +69,7 @@ import javax.portlet.ResourceURL;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -79,7 +80,7 @@ import java.util.Map;
//@ResourceDependency(name="jsf.js", library="javax.faces", target="head")
public class PageRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(PageRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String LAST_FOCUS_ID = "lastFocusId";
private static final String HEAD_TARGET = "head";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
index bdc65cf..b588097 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
@@ -37,8 +37,6 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -46,8 +44,6 @@ import java.io.IOException;
public class ProgressRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(ProgressRenderer.class);
-
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUIProgress progress = (AbstractUIProgress) component;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
index 6d60940..14ffed8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
@@ -42,10 +42,11 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class SelectBooleanCheckboxRenderer extends MessageLayoutRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SelectBooleanCheckboxRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
index 7f99f49..121c948 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
@@ -39,6 +39,7 @@ import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -56,7 +57,7 @@ import java.util.TreeSet;
public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SelectManyRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java
index 72057ca..f3ea928 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java
@@ -27,10 +27,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectOne;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
public abstract class SelectOneRendererBase extends MessageLayoutRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SelectOneRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetPageCommandRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetPageCommandRenderer.java
index bbc15b1..72c43e9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetPageCommandRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetPageCommandRenderer.java
@@ -19,11 +19,5 @@
package org.apache.myfaces.tobago.internal.renderkit.renderer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class SheetPageCommandRenderer extends LinkRenderer {
-
- private static final Logger LOG = LoggerFactory.getLogger(SheetPageCommandRenderer.class);
-
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
index 9c70f77..e541ab1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
@@ -85,6 +85,7 @@ import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -94,7 +95,7 @@ import java.util.Map;
public class SheetRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SheetRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SUFFIX_WIDTHS = ComponentUtils.SUB_SEPARATOR + "widths";
private static final String SUFFIX_COLUMN_RENDERED = ComponentUtils.SUB_SEPARATOR + "rendered";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
index 78b8df3..0659041 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.List;
/**
@@ -46,7 +47,7 @@ import java.util.List;
@Preliminary
public class SplitLayoutRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SplitLayoutRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java
index cc41a69..1bfa00f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java
@@ -30,15 +30,12 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
public class StarsRenderer extends MessageLayoutRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(StarsRenderer.class);
@Override
protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
index 1e6d4c7..6e20185 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
@@ -34,8 +34,6 @@ import org.apache.myfaces.tobago.renderkit.css.Styles;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -43,8 +41,6 @@ import java.io.IOException;
public class StyleRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(StyleRenderer.class);
-
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java
index 0fbce65..0f64930 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java
@@ -26,10 +26,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class SubviewRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SubviewRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
index 6af65d3..f81f368 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
@@ -21,6 +21,8 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
import org.apache.myfaces.tobago.internal.component.AbstractUISuggest;
+import org.apache.myfaces.tobago.internal.util.JsonUtils;
+import org.apache.myfaces.tobago.internal.util.SelectItemUtils;
import org.apache.myfaces.tobago.model.AutoSuggestItem;
import org.apache.myfaces.tobago.model.AutoSuggestItems;
import org.apache.myfaces.tobago.renderkit.RendererBase;
@@ -29,8 +31,6 @@ import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
-import org.apache.myfaces.tobago.internal.util.JsonUtils;
-import org.apache.myfaces.tobago.internal.util.SelectItemUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -41,6 +41,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -48,7 +49,7 @@ import java.util.Map;
public class SuggestRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SuggestRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
index 1b36788..5522338 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
@@ -61,6 +61,7 @@ import javax.faces.event.ComponentSystemEventListener;
import javax.faces.event.ListenerFor;
import javax.faces.event.PostAddToViewEvent;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -68,7 +69,7 @@ import java.util.Map;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public class TabGroupRenderer extends RendererBase implements ComponentSystemEventListener {
- private static final Logger LOG = LoggerFactory.getLogger(TabGroupRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String ACTIVE_INDEX_POSTFIX = ComponentUtils.SUB_SEPARATOR + "activeIndex";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
index 9450f96..62699e4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
@@ -46,10 +46,11 @@ import javax.faces.validator.LengthValidator;
import javax.faces.validator.RegexValidator;
import javax.faces.validator.Validator;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class TextareaRenderer extends MessageLayoutRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(TextareaRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void setSubmittedValue(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
index 5d7de1e..ff36e12 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
@@ -42,13 +42,14 @@ import javax.faces.component.behavior.ClientBehaviorContext;
import javax.faces.context.FacesContext;
import javax.faces.event.AjaxBehaviorEvent;
import javax.faces.event.PhaseId;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehaviorRenderer {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoClientBehaviorRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* In standard JSF this method returns a JavaScript string. Because of CSP, Tobago doesn't render JavaScript
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
index 0d829cc..52f03ad 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
@@ -30,8 +30,6 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -39,8 +37,6 @@ import java.io.IOException;
public class TreeLabelRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(TreeLabelRenderer.class);
-
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
index 71edec7..617337d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
@@ -45,11 +45,12 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UINamingContainer;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
public class TreeNodeRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(TreeNodeRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
index fe26224..3f096ba 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
@@ -45,10 +45,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class TreeRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(TreeRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final String SCROLL_POSITION = ComponentUtils.SUB_SEPARATOR + "scrollPosition";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
index 8eb88a9..e5bf9fc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
@@ -45,10 +45,11 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UINamingContainer;
import javax.faces.context.FacesContext;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class TreeSelectRenderer extends RendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(TreeSelectRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
index 0e9e574..f1db794 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,7 +34,7 @@ import java.util.Map;
*/
public final class AccessKeyLogger extends HashMap<Character, List<String>> {
- private static final Logger LOG = LoggerFactory.getLogger(AccessKeyLogger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final char[] KEYS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
index 48dcb6d..d6051bf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
@@ -31,6 +31,7 @@ import javax.faces.bean.ManagedBean;
import javax.faces.context.FacesContext;
import javax.naming.InitialContext;
import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -46,7 +47,7 @@ import java.util.regex.Pattern;
@javax.faces.bean.ApplicationScoped
public class AuthorizationHelper {
- private static final Logger LOG = LoggerFactory.getLogger(AuthorizationHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String AUTHORIZATION_HELPER = "authorizationHelper";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
index 15d4931..ec344f3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
@@ -25,10 +25,11 @@ import org.slf4j.LoggerFactory;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.lang.invoke.MethodHandles;
public class CookieUtils {
- private static final Logger LOG = LoggerFactory.getLogger(CookieUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String THEME_PARAMETER = "tobago.theme";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
index af7a6e2..06e5013 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
@@ -46,13 +46,14 @@ import javax.faces.context.ResponseWriter;
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Locale;
import java.util.Map;
public final class HtmlRendererUtils {
- private static final Logger LOG = LoggerFactory.getLogger(HtmlRendererUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String FOCUS_KEY = HtmlRendererUtils.class.getName() + ".FocusId";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java
index c2205df..2d2b010 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JsonUtils.java
@@ -30,6 +30,7 @@ import org.apache.myfaces.tobago.layout.MeasureList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -37,7 +38,7 @@ import java.util.StringTokenizer;
public class JsonUtils {
- private static final Logger LOG = LoggerFactory.getLogger(JsonUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private JsonUtils() {
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
index f30395d..7c187a9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import javax.servlet.http.Part;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Locale;
@@ -37,7 +38,7 @@ import java.util.Map;
*/
public final class PartUtils {
- private static final Logger LOG = LoggerFactory.getLogger(PartUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Method SUBMITTED_FILE_NAME_METHOD = findSubmittedFileNameMethod();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
index 3fbcf33..b67a8b2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
@@ -51,6 +51,7 @@ import javax.faces.context.FacesContext;
import javax.faces.render.ClientBehaviorRenderer;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.List;
@@ -59,7 +60,7 @@ import java.util.Objects;
public final class RenderUtils {
- private static final Logger LOG = LoggerFactory.getLogger(RenderUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private RenderUtils() {
// to prevent instantiation
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
index 78c4f26..75676db 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
@@ -30,11 +30,12 @@ import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import javax.portlet.MimeResponse;
import javax.servlet.http.HttpServletResponse;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
public final class ResponseUtils {
- private static final Logger LOG = LoggerFactory.getLogger(ResponseUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ResponseUtils() {
// utils class
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java
index 67650c7..2dbefbe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtils.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
/**
* PRELIMINARY: MAY BE INTEGRATED IN THE {@link TobagoResponseWriter}
@@ -31,7 +32,7 @@ import java.io.IOException;
*/
public class StyleRenderUtils {
- private static final Logger LOG = LoggerFactory.getLogger(StyleRenderUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private StyleRenderUtils() {
// to prevent instantiation
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
index 42d31fa..4a185d6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
@@ -30,9 +30,10 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class DebugContentTypeFilter implements Filter {
- private static final Logger LOG = LoggerFactory.getLogger(DebugContentTypeFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(final FilterConfig filterConfig) throws ServletException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
index 59dd9fd..3d85d0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
@@ -24,9 +24,11 @@ import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
+import java.lang.invoke.MethodHandles;
public class DebugContentTypeResponse extends HttpServletResponseWrapper {
- private static final Logger LOG = LoggerFactory.getLogger(DebugContentTypeResponse.class);
+
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public DebugContentTypeResponse(final HttpServletResponse response) {
super(response);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
index c953952..56806a6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
@@ -31,6 +31,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.EmptyStackException;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@ public class DebugResponseWriterWrapper extends TobagoResponseWriter {
private Stack<Object> stack = new Stack<>();
private Set<MarkupLanguageAttributes> usedAttributes = new HashSet<>();
- private static final Logger LOG = LoggerFactory.getLogger(DebugResponseWriterWrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final TobagoResponseWriter responseWriter;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
index 911e2ef..8b9aec5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
@@ -32,9 +32,10 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class LoggingMdcFilter implements Filter {
- private static final Logger LOG = LoggerFactory.getLogger(LoggingMdcFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(final FilterConfig filterConfig) throws ServletException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
index 12fbaf6..d24d0eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
@@ -29,13 +29,14 @@ import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import java.io.IOException;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.net.URI;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseWriterBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final String XML_VERSION_1_0_ENCODING_UTF_8 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java
index 0474467..a3fec08 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MarginTokens.java
@@ -22,13 +22,14 @@ package org.apache.myfaces.tobago.layout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
public class MarginTokens {
- private static final Logger LOG = LoggerFactory.getLogger(MarginTokens.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<Margin> margins = new ArrayList<>();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
index 0e0d192..9f24dc6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
/**
* In PDLs the class {@link org.apache.myfaces.tobago.layout.MeasureEditor} will convert the string literals.
@@ -32,7 +33,7 @@ public final class Measure implements Serializable {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = LoggerFactory.getLogger(Measure.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final Measure ZERO = valueOf(0);
public static final Measure AUTO = valueOf("auto");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
index 4181f72..6c2b8e9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
@@ -19,17 +19,12 @@
package org.apache.myfaces.tobago.layout;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* @deprecated since 4.1.0, please use {@link Measure}
*/
@Deprecated
public final class PixelMeasure /*extends Measure*/ {
- private static final Logger LOG = LoggerFactory.getLogger(PixelMeasure.class);
-
static final PixelMeasure[] PIXEL_CACHE;
static final int PIXEL_CACHE_MAX = 4000;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java
index 175c088..4c8e42e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java
@@ -28,10 +28,11 @@ import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
+import java.lang.invoke.MethodHandles;
public class SecretPhaseListener implements PhaseListener {
- private static final Logger LOG = LoggerFactory.getLogger(SecretPhaseListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void afterPhase(final PhaseEvent event) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
index fe95c33..d48104e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
@@ -24,10 +24,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
public class ScrollPosition implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ScrollPosition.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Integer left;
private Integer top;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
index be8fd38..3d72876 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
@@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +33,7 @@ public class SheetState implements Serializable, ScrollPositionState {
private static final long serialVersionUID = 2L;
- private static final Logger LOG = LoggerFactory.getLogger(SheetState.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SEPARATOR = ",";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeNodeDataModel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeNodeDataModel.java
index 09880b5..f70ca42 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeNodeDataModel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeNodeDataModel.java
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -36,7 +37,7 @@ import java.util.Stack;
*/
public class TreeNodeDataModel extends TreeDataModel {
- private static final Logger LOG = LoggerFactory.getLogger(TreeNodeDataModel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private TreeNode data;
private int rowIndex = -1;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
index c10dfe7..18a7a68 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
@@ -26,11 +26,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
+import java.lang.invoke.MethodHandles;
import java.util.Locale;
public final class LabelWithAccessKey {
- private static final Logger LOG = LoggerFactory.getLogger(LabelWithAccessKey.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final String label;
private final Character accessKey;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
index 7ce4862..46354eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
@@ -38,6 +38,7 @@ import javax.faces.render.Renderer;
import javax.faces.render.ResponseStateManager;
import java.io.OutputStream;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Iterator;
@@ -45,7 +46,8 @@ import java.util.Map;
public class TobagoRenderKit extends RenderKit {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoRenderKit.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private static final String CONTENT_TYPE_TEXT_HTML = "text/html";
private static final String CONTENT_TYPE_TEXT_XML = "text/xml";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
index c272548..bd1b208 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -494,7 +495,7 @@ public enum BootstrapClass implements CssItem {
TABLE_SM("table-sm"),
TABLE_STRIPED("table-striped");
- private static final Logger LOG = LoggerFactory.getLogger(BootstrapClass.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int SEVERITY_ERROR = FacesMessage.SEVERITY_ERROR.getOrdinal();
private static final int SEVERITY_WARN = FacesMessage.SEVERITY_WARN.getOrdinal();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
index a5d60cb..6ca88d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import javax.el.ELContext;
import javax.el.ValueExpression;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,7 +35,7 @@ import java.util.regex.Pattern;
*/
public class CustomClass implements CssItem {
- private static final Logger LOG = LoggerFactory.getLogger(CustomClass.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Pattern CSS_CLASS_PATTERN = Pattern.compile("[\\w-]+");
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
index 265c071..2b57a0a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
@@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.EnumMap;
import java.util.regex.Pattern;
@@ -34,7 +35,7 @@ import java.util.regex.Pattern;
@Deprecated
public class FontAwesomeIconEncoder implements IconEncoder {
- private static final Logger LOG = LoggerFactory.getLogger(FontAwesomeIconEncoder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* @deprecated 4.0.0. User {@link Icons#FA }
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java
index 0c0da76..19df9e0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.tobago.renderkit.css;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.regex.Pattern;
/**
@@ -49,7 +50,7 @@ public enum Icons implements CssItem {
STEP_BACKWARD,
STEP_FORWARD;
- private static final Logger LOG = LoggerFactory.getLogger(Icons.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final CssItem FA = new CssItem() {
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java
index 3359ee2..c8f193e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/IgnoringSanitizer.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.tobago.sanitizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Properties;
/**
@@ -29,7 +30,7 @@ import java.util.Properties;
*/
public class IgnoringSanitizer implements Sanitizer {
- private static final Logger LOG = LoggerFactory.getLogger(IgnoringSanitizer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public String sanitize(final String html) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
index 4575c13..a1d24d7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/sanitizer/JsoupSanitizer.java
@@ -25,6 +25,7 @@ import org.jsoup.safety.Whitelist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Properties;
/**
@@ -32,7 +33,7 @@ import java.util.Properties;
*/
public class JsoupSanitizer implements Sanitizer {
- private static final Logger LOG = LoggerFactory.getLogger(JsoupSanitizer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Whitelist whitelist;
private String whitelistName;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
index 6c7b40c..0b856d6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
/**
* @deprecated since Tobago 2.0.8 - Please use <f:initParam> instead - see also TOBAGO-1456
@@ -44,7 +45,7 @@ public abstract class NonFacesRequestServlet extends HttpServlet {
private static final long serialVersionUID = -7448621953821447997L;
- private static final Logger LOG = LoggerFactory.getLogger(NonFacesRequestServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void service(final HttpServletRequest request, final HttpServletResponse response)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
index 3bf6543..9800fde 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.invoke.MethodHandles;
/**
* <pre>
@@ -67,7 +68,7 @@ public class ResourceServlet extends HttpServlet {
private static final long serialVersionUID = -4491419290205206466L;
- private static final Logger LOG = LoggerFactory.getLogger(ResourceServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Long expires;
private int bufferSize;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
index 5998a8f..2791b54 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
@@ -24,13 +24,14 @@ import org.slf4j.LoggerFactory;
import java.beans.PropertyDescriptor;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Comparator;
public class BeanComparator extends ComparatorBase implements Serializable {
private static final long serialVersionUID = -7450094725566090886L;
- private static final Logger LOG = LoggerFactory.getLogger(BeanComparator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String property;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
index 16d174f..bc45edd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
@@ -57,6 +57,7 @@ import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
import javax.faces.render.Renderer;
import javax.faces.view.facelets.FaceletContext;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -66,7 +67,7 @@ import java.util.Map;
public final class ComponentUtils {
- private static final Logger LOG = LoggerFactory.getLogger(ComponentUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SUB_SEPARATOR = "::";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
index 12c945a0..c0a4482 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
@@ -25,10 +25,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.event.ActionListener;
import javax.faces.event.ActionEvent;
import javax.faces.event.AbortProcessingException;
+import java.lang.invoke.MethodHandles;
public class DebugActionListener implements ActionListener {
- private static final Logger LOG = LoggerFactory.getLogger(DebugActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final ActionListener actionListener;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
index 92a485f..d8e4a00 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
@@ -24,10 +24,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
public class DebugNavigationHandler extends NavigationHandler {
- private static final Logger LOG = LoggerFactory.getLogger(DebugNavigationHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private NavigationHandler navigationHandler;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
index 6334857..464fa90 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
@@ -31,13 +31,14 @@ import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.lang.invoke.MethodHandles;
import java.text.MessageFormat;
import java.util.Iterator;
import java.util.Map;
public class DebugPhaseListener implements PhaseListener {
- private static final Logger LOG = LoggerFactory.getLogger(DebugPhaseListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String KEY = DebugPhaseListener.class.getName() + "_ID_";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
index 3ca90fc..e7016db 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
@@ -24,12 +24,13 @@ import org.slf4j.LoggerFactory;
import javax.el.ValueExpression;
import javax.faces.context.FacesContext;
+import java.lang.invoke.MethodHandles;
import java.util.Comparator;
import java.util.Map;
public class ValueExpressionComparator extends ComparatorBase {
- private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionComparator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private FacesContext facesContext;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
index 553e2c8..c22e201 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
@@ -29,11 +29,12 @@ import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
import javax.faces.event.PhaseId;
+import java.lang.invoke.MethodHandles;
import java.util.StringTokenizer;
public class ClearValidatorsActionListener implements ActionListener {
- private static final Logger LOG = LoggerFactory.getLogger(ClearValidatorsActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public PhaseId getPhaseId() {
return PhaseId.APPLY_REQUEST_VALUES;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java
index 51c4098..bf6f2fb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/AjaxExceptionHandler.java
@@ -37,11 +37,12 @@ import javax.faces.view.ViewDeclarationLanguage;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
public class AjaxExceptionHandler extends ExceptionHandlerWrapper {
- private static final Logger LOG = LoggerFactory.getLogger(AjaxExceptionHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private ExceptionHandler wrapped;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
index 15a2401..e155c59 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
@@ -32,10 +32,11 @@ import javax.faces.event.ActionListener;
import javax.portlet.PortletSession;
import javax.servlet.http.HttpSession;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class LogoutActionListener implements ActionListener {
- private static final Logger LOG = LoggerFactory.getLogger(LogoutActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void processAction(final ActionEvent event) throws AbortProcessingException {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
index ef134e2..46c9a7b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
@@ -29,10 +29,11 @@ import org.slf4j.LoggerFactory;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import java.lang.invoke.MethodHandles;
public class TobagoServletContextListener implements ServletContextListener {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoServletContextListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void contextInitialized(final ServletContextEvent event) {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
index 6f303e1..b3499db 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
@@ -38,8 +38,6 @@ import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
import org.junit.After;
import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.StringWriter;
@@ -61,8 +59,6 @@ import static org.apache.myfaces.tobago.util.ResourceUtils.TOBAGO_RESOURCE_BUNDL
public abstract class AbstractTobagoTestBase extends AbstractJsfTestCase {
- private static final Logger LOG = LoggerFactory.getLogger(AbstractTobagoTestBase.class);
-
private StringWriter stringWriter;
private int last = 0;
diff --git a/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java b/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
index b39b571..7fbfb3a 100644
--- a/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
+++ b/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
@@ -24,12 +24,13 @@ import org.slf4j.LoggerFactory;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
+import java.lang.invoke.MethodHandles;
@ManagedBean
@RequestScoped
public class Hello {
- private static final Logger LOG = LoggerFactory.getLogger(Hello.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String name;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
index 508d136..df34b11 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
@@ -26,6 +26,7 @@ import javax.enterprise.context.RequestScoped;
import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -34,7 +35,7 @@ import java.util.List;
@Named
public class ApiController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ApiController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<Release> releases;
private boolean onlyCurrent = true;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
index 3b906df..f581886 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
@@ -27,12 +27,13 @@ import javax.faces.event.ActionEvent;
import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
@SessionScoped
@Named
public class BehaviorController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(BehaviorController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String ajax;
private String event;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
index f2c2389..4e65570 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
@@ -24,11 +24,12 @@ import org.slf4j.LoggerFactory;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
@Named
public class ButtonLinkController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ButtonLinkController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public Outcome linkToComponentsRoot() {
LOG.info("link to components root");
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
index 5f77718..0b0634a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
@@ -26,12 +26,13 @@ import javax.enterprise.context.SessionScoped;
import javax.faces.context.FacesContext;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
@SessionScoped
@Named
public class CollapsibleController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(CollapsibleController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean collapsed = true;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
index 691a598..b904d35 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
@@ -32,8 +29,6 @@ import java.io.Serializable;
@Named
public class ConversationController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ConversationController.class);
-
@Inject
private Conversation conversation;
private int count = 0;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
index 42106d0..1afbd75 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Named;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -33,7 +34,7 @@ import java.util.GregorianCalendar;
@Named
public class CurrentValueController {
- private static final Logger LOG = LoggerFactory.getLogger(CurrentValueController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String string;
private Date date;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
index d1755f2..f29f808 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -33,7 +34,7 @@ import java.util.Date;
@Named
public class DateController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(DateController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Date once;
private Date onchange;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java
index a8eb3cd..6a3cb7b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DemoController.java
@@ -32,6 +32,7 @@ import javax.faces.event.ActionEvent;
import javax.faces.validator.ValidatorException;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Currency;
import java.util.Date;
@@ -40,7 +41,7 @@ import java.util.Date;
@Named(value = "demoController")
public class DemoController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(DemoController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Selectable[] TREE_SELECT_MODE_KEYS = {
Selectable.none,
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
index 8440369..23194f1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
@@ -29,13 +29,15 @@ import javax.faces.event.AjaxBehaviorEvent;
import javax.faces.event.ComponentSystemEvent;
import javax.inject.Inject;
import javax.inject.Named;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.stream.Collectors;
@RequestScoped
@Named
public class ExceptionHandlerController {
- private static final Logger LOG = LoggerFactory.getLogger(ExceptionHandlerController.class);
+
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String value;
private List<SolarObject> solarList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
index 7cccca1..afde4ef 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
@@ -25,12 +25,13 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
@Named
@SessionScoped
public class ExecuteController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ExecuteController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String value1;
private String value2;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
index 0c92c1a..ecdab98 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
@@ -30,8 +27,6 @@ import java.io.Serializable;
@Named
public class FormController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(FormController.class);
-
private String value1;
private String value2;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
index 75a390b..b710c69 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
@@ -27,13 +27,14 @@ import javax.enterprise.context.SessionScoped;
import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Currency;
@SessionScoped
@Named
public class GroupController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(GroupController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String chatlog;
private String newMessage;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
index 5c93943..bb96589 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
@@ -25,12 +25,13 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.RequestScoped;
import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Named;
+import java.lang.invoke.MethodHandles;
@RequestScoped
@Named
public class InController {
- private static final Logger LOG = LoggerFactory.getLogger(InController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String changeValue;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
index cdeb5e7..0d067cc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
@@ -31,6 +31,7 @@ import javax.faces.component.UIInput;
import javax.faces.model.SelectItem;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +39,7 @@ import java.util.List;
@Named
public class InputSuggestController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(InputSuggestController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String simpleValue;
private String zipValue;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java
index fd7f632..489c22f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java
@@ -27,12 +27,13 @@ import javax.faces.context.FacesContext;
import javax.inject.Named;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import java.lang.invoke.MethodHandles;
@RequestScoped
@Named(value = "jsr303")
public class Jsr303Bean {
- private static final Logger LOG = LoggerFactory.getLogger(Jsr303Bean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@NotNull
private String required;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
index 6c5e67f..4e4813d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
@@ -35,6 +35,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.ServletContext;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -46,7 +47,7 @@ import java.util.Locale;
@SessionScoped
public class LocaleController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(LocaleController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Locale locale;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java
index 426dd6c..95b8242 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java
@@ -30,12 +30,13 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
@Named
@RequestScoped
public class LoginController {
- private static final Logger LOG = LoggerFactory.getLogger(LoginController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String username;
private String password;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
index 3794842..3e1cbfe 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Named;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.text.DateFormat;
import java.text.ParseException;
@@ -41,7 +42,7 @@ import java.util.jar.Manifest;
@Named
public class ManifestReader {
- private static final Logger LOG = LoggerFactory.getLogger(ManifestReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final ManifestEntry manifestTree;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java
index 5cacaf8..75d7137 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java
@@ -24,10 +24,11 @@ import org.slf4j.LoggerFactory;
import javax.faces.event.ActionEvent;
import javax.swing.tree.DefaultMutableTreeNode;
+import java.lang.invoke.MethodHandles;
public class NamedNode extends DefaultMutableTreeNode {
- private static final Logger LOG = LoggerFactory.getLogger(NamedNode.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String name;
private String action;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
index 104e2c5..d79dd99 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationNode.java
@@ -21,8 +21,6 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.model.TreePath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.swing.tree.DefaultMutableTreeNode;
import java.util.regex.Matcher;
@@ -30,8 +28,6 @@ import java.util.regex.Pattern;
public class NavigationNode extends DefaultMutableTreeNode implements Comparable {
- private static final Logger LOG = LoggerFactory.getLogger(NavigationNode.class);
-
private final String name;
private final String label;
private final String branch;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
index 9320c49..02d6213 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
@@ -33,12 +33,13 @@ import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
@WindowScoped
@Named
public class NavigationState implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(NavigationState.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Inject
private NavigationTree tree;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
index dfbfbd6..814d634 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
@@ -34,6 +34,7 @@ import javax.servlet.ServletContext;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
@@ -47,7 +48,7 @@ import java.util.Set;
@Named
public class NavigationTree implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(NavigationTree.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private NavigationNode root;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
index a1b2cbe..9c61ad8 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
@@ -24,9 +24,11 @@ import org.apache.myfaces.tobago.event.TreeExpansionEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
+
public class Node {
- private static final Logger LOG = LoggerFactory.getLogger(Node.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String name;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java
index d82f5ec..ed1cde7 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OldLinksServlet.java
@@ -28,10 +28,11 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class OldLinksServlet extends HttpServlet {
- private static final Logger LOG = LoggerFactory.getLogger(OldLinksServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void doPost(final HttpServletRequest request,
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java
index e2a7f31..e02b274 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java
@@ -26,10 +26,11 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
+import java.lang.invoke.MethodHandles;
public class OnOffConverter implements Converter {
- private static final Logger LOG = LoggerFactory.getLogger(OnOffConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public Object getAsObject(final FacesContext context, final UIComponent component, final String value)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
index cf19e1c..201a58c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
@@ -30,13 +30,14 @@ import javax.faces.context.FacesContext;
import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Inject;
import javax.inject.Named;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
@RequestScoped
@Named
public class PartialReloadController {
- private static final Logger LOG = LoggerFactory.getLogger(PartialReloadController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String navigateActionValue;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
index 4de100b..ae708a7 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.enterprise.context.SessionScoped;
import javax.faces.event.FacesEvent;
import javax.inject.Named;
@@ -34,8 +31,6 @@ import java.util.Date;
@Named
public class ProgressController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ProgressController.class);
-
private DefaultBoundedRangeModel progress = new DefaultBoundedRangeModel(3, 0, 0, 5);
public DefaultBoundedRangeModel getProgress() {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java
index bb06424..fa547c3 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java
@@ -23,11 +23,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.enterprise.inject.Model;
+import java.lang.invoke.MethodHandles;
@Model
public class ResizeController {
- private static final Logger LOG = LoggerFactory.getLogger(ResizeController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public String resize() {
LOG.info("Method resize() was called!");
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
index 3e0a919..d17615c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
@@ -29,6 +29,7 @@ import javax.inject.Named;
import javax.servlet.ServletContext;
import java.io.FileInputStream;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -45,7 +46,7 @@ import java.util.Properties;
@Named
public class ServerInfo {
- private static final Logger LOG = LoggerFactory.getLogger(ServerInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String CONFIG_FILE = "org.apache.myfaces.tobago.example.demo.config.file";
private static final String CONFIG_FILE_DEFAULT = "/etc/tobago-example-demo.properties";
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
index 5bff77c..25a9758 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
@@ -37,6 +37,7 @@ import javax.faces.event.FacesEvent;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -48,7 +49,7 @@ import java.util.stream.Collectors;
@Named
public class SheetController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SheetController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final SelectItem[] SHEET_SELECTABLE;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
index 8472d34..62429de 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
@@ -34,6 +34,7 @@ import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
@Named
public class SheetFilterController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SheetFilterController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Inject
private AstroData astroData;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
index c9d137d..3e2a9f8 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
@@ -30,6 +30,7 @@ import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -38,7 +39,7 @@ import java.util.List;
@Named
public class SheetSortingController extends SheetController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SheetSortingController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public void sheetSorter(final ActionEvent event) {
if (event instanceof SortActionEvent) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java
index 5701f53..f1bb4fe 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java
@@ -24,13 +24,14 @@ import org.slf4j.LoggerFactory;
import javax.faces.event.AjaxBehaviorEvent;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
public class SolarObject implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SolarObject.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String name;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
index 259c02a..5f1527f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
@@ -27,11 +27,12 @@ import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
public abstract class SourceFileReader {
- private static final Logger LOG = LoggerFactory.getLogger(SourceFileReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public String getSource(final String filename) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
index 7329330..4ebf896 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
@@ -29,6 +29,7 @@ import javax.faces.component.UIInput;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -37,7 +38,7 @@ import java.util.stream.Collectors;
@Named
public class SuggestController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SuggestController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<String> solarObjects;
private String query;
private String selection1;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java
index 95638d2..590c1bc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -33,7 +34,7 @@ import java.util.stream.Collectors;
@SessionScoped
@Named
public class SuggestQuotMarkController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SuggestController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<String> suggestions = new ArrayList<>(8);
private String query;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
index d81efac..3148168 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
@@ -27,12 +27,13 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
@SessionScoped
@Named
public class TabController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(TabController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String open = "/image/feather-open.png";
private String close = "/image/feather-closed.png";
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
index 496f441..14d9d32 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
@@ -29,6 +29,7 @@ import javax.inject.Named;
import java.io.File;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -39,7 +40,7 @@ import java.util.List;
@Named
public class TestController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(TestController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public boolean hasTest() {
final ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
index 639c982..8ea5e3e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
@@ -32,6 +32,7 @@ import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +40,7 @@ import java.util.List;
@Named
public class ThemeController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ThemeController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Theme theme;
private SelectItem[] themeItems;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
index f822251..2990853 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
@@ -28,13 +28,14 @@ import javax.faces.context.FacesContext;
import javax.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.Enumeration;
@SessionScoped
@Named
public class TreeEditorController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(TreeEditorController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private DefaultMutableTreeNode categoryTree;
private String name;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
index 5372bb5..9f48ad9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
@@ -30,6 +30,7 @@ import javax.faces.event.AjaxBehaviorEvent;
import javax.inject.Named;
import javax.servlet.http.Part;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -37,7 +38,7 @@ import java.util.List;
@Named
public class UploadController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(UploadController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Part fileBasic;
private Part fileContentType;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadItem.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadItem.java
index 56b455e..f8fa1dc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadItem.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadItem.java
@@ -19,15 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.Serializable;
public class UploadItem implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(UploadItem.class);
-
private String name;
private long size;
private String type;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
index 53b7361..3000e9a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
@@ -30,12 +30,13 @@ import javax.inject.Named;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
@RequestScoped
@Named
public class BestPracticeController {
- private static final Logger LOG = LoggerFactory.getLogger(BestPracticeController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String status;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
index 80b98f9..42c227f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
@@ -24,12 +24,13 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
+import java.lang.invoke.MethodHandles;
@RequestScoped
@Named
public class TransitionController {
- private static final Logger LOG = LoggerFactory.getLogger(TransitionController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public String sleep5sAndRedirect() throws InterruptedException {
final int sleep = 5000;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
index dfe28b2..f0e0063 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -34,7 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
@ApplicationScoped
public class ActivityList implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(ActivityList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// XXX using the session id as key is not good for applications with login, because the container should change
// XXX the session id while the login process.
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
index fcb4538..91c75fe 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
@@ -33,7 +34,7 @@ import java.util.Random;
@Named
public class FishPond implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(FishPond.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Map<Integer, String> fishes;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java
index cda2443..45d28f9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/sudoku/Sudoku.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.tobago.example.demo.sudoku;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
@@ -35,7 +36,7 @@ import java.util.Stack;
*/
public class Sudoku {
- private static final Logger LOG = LoggerFactory.getLogger(Sudoku.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Random RANDOM = new Random(System.currentTimeMillis());
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java
index 18a6333..d4fd8b8 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java
@@ -22,11 +22,12 @@ package org.apache.myfaces.tobago.example.test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
public class ScriptEventItem {
- private static final Logger LOG = LoggerFactory.getLogger(ScriptEventItem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String name;
private Date time;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java
index b575385..1441fff 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java
@@ -28,10 +28,11 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
public class ScriptEventServlet extends HttpServlet {
- private static final Logger LOG = LoggerFactory.getLogger(ScriptEventServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
index dc500b6..59ec5d9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -37,7 +38,7 @@ import java.util.TimeZone;
@Named
public class SheetSortController implements Serializable {
- private static final Logger LOG = LoggerFactory.getLogger(SheetSortController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private List<Entry> list;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java
index b9353b5..9962e97 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java
@@ -29,13 +29,14 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
/**
* This filter waits for 10 seconds to emulate network or application problems.
*/
public class WaitFilter implements Filter {
- private static final Logger LOG = LoggerFactory.getLogger(WaitFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(final FilterConfig filterConfig) throws ServletException {
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/AccessAllPagesTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/AccessAllPagesTest.java
index 1e0e15d..877ce20 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/AccessAllPagesTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/AccessAllPagesTest.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -43,7 +44,7 @@ import java.util.stream.Stream;
class AccessAllPagesTest extends SeleniumBase {
- private static final Logger LOG = LoggerFactory.getLogger(AccessAllPagesTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Verify qunit test for "no exception".
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/SeleniumBase.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/SeleniumBase.java
index ae7ea7a..d025d93 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/SeleniumBase.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/SeleniumBase.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.MalformedURLException;
@@ -58,7 +59,7 @@ import java.util.stream.Stream;
abstract class SeleniumBase {
- private static final Logger LOG = LoggerFactory.getLogger(SeleniumBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static WebDriver chromeDriver;
private static List<String> serverUrls = new ArrayList<>();
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java
index e1a7561..b174f0a 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.time.LocalTime;
@@ -36,7 +37,7 @@ import java.util.stream.Stream;
class StandardTest extends SeleniumBase {
- private static final Logger LOG = LoggerFactory.getLogger(StandardTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* To test only a singe page, just change browser setup, 'portContextPath' and/or 'path'.
[myfaces-tobago] 02/02: cleanup
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit db449d1e3a5b2c30d0fdb7f4b0a9b04b8441f81d
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Jan 2 14:20:07 2019 +0100
cleanup
---
.../myfaces/tobago/internal/util/JndiUtils.java | 78 ----------------------
.../apache/myfaces/tobago/layout/PixelMeasure.java | 77 ---------------------
2 files changed, 155 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
deleted file mode 100644
index ed83473..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
+++ /dev/null
@@ -1,78 +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 org.apache.myfaces.tobago.internal.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-public final class JndiUtils {
-
- private static final Logger LOG = LoggerFactory.getLogger(JndiUtils.class);
-
- private JndiUtils() {
- }
-
- public static Object getJndiProperty(final Context ctx, final String... path) throws NamingException {
- return getJndiProperty(ctx, null, path);
- }
-
- public static Object getJndiProperty(final Context ctx, final Object defaultValue, final String... path)
- throws NamingException {
- String name = "java:comp/env";
- // avoid error messages from websphere
- for (int i = 0; i < path.length; i++) {
- final Binding b = getBinding(ctx, name, path[i]);
- if (b == null) {
- break;
- }
- if (i == path.length - 1) {
- final Object obj = b.getObject();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Value: " + obj);
- }
- return obj;
- } else {
- name = name + "/" + path[i];
- }
- }
- return defaultValue;
- }
-
- private static Binding getBinding(final Context ctx, final String name, final String path)
- throws NamingException {
- final NamingEnumeration<Binding> ne = ctx.listBindings(name);
- while (ne.hasMore()) {
- final Binding b = ne.next();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Property: " + b.getName());
- }
- if (path.equals(b.getName())) {
- return b;
- }
- }
- return null;
- }
-
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
deleted file mode 100644
index 6c2b8e9..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
+++ /dev/null
@@ -1,77 +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 org.apache.myfaces.tobago.layout;
-
-/**
- * @deprecated since 4.1.0, please use {@link Measure}
- */
-@Deprecated
-public final class PixelMeasure /*extends Measure*/ {
-
- static final PixelMeasure[] PIXEL_CACHE;
- static final int PIXEL_CACHE_MAX = 4000;
-
- static {
- PIXEL_CACHE = new PixelMeasure[PIXEL_CACHE_MAX + 1];
- for (int i = 0; i < PIXEL_CACHE.length; i++) {
- PIXEL_CACHE[i] = new PixelMeasure(i);
- }
- }
-
- private final int pixel;
-
- private PixelMeasure(final int pixel) {
- this.pixel = pixel;
- }
-
- static PixelMeasure pixelValueOf(final int value) {
- if (value >= 0 && value <= PixelMeasure.PIXEL_CACHE_MAX) {
- return PixelMeasure.PIXEL_CACHE[value];
- }
- return new PixelMeasure(value);
- }
-
- public int getPixel() {
- return pixel;
- }
-
- @Override
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- final PixelMeasure that = (PixelMeasure) o;
-
- if (pixel != that.pixel) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return pixel;
- }
-}