You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/05/01 13:30:06 UTC
svn commit: r939978 [1/5] - in /myfaces/tobago/trunk: ./ core/
core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/
core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/
core/src/main/java/org/apache/myfaces...
Author: bommel
Date: Sat May 1 11:30:00 2010
New Revision: 939978
URL: http://svn.apache.org/viewvc?rev=939978&view=rev
Log:
(TOBAGO-576) Replace commons-logging with slf4j
Added:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java (contents, props changed)
- copied, changed from r939938, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java
Removed:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java
Modified:
myfaces/tobago/trunk/core/pom.xml
myfaces/tobago/trunk/core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java
myfaces/tobago/trunk/core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIForm.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UICommandBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/FactorList.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/IntervalList.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoBodyTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoMultipartFormdataRequest.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/Wizard.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
myfaces/tobago/trunk/example/addressbook/lib/pom.xml
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressConverter.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java
myfaces/tobago/trunk/example/addressbook/war/pom.xml
myfaces/tobago/trunk/example/addressbook/war/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
myfaces/tobago/trunk/example/addressbook/war/src/main/resources/log4j.xml
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/InputSuggestController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/OnOffConverter.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/SimpleBeanList.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/TreeCommandController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Upload.java
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SimpleTabChangeListener.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java
myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java
myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java
myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java
myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
myfaces/tobago/trunk/example/seam/src/main/java/org/apache/myfaces/tobago/example/seam/Issue.java
myfaces/tobago/trunk/example/test/pom.xml
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/FilterController.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java
myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
myfaces/tobago/trunk/extension/facelets/pom.xml
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/trunk/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java
myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/component/AbstractUIEquationGridLayout.java
myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/ReferenceToVariable.java
myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SubsetOfReferencesToVariables.java
myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java
myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java
myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java
myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java
myfaces/tobago/trunk/extension/message-fix/pom.xml
myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java
myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationFactoryImpl.java
myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationImpl.java
myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodBinding.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/sandbox/pom.xml
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FopConverter.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/theme/scarborough/pom.xml
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java
myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/ValueBindingComparator.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/compat/FacesUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java
myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/PrintAnnotationVisitor.java
Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Sat May 1 11:30:00 2010
@@ -335,8 +335,13 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
Modified: myfaces/tobago/trunk/core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
@@ -36,7 +36,7 @@ import javax.servlet.jsp.tagext.BodyTagS
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.WizardExtensionTag")
public class WizardExtensionTag extends BodyTagSupport {
- private static final Log LOG = LogFactory.getLog(WizardExtensionTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WizardExtensionTag.class);
private String controller;
Modified: myfaces/tobago/trunk/core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/WizardExtensionTag.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
@@ -38,7 +38,7 @@ import javax.servlet.jsp.tagext.BodyTagS
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.WizardExtensionTag")
public class WizardExtensionTag extends BodyTagSupport {
- private static final Log LOG = LogFactory.getLog(WizardExtensionTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WizardExtensionTag.class);
private ValueExpression controller;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.ajax;
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
import javax.faces.component.UIComponent;
@@ -28,7 +28,7 @@ import java.util.Map;
public class AjaxUtils {
- private static final Log LOG = LogFactory.getLog(AjaxUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AjaxUtils.class);
public static boolean isAjaxRequest(FacesContext facesContext) {
return facesContext.getExternalContext().getRequestMap().containsKey(AjaxInternalUtils.AJAX_COMPONENTS);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.compon
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.event.SortActionEvent;
import org.apache.myfaces.tobago.internal.component.AbstractUISheet;
@@ -50,13 +50,13 @@ import java.util.List;
*/
public class Sorter {
- private static final Log LOG = LogFactory.getLog(Sorter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Sorter.class);
private Comparator comparator;
public void perform(SortActionEvent sortEvent) {
if (LOG.isDebugEnabled()) {
- LOG.debug("sorterId = " + sortEvent.getComponent().getId());
+ LOG.debug("sorterId = {}", sortEvent.getComponent().getId());
}
UIColumn column = sortEvent.getColumn();
AbstractUISheet data = (AbstractUISheet) sortEvent.getComponent();
@@ -94,7 +94,7 @@ public class Sorter {
sortProperty, comparator, !sheetState.isAscending());
if (LOG.isDebugEnabled()) {
- LOG.debug("Sort property is " + sortProperty);
+ LOG.debug("Sort property is {}", sortProperty);
}
} else {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.compon
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.ajax.AjaxUtils;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
@@ -51,7 +51,7 @@ import java.util.Map;
public class UIViewRoot extends javax.faces.component.UIViewRoot implements InvokeOnComponent {
- private static final Log LOG = LogFactory.getLog(UIViewRoot.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UIViewRoot.class);
private static final TobagoCallback APPLY_REQUEST_VALUES_CALLBACK = new ApplyRequestValuesCallback();
private static final ContextCallback PROCESS_VALIDATION_CALLBACK = new ProcessValidationsCallback();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.config
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.context.RenderersConfig;
import org.apache.myfaces.tobago.context.Theme;
@@ -37,7 +37,7 @@ import java.util.Map;
public class TobagoConfig {
- private static final Log LOG = LogFactory.getLog(TobagoConfig.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoConfig.class);
public static final String TOBAGO_CONFIG = "org.apache.myfaces.tobago.config.TobagoConfig";
@@ -65,8 +65,8 @@ public class TobagoConfig {
defaultTheme = availableTheme.get(defaultThemeName);
checkThemeIsAvailable(defaultThemeName, defaultTheme);
if (LOG.isDebugEnabled()) {
- LOG.debug("name = '" + defaultThemeName + "'");
- LOG.debug("defaultTheme = '" + defaultTheme + "'");
+ LOG.debug("name = '{}'", defaultThemeName);
+ LOG.debug("defaultTheme = '{}'", defaultTheme);
}
} else {
int deep = 0;
@@ -85,7 +85,7 @@ public class TobagoConfig {
throw new RuntimeException(error);
} else {
if (LOG.isInfoEnabled()) {
- LOG.info("Using default Theme " + defaultTheme.getName());
+ LOG.info("Using default Theme {}", defaultTheme.getName());
}
}
}
@@ -95,8 +95,8 @@ public class TobagoConfig {
checkThemeIsAvailable(name, theme);
supportedThemes.add(theme);
if (LOG.isDebugEnabled()) {
- LOG.debug("name = '" + name + "'");
- LOG.debug("supportedThemes.last() = '" + supportedThemes.get(supportedThemes.size() - 1) + "'");
+ LOG.debug("name = '{}'", name );
+ LOG.debug("supportedThemes.last() = '{}'", supportedThemes.get(supportedThemes.size() - 1));
}
}
}
@@ -130,8 +130,7 @@ public class TobagoConfig {
return theme;
}
}
- LOG.debug("searching theme '" + name + "' not found. "
- + "Using default: " + defaultTheme);
+ LOG.debug("searching theme '{}' not found. Using default: {}", name, defaultTheme);
return defaultTheme;
}
@@ -146,7 +145,7 @@ public class TobagoConfig {
public void addResourceDir(String resourceDir) {
if (!resourceDirs.contains(resourceDir)) {
if (LOG.isInfoEnabled()) {
- LOG.info("adding resourceDir = '" + resourceDir + "'");
+ LOG.info("adding resourceDir = '{}'", resourceDir);
}
resourceDirs.add(resourceDir);
}
@@ -198,8 +197,8 @@ public class TobagoConfig {
if (obj instanceof String) {
stageName = (String) obj;
} else {
- LOG.warn("JNDI lookup for key " + ProjectStage.PROJECT_STAGE_JNDI_NAME
- + " should return a java.lang.String value");
+ LOG.warn("JNDI lookup for key {} should return a java.lang.String value",
+ ProjectStage.PROJECT_STAGE_JNDI_NAME);
}
}
} catch (NamingException e) {
@@ -223,7 +222,7 @@ public class TobagoConfig {
}
if (projectStage == null) {
if (LOG.isInfoEnabled()) {
- LOG.info("Couldn't discover the current project stage, using " + ProjectStage.Production);
+ LOG.info("Couldn't discover the current project stage, using {}", ProjectStage.Production);
}
projectStage = ProjectStage.Production;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java Sat May 1 11:30:00 2010
@@ -19,8 +19,8 @@ package org.apache.myfaces.tobago.config
import org.apache.commons.digester.Digester;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.context.MarkupConfig;
import org.apache.myfaces.tobago.context.RendererConfig;
import org.apache.myfaces.tobago.context.RenderersConfigImpl;
@@ -34,7 +34,7 @@ import java.net.URL;
public class TobagoConfigParser {
- private static final Log LOG = LogFactory.getLog(TobagoConfigParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigParser.class);
private static final String TOBAGO_CONFIG_DTD = "/org/apache/myfaces/tobago/config/tobago-config_1_0.dtd";
@@ -92,7 +92,7 @@ public class TobagoConfigParser {
private void registerDtd(Digester digester) {
URL url = TobagoConfigParser.class.getResource(TOBAGO_CONFIG_DTD);
if (LOG.isDebugEnabled()) {
- LOG.debug("Registering dtd: url=" + url);
+ LOG.debug("Registering dtd: url={}", url);
}
if (null != url) {
digester.register("-//Atanion GmbH//DTD Tobago Config 1.0//EN", url.toString());
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.internal.context.ClientPropertiesKey;
import org.apache.myfaces.tobago.layout.Measure;
@@ -51,7 +51,7 @@ public class ClientProperties implements
private static final long serialVersionUID = 2L;
- private static final Log LOG = LogFactory.getLog(ClientProperties.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClientProperties.class);
private String contentType = "html";
private Theme theme;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/RenderersConfigImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.HashMap;
@@ -33,7 +33,7 @@ public class RenderersConfigImpl impleme
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(RenderersConfigImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RenderersConfigImpl.class);
private Map<String, RendererConfig> renderer = new HashMap<String, RendererConfig>();
@@ -63,13 +63,13 @@ public class RenderersConfigImpl impleme
public boolean isMarkupSupported(String rendererName, String markup) {
if (LOG.isDebugEnabled()) {
- LOG.debug("calling isMarkupSupported " + rendererName + " " + markup);
+ LOG.debug("calling isMarkupSupported {} {}", rendererName, markup);
}
RendererConfig rendererConfig = renderer.get(rendererName);
if (rendererConfig != null) {
return rendererConfig.contains(markup);
} else {
- LOG.error("Calling isMarkupSupported " + rendererName + " " + markup + " but no configuration found.");
+ LOG.error("Calling isMarkupSupported {} {} but no configuration found.", rendererName, markup);
return false;
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.contex
*/
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.util.XmlUtils;
import org.xml.sax.SAXException;
@@ -46,7 +46,7 @@ import java.util.zip.ZipInputStream;
*/
class ResourceLocator {
- private static final Log LOG = LogFactory.getLog(ResourceLocator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceLocator.class);
private static final String META_INF_TOBAGO_THEME_XML = "META-INF/tobago-theme.xml";
private static final String META_INF_RESOURCES = "META-INF/resources";
@@ -84,7 +84,7 @@ class ResourceLocator {
Set<String> resourcePaths = servletContext.getResourcePaths(path);
if (resourcePaths == null || resourcePaths.isEmpty()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Skipping empty resource path: path='" + path + "'");
+ LOG.debug("Skipping empty resource path: path='{}'", path);
}
return;
}
@@ -93,7 +93,7 @@ class ResourceLocator {
// ignore, because weblogic puts the path directory itself in the Set
if (!childPath.equals(path)) {
if (LOG.isDebugEnabled()) {
- LOG.debug("childPath dir " + childPath);
+ LOG.debug("childPath dir {}", childPath);
}
locateResourcesInWar(servletContext, resources, childPath);
}
@@ -344,13 +344,13 @@ class ResourceLocator {
XmlUtils.load(temp, stream);
if (LOG.isDebugEnabled()) {
LOG.debug(childPath);
- LOG.debug("xml properties: " + temp.size());
+ LOG.debug("xml properties: {}", temp.size());
}
} else {
temp.load(stream);
if (LOG.isDebugEnabled()) {
LOG.debug(childPath);
- LOG.debug(" properties: " + temp.size());
+ LOG.debug(" properties: {}", temp.size());
}
}
} catch (IOException e) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.config.TobagoConfig;
@@ -44,7 +44,7 @@ import java.util.concurrent.ConcurrentHa
public class ResourceManagerImpl implements ResourceManager {
- private static final Log LOG = LogFactory.getLog(ResourceManagerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceManagerImpl.class);
private static final String PROPERTY = "property";
private static final String JSP = "jsp";
private static final String TAG = "tag";
@@ -73,15 +73,14 @@ public class ResourceManagerImpl impleme
public void add(String resourceKey) {
if (LOG.isDebugEnabled()) {
- LOG.debug("adding resourceKey = '" + resourceKey + "'");
+ LOG.debug("adding resourceKey = '{}'", resourceKey);
}
resourceList.put(resourceKey, "");
}
public void add(String resourceKey, String value) {
if (LOG.isDebugEnabled()) {
- LOG.debug(
- "adding resourceKey = '" + resourceKey + "' value='" + value + "'");
+ LOG.debug("adding resourceKey = '{}' value= '{}'", resourceKey, value);
}
resourceList.put(resourceKey, value);
}
@@ -284,7 +283,7 @@ public class ResourceManagerImpl impleme
}
if (LOG.isDebugEnabled()) {
if (result.getValue() == null) {
- LOG.debug("Can't find image for \"" + name + "\"");
+ LOG.debug("Can't find image for \"{}\"", name);
}
}
@@ -367,7 +366,7 @@ public class ResourceManagerImpl impleme
matches.add(result);
}
if (LOG.isTraceEnabled()) {
- LOG.trace("testing path: " + path + " *"); // match
+ LOG.trace("testing path: {} *", path); // match
}
if (single) {
@@ -444,7 +443,7 @@ public class ResourceManagerImpl impleme
private String getRendererClassName(String rendererType) {
String name;
if (LOG.isDebugEnabled()) {
- LOG.debug("rendererType = '" + rendererType + "'");
+ LOG.debug("rendererType = '{}'", rendererType);
}
if ("javax.faces.Text".equals(rendererType)) { // TODO: find a better way
name = RendererTypes.OUT;
@@ -453,9 +452,9 @@ public class ResourceManagerImpl impleme
}
name = name + "Renderer";
if (name.startsWith("javax.faces.")) { // FIXME: this is a hotfix from jsf1.0beta to jsf1.0fr
- LOG.warn("patching renderer from " + name);
+ LOG.warn("patching renderer from {}", name);
name = name.substring("javax.faces.".length());
- LOG.warn("patching renderer to " + name);
+ LOG.warn("patching renderer to {}", name);
}
return name;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Map;
@@ -31,14 +31,14 @@ import java.util.Collections;
*/
class ThemeBuilder {
- private static final Log LOG = LogFactory.getLog(ThemeBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThemeBuilder.class);
private List<ThemeImpl> availableThemes = new ArrayList<ThemeImpl>();
public Map<String, Theme> resolveThemes(RenderersConfig renderersConfig) {
Map<String, ThemeImpl> map = new HashMap<String, ThemeImpl>();
for (ThemeImpl theme : availableThemes) {
- LOG.debug("theme from tobago-theme.xml files:" + theme.getName());
+ LOG.debug("theme from tobago-theme.xml files: {} ", theme.getName());
map.put(theme.getName(), theme);
}
for (ThemeImpl theme : availableThemes) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.util.ArrayList;
@@ -29,7 +29,7 @@ class ThemeImpl implements Theme, Serial
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(ThemeImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThemeImpl.class);
private String name;
@@ -109,7 +109,7 @@ class ThemeImpl implements Theme, Serial
fallbackList = Collections.unmodifiableList(fallbackList);
if (LOG.isDebugEnabled()) {
for (Theme theme : fallbackList) {
- LOG.debug("fallbackList: " + theme.getName());
+ LOG.debug("fallbackList: {}", theme.getName());
}
}
}
@@ -126,7 +126,7 @@ class ThemeImpl implements Theme, Serial
if (fallbackRenderersConfig != null) {
renderersConfig.merge(fallbackRenderersConfig, false);
if (LOG.isDebugEnabled()) {
- LOG.debug("merge markupconfig from " + fallback.getName() + " for " + getName());
+ LOG.debug("merge markupconfig from {} for {}", fallback.getName(), getName());
}
}
}
@@ -135,7 +135,7 @@ class ThemeImpl implements Theme, Serial
}
renderersConfig.setMerged(true);
if (LOG.isDebugEnabled()) {
- LOG.debug(getName() + " " + renderersConfig);
+ LOG.debug("{} {}", getName(), renderersConfig);
}
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ThemeParser.java Sat May 1 11:30:00 2010
@@ -19,8 +19,8 @@ package org.apache.myfaces.tobago.contex
import org.apache.commons.digester.Digester;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import javax.faces.FacesException;
@@ -35,7 +35,7 @@ import java.net.URL;
*/
class ThemeParser {
- private static final Log LOG = LogFactory.getLog(ThemeParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThemeParser.class);
private Digester digester;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/TobagoResourceBundle.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import java.util.Collections;
@@ -32,11 +32,11 @@ import java.util.ResourceBundle;
*/
public class TobagoResourceBundle extends ResourceBundle {
- private static final Log LOG = LogFactory.getLog(TobagoResourceBundle.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoResourceBundle.class);
protected Object handleGetObject(String key) {
if (LOG.isDebugEnabled()) {
- LOG.debug("search for \"" + key + "\"");
+ LOG.debug("search for \"{}\"", key);
}
FacesContext facesContext = FacesContext.getCurrentInstance();
ResourceManager resourceManager
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.conver
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import javax.faces.component.UIComponent;
@@ -34,7 +34,7 @@ import java.util.StringTokenizer;
@org.apache.myfaces.tobago.apt.annotation.Converter(id = DurationConverter.CONVERTER_ID)
public class DurationConverter implements Converter {
- private static final Log LOG = LogFactory.getLog(DurationConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurationConverter.class);
public static final String CONVERTER_ID = "org.apache.myfaces.tobago.Duration";
@@ -77,7 +77,7 @@ public class DurationConverter implement
+ format.format(seconds);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("string = '" + string + "'");
+ LOG.debug("string = '{}'", string);
}
return string;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.conver
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.Theme;
@@ -30,7 +30,7 @@ import javax.faces.convert.ConverterExce
@org.apache.myfaces.tobago.apt.annotation.Converter(forClass = "org.apache.myfaces.tobago.context.Theme")
public class ThemeConverter implements Converter {
- private static final Log LOG = LogFactory.getLog(ThemeConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThemeConverter.class);
public static final String CONVERTER_ID = "org.apache.myfaces.tobago.Theme";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.el;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import java.security.Principal;
@@ -28,7 +28,7 @@ import java.util.Set;
public class UserWrapper {
- private static final Log LOG = LogFactory.getLog(UserWrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UserWrapper.class);
private Map roles;
@@ -40,7 +40,7 @@ public class UserWrapper {
FacesContext facesContext = FacesContext.getCurrentInstance();
Principal principal = facesContext.getExternalContext().getUserPrincipal();
if (LOG.isDebugEnabled()) {
- LOG.debug("getPrincipal(): " + principal);
+ LOG.debug("getPrincipal(): {}", principal);
}
return principal;
}
@@ -56,7 +56,7 @@ public class UserWrapper {
FacesContext facesContext = FacesContext.getCurrentInstance();
boolean inRole = facesContext.getExternalContext().isUserInRole(role);
if (LOG.isDebugEnabled()) {
- LOG.debug("is in role '" + key + "': " + inRole);
+ LOG.debug("is in role '{}': {}", key, inRole);
}
return Boolean.valueOf(inRole);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.event;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -32,7 +32,7 @@ import javax.faces.event.ActionEvent;
*/
public class PopupActionListener extends AbstractPopupActionListener implements StateHolder {
- private static final Log LOG = LogFactory.getLog(PopupActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PopupActionListener.class);
private String popupId;
@@ -42,7 +42,7 @@ public class PopupActionListener extends
public PopupActionListener(String popupId) {
this.popupId = popupId;
if (LOG.isDebugEnabled()) {
- LOG.debug("Add ActionListener: " + popupId);
+ LOG.debug("Add ActionListener: {}", popupId);
}
}
@@ -51,9 +51,8 @@ public class PopupActionListener extends
FacesContext facesContext = FacesContext.getCurrentInstance();
AbstractUIPopup popup = (AbstractUIPopup) ComponentUtils.findComponent(actionEvent.getComponent(), popupId);
if (popup == null) {
- LOG.error("Found no popup for \""
- + popupId + "\"! Search base componentId : "
- + actionEvent.getComponent().getClientId(facesContext));
+ LOG.error("Found no popup for \"{}\"! Search base componentId : {}"
+ + popupId, actionEvent.getComponent().getClientId(facesContext));
}
return popup;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/PopupFacetActionListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.event;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
@@ -28,7 +28,7 @@ import javax.faces.event.ActionEvent;
public class PopupFacetActionListener extends AbstractPopupActionListener {
- private static final Log LOG = LogFactory.getLog(PopupActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PopupActionListener.class);
@Override
protected UIComponent getPopup(ActionEvent actionEvent) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java Sat May 1 11:30:00 2010
@@ -19,8 +19,8 @@ package org.apache.myfaces.tobago.intern
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.ajax.AjaxUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -34,7 +34,7 @@ import java.util.StringTokenizer;
public class AjaxInternalUtils {
- private static final Log LOG = LogFactory.getLog(AjaxInternalUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AjaxInternalUtils.class);
public static final String AJAX_COMPONENTS = AjaxUtils.class.getName() + ".AJAX_COMPONENTS";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -54,7 +54,7 @@ public class AjaxResponseRenderer {
public static final int CODE_RELOAD_REQUIRED = 309;
public static final int CODE_ERROR = 500;
- private static final Log LOG = LogFactory.getLog(AjaxResponseRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AjaxResponseRenderer.class);
private EncodeAjaxCallback callback;
private String contentType = "application/json";
@@ -74,8 +74,8 @@ public class AjaxResponseRenderer {
facesContext.getExternalContext().getRequestMap().get(TobagoLifecycle.VIEW_ROOT_KEY);
if (viewRoot != incomingViewRoot) {
if (LOG.isDebugEnabled()) {
- LOG.debug("requesting full page reload because of navigation to "
- + viewRoot.getViewId() + " from " + incomingViewRoot.getViewId());
+ LOG.debug("requesting full page reload because of navigation to {} from {}",
+ viewRoot.getViewId(), incomingViewRoot.getViewId());
}
Map sessionMap = facesContext.getExternalContext().getSessionMap();
//noinspection unchecked
@@ -109,7 +109,7 @@ public class AjaxResponseRenderer {
facesContext.setResponseWriter(contentWriter);
if (LOG.isDebugEnabled()) {
- LOG.debug("write ajax response for " + component);
+ LOG.debug("write ajax response for {}", component);
}
writer.write("{\n \"ajaxId\": \"");
writer.write(clientId);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.portlet.PortletUtils;
import org.apache.myfaces.tobago.util.DebugUtils;
import org.apache.myfaces.tobago.util.RequestUtils;
@@ -32,7 +32,7 @@ import java.util.Locale;
public class ViewHandlerImpl extends ViewHandler {
- private static final Log LOG = LogFactory.getLog(ViewHandlerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewHandlerImpl.class);
private ViewHandler base;
@@ -53,7 +53,7 @@ public class ViewHandlerImpl extends Vie
public UIViewRoot createView(FacesContext facesContext, String viewId) {
if (LOG.isDebugEnabled()) {
- LOG.debug("creating new view with viewId: '" + viewId + "'");
+ LOG.debug("creating new view with viewId: '{}'", viewId);
}
UIViewRoot viewRoot = base.createView(facesContext, viewId);
// ensure tobago UIViewRoot RI don't create the component via application
@@ -98,7 +98,7 @@ public class ViewHandlerImpl extends Vie
public UIViewRoot restoreView(FacesContext facesContext, String viewId) {
if (LOG.isDebugEnabled()) {
- LOG.debug("restore view with viewId: '" + viewId + "'");
+ LOG.debug("restore view with viewId: '{}'", viewId);
}
// this is only needed in the first request, the later will be handled by faces
// TODO: maybe find a way to make this unneeded
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIForm.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIForm.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIForm.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIForm.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
import org.apache.myfaces.tobago.component.Form;
@@ -35,7 +35,7 @@ import java.util.Iterator;
public abstract class AbstractUIForm extends UIForm implements InvokeOnComponent, Form {
- private static final Log LOG = LogFactory.getLog(AbstractUIForm.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIForm.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Form";
public static final String SUBMITTED_MARKER = COMPONENT_TYPE + ".InSubmitted";
@@ -69,7 +69,7 @@ public abstract class AbstractUIForm ext
public void processValidators(FacesContext facesContext) {
// if we're not the submitted form, only process subforms.
if (LOG.isDebugEnabled()) {
- LOG.debug("processValidators for form: " + getClientId(facesContext));
+ LOG.debug("processValidators for form: {}", getClientId(facesContext));
}
if (!isSubmitted()) {
for (AbstractUIForm subForm : ComponentUtils.findSubForms(this)) {
@@ -89,7 +89,7 @@ public abstract class AbstractUIForm ext
public void processUpdates(FacesContext facesContext) {
// if we're not the submitted form, only process subforms.
if (LOG.isDebugEnabled()) {
- LOG.debug("processUpdates for form: " + getClientId(facesContext));
+ LOG.debug("processUpdates for form: {}", getClientId(facesContext));
}
if (!isSubmitted()) {
for (AbstractUIForm subForm : ComponentUtils.findSubForms(this)) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.internal.layout.BankHead;
import org.apache.myfaces.tobago.internal.layout.Cell;
@@ -46,7 +46,7 @@ import java.util.List;
public abstract class AbstractUIGridLayout extends UILayoutBase implements LayoutManager, SupportsMarkup {
- private static final Log LOG = LogFactory.getLog(AbstractUIGridLayout.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIGridLayout.class);
private Grid grid;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.layout.LayoutComponent;
@@ -28,7 +28,7 @@ import java.io.IOException;
public abstract class AbstractUILabel extends javax.faces.component.UIOutput implements LayoutComponent {
- private static final Log LOG = LogFactory.getLog(AbstractUILabel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUILabel.class);
@Override
public void encodeBegin(FacesContext facesContext) throws IOException {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMediator.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import javax.faces.context.FacesContext;
@@ -28,7 +28,7 @@ import java.io.IOException;
public abstract class AbstractUIMediator extends UIPanelBase implements LayoutComponent {
- private static final Log LOG = LogFactory.getLog(AbstractUIMediator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIMediator.class);
private String var;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.intern
*/
import org.apache.commons.collections.KeyValue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
import org.apache.myfaces.tobago.component.Attributes;
@@ -57,7 +57,7 @@ import java.util.StringTokenizer;
public abstract class AbstractUIPage extends AbstractUIForm
implements OnComponentPopulated, InvokeOnComponent, LayoutContainer, DeprecatedDimension {
- private static final Log LOG = LogFactory.getLog(AbstractUIPage.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIPage.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Page";
@@ -158,7 +158,7 @@ public abstract class AbstractUIPage ext
if (LOG.isTraceEnabled()) {
LOG.trace(currentActionId);
- LOG.trace(command);
+ LOG.trace("command:{}", command);
LOG.trace(DebugUtils.toString(facesContext.getViewRoot(), 0));
}
@@ -167,7 +167,7 @@ public abstract class AbstractUIPage ext
form.setSubmitted(true);
if (LOG.isTraceEnabled()) {
- LOG.trace(form);
+ LOG.trace("form:{}", form);
LOG.trace(form.getClientId(facesContext));
}
} else {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
@@ -37,7 +37,7 @@ import java.util.List;
public abstract class AbstractUIPanel extends UIPanelBase
implements OnComponentPopulated, LayoutContainer, LayoutComponent {
- private static final Log LOG = LogFactory.getLog(AbstractUIPanel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIPanel.class);
@Override
public void encodeBegin(FacesContext facesContext) throws IOException {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
import org.apache.myfaces.tobago.component.Attributes;
@@ -51,7 +51,7 @@ public abstract class AbstractUIPopup ex
implements OnComponentCreated, OnComponentPopulated, NamingContainer, InvokeOnComponent,
DeprecatedDimension, Position, LayoutContainer {
- private static final Log LOG = LogFactory.getLog(AbstractUIPopup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIPopup.class);
private static final String Z_INDEX = AbstractUIPopup.class.getName() + ".Z_INDEX";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.OnComponentPopulated;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -28,7 +28,7 @@ import javax.faces.context.FacesContext;
public class AbstractUISelectItem extends UISelectItem implements OnComponentPopulated {
- private static final Log LOG = LogFactory.getLog(AbstractUISelectItem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUISelectItem.class);
private boolean itemValueLiteral;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
import org.apache.myfaces.tobago.component.Attributes;
@@ -61,7 +61,7 @@ public abstract class AbstractUISheet ex
implements SheetStateChangeSource, SortActionSource, InvokeOnComponent, OnComponentPopulated,
LayoutContainer, LayoutComponent {
- private static final Log LOG = LogFactory.getLog(AbstractUISheet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUISheet.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Data";