svnno****@sourc*****
svnno****@sourc*****
2008年 9月 3日 (水) 05:50:40 JST
Revision: 1106
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1106
Author: sone
Date: 2008-09-03 05:50:40 +0900 (Wed, 03 Sep 2008)
Log Message:
-----------
logging system
Modified Paths:
--------------
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/services/log/PlutoLogService.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/DesktopEncodingPortalURL.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/PageActionAccess.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginServlet.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/ResourceValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-09-02 20:50:40 UTC (rev 1106)
@@ -255,7 +255,326 @@
1100085=D[1100085] Attempt [{0}] to replay invocation for method [{1}] failed. [{2}] attempts left.
1100086=D[1100086] [{0}] attempts to replay invocation for method [{1}] failed. Throwing exception [{2}]
# 12: components/portal
+1200001=W[1200001] Could not redirect to a SSL page.
+1200002=W[1200002] Could not redirect to a non-SSL page.
+1200003=E[1200003] exception in AdminUtil.generatePassword()
+1200004=E[1200004] HeaderAggregatorImpl.initializeHeaderOrderConfigurationDefaults() ignoring specification of unknown header section type; header-section-name={0} header-section-type={1}
+1200005=E[1200005] HeaderAggregatorImpl.registerAndOrderNamedHeaderResource() ignoring specification of unknown header section type; header-section-name={0} header-section-type={1}
+1200006=D[1200006] renderHeaderFragment: {0} supports header phase
+1200007=E[1200007] renderHeaderFragment failed
+1200008=E[1200008] {0}
+1200009=E[1200009] Maximized fragment not found.
+1200010=I[1200010] Taking portlet out of service: {0} for window {1}
+1200011=E[1200011] {0}
+1200012=E[1200012] render() failed: {0}
+1200013=E[1200013] render() failed: {0}
+1200014=W[1200014] Invalid timeout metadata: {0}
+1200015=E[1200015] Unable to reteive portlet title: {0}
+1200016=D[1200016] Notifying completion of rendering job for fragment {0}
+1200017=D[1200017] Rendering OID {0} {1} {2}
+1200018=E[1200018] Error rendering portlet OID {0} : {1}
+1200019=E[1200019] Error rendering portlet OID {0}
+1200020=I[1200020] Portlet Exceeded timeout: {0} for window {1}
+1200021=D[1200021] Processing job for window :{0}
+1200022=E[1200022] Thread error
+1200023=E[1200023] Thread error
+1200024=I[1200024] Creating {0} workers -> {1}
+1200025=E[1200025] Worker exception
+1200026=E[1200026] Exception during synchronizing all portlet rendering jobs.
+1200027=E[1200027] Exception during job monitoring.
+1200028=W[1200028] Portlet Rendering job to be interrupted by timeout ({0}ms): {1}
+1200029=E[1200029] Exceptiong during job killing.
+1200030=D[1200030] could not find the object named:{0}
+1200031=E[1200031] could not create builder context
+1200032=E[1200032] builder failed
+1200033=E[1200033] exception while trying to build an error message
+1200034=E[1200034] CapabilityMap returned a null media type
+1200035=E[1200035] CapabilityMap returned a null mime type
+1200036=D[1200036] MediaType: {0}
+1200037=D[1200037] Encoding: {0}
+1200038=D[1200038] Mimetype: {0}
+1200039=E[1200039] Failed to write nodes data file to {0}/nodeInfo.ser - error : {1}
+1200040=E[1200040] Failed to read nodes data file from {0} - error : {1}
+1200041=E[1200041] Failed to create new nodes data file error : {0}
+1200042=E[1200042] Failed to create nodeInformation for {0} error : {1}
+1200043=I[1200043] Attmepting to start Pluto portal container...
+1200044=I[1200044] Pluto portlet container successfully started.
+1200045=W[1200045] Could not render PortletWindow {0} as it has no PortletEntity defined.
+1200046=W[1200046] Could not render PortletWindow {0} as it has no PortletEntity defined.
+1200047=D[1200047] {0} is DISABLED
+1200048=D[1200048] No previous page Id found in session, setting it for the first time
+1200049=D[1200049] Previous page id is same as current page id, not clearing page state
+1200050=D[1200050] Page Change encountered Current Page:{0} Prev Page:{1}
+1200051=E[1200051] LocalPortletInvokerImpl.load() - Error while dispatching portlet.
+1200052=E[1200052] ServletPortletInvokerImpl.load() - Error while dispatching portlet.
+1200053=E[1200053] Failed to find Servlet context for Portlet Application: {0}
+1200054=E[1200054] Failed to get Request Dispatcher for Portlet Application: {0}, servlet: {1}
+1200055=E[1200055] Failed to dispatch.include for Portlet Application: {0}, servlet: {1}
+1200056=W[1200056] servlet context name of paSession({0}): {1}
+1200057=D[1200057] navstate decoded={0}
+1200058=D[1200058] resetPagePortlets:{0}
+1200059=E[1200059] exception in AbstractPortalURL.createNavigationalEncoding()
+1200060=E[1200060] exception in AbstractPortalURL.createNavigationalEncoding()
+1200061=E[1200061] exception in AbstractPortalURL.createPortletURL()
+1200062=E[1200062] exception in AbstractPortalURL.createPortletURL()
+1200063=E[1200063] exception in AbstractPortalURL.getPortalURL()
+1200064=E[1200064] exception in DesktopEncodingPortalURL.createPortletURL()
+1200065=E[1200065] exception in GlassFishPathInfoEncodingPortalURL.createNavigationalEncoding()
+1200066=E[1200066] exception in GlassFishPathInfoEncodingPortalURL.createNavigationalEncoding()
+1200067=I[1200067] No portlet entity defined for fragment ID {0} attempting to auto-generate...
+1200068=D[1200068] BaseDecoration basePath: {0}
+1200069=D[1200069] BaseDecoration baseClientPath: {0}
+1200070=E[1200070] {0}
+1200071=W[1200071] Could not locate the {0} configuration file for decoration "{1}". This decoration may not exist.
+1200072=W[1200072] Failed to load the {0} configuration file for decoration "{1}".
+1200073=W[1200073] Failed to close decoration configuration.
+1200074=D[1200074] Could not locate the {0} configuration file for decoration "{1}". This decoration may not exist.
+1200075=W[1200075] Failed to load the {0} configuration file for decoration "{1}".
+1200076=W[1200076] Failed to close decoration desktop configuration.
+1200077=E[1200077] Failed to instantiate custom DecoratorActionsAdaptor {0}, falling back to default.
+1200078=W[1200078] Unable to initalize PageLayout actions
+1200079=W[1200079] Unable to initalize actions for fragment {0}
+1200080=W[1200080] Unable to initalize actions for fragment {0}
+1200081=E[1200081] Unknown action: {0}
+1200082=I[1200082] Found decorator deployment archive {0}
+1200083=I[1200083] Deploying decorator {0} to {1}
+1200084=I[1200084] Deploying locale specific decorator component to {0}
+1200085=I[1200085] Decorator {0} deployed successfuly.
+1200086=I[1200086] Undeploying decorator {0} at {1}
+1200087=I[1200087] Undeploying locale specific decorator component at {0}
+1200088=I[1200088] Decorator {0} undeployed successfuly.
+1200089=W[1200089] Not a local application {0}
+1200090=E[1200090] Failed to start Local Portlet Application {0}
+1200091=I[1200091] Adding {0} to class path for Local PA {1}
+1200092=I[1200092] Adding {0} to class path for Local PA {1}
+1200093=I[1200093] Found jetspeed-jetty-context.xml
+1200094=I[1200094] Starting auto deployment service: {0}
+1200095=I[1200095] Deployment scanning delay: {0}
+1200096=I[1200096] Deployment staging directory: {0}
+1200097=E[1200097] {0} does not exist, auto deployment disabled.
+1200098=I[1200098] Deployment scanner successfuly started!
+1200099=W[1200099] Unable to intialize Catalina Portlet Application Manager. Auto deployment will be disabled: {0}
+1200100=I[1200100] Scanning delay set to {0} has disabled automatic scanning of staging directory.
+1200101=I[1200101] File: {0} deployed
+1200102=E[1200102] Failed to remove: {0}
+1200103=W[1200103] Unrecognized file {0}
+1200104=E[1200104] Failure deploying {0}
+1200105=E[1200105] Failure deploying {0}
+1200106=E[1200106] {0}
+1200107=W[1200107] JetspeedDesktopImpl initialization is incomplete due to undefined desktop servlet path.
+1200108=E[1200108] Failed to find desktop layout decoration {0} - layout decoration properties cannot be added to content.
+1200109=E[1200109] Failed to include desktop layout decoration at path {0}
+1200110=E[1200110] Failed to initialize for inclusion of desktop layout decoration
+1200111=E[1200111] Failed to write desktop layout decoration exception information to servlet output writer
+1200112=D[1200112] {0} map size: {1}
+1200113=E[1200113] Entity is null:{0}
+1200114=D[1200114] Starting method: DatasourceAvailableHealthCheckValidator.validate()
+1200115=D[1200115] Database: {0}
+1200116=E[1200116] Exception while running the datasource validator
+1200117=D[1200117] {0}
+1200118=E[1200118] The datasource is not available
+1200119=D[1200119] Checking portlet application: {0}
+1200120=E[1200120] Exception while running the portlet application validator
+1200121=D[1200121] {0}
+1200122=E[1200122] Failure to construct nested context for fragment {0}
+1200123=E[1200123] Failure to locate copy of fragment {0}
+1200124=E[1200124] exception while adding a portlet
+1200125=E[1200125] exception while changing portlet/page action
+1200126=E[1200126] exception while getting folder info
+1200127=E[1200127] exception while getting folder info
+1200128=E[1200128] exception in ExportObject.zipObject
+1200129=E[1200129] exception in ExportObject.zipFiles
+1200130=E[1200130] exception while getting folder info
+1200131=E[1200131] exception while getting theme info
+1200132=E[1200132] exception while getting theme info
+1200133=E[1200133] exception while getting link info
+1200134=E[1200134] Exception while getting page menus info
+1200135=E[1200135] Exception while getting page menus info
+1200136=E[1200136] exception while getting page
+1200137=E[1200137] GetPageAction could not obtain PortletDefinition for portlet {0}
+1200138=E[1200138] exception while getting portlet info
+1200139=E[1200139] exception while getting actions for a fragment
+1200140=E[1200140] exception while getting portlet info
+1200141=E[1200141] exception while getting theme info
+1200142=E[1200142] exception with user account access
+1200143=E[1200143] exception statistics access
+1200144=E[1200144] Failure to construct nested context for fragment {0}
+1200145=E[1200145] Failure to locate copy of fragment {0}
+1200146=E[1200146] Failure to locate copy of destination fragment {0}
+1200147=E[1200147] exception while moving a portlet
+1200148=E[1200148] could not create builder context
+1200149=E[1200149] builder failed
+1200150=E[1200150] getFragmentOnNewPage failure to locate fragment on new page (index={0}) :{1}
+1200151=E[1200151] getFragmentOnNewPage failure to locate fragment on new page (index={0}) :{1}
+1200152=W[1200152] Insufficient access to page {0} by user {1}
+1200153=I[1200153] {0}
+1200154=E[1200154] getColumnCountAndSizes not a layout fragment - {0} type={1}
+1200155=E[1200155] getColumnCountAndSizes invalid columnCount - {0} / {1} count={2} sizes="{3}
+1200156=E[1200156] getColumnCountAndSizes null sizes, null layoutName - {0}
+1200157=E[1200157] getColumnCountAndSizes null sizes, null PortletDefinition - {0} / {1}
+1200158=E[1200158] getColumnCountAndSizes null sizes, null ParameterSet - {0} / {1}
+1200159=E[1200159] getColumnCountAndSizes null sizes, columns not defined in ParameterSet - {0} / {1}
+1200160=E[1200160] Failure to construct nested context for fragment {0}
+1200161=E[1200161] Failure to locate copy of fragment {0}
+1200162=E[1200162] exception while adding a portlet
+1200163=D[1200163] SecurityConstraintsAction run
+1200164=D[1200164] SecurityConstraintsAction run failure caused by {0} {1}
+1200165=E[1200165] exception administering portal permissions
+1200166=D[1200166] SecurityConstraintsAction complete {0}
+1200167=D[1200167] SecurityConstraintsAction updateConstraintDefinition started
+1200168=E[1200168] SecurityConstraintsAction updateConstraintDefinition failure caused by {0} {1}
+1200169=E[1200169] exception administering portal permissions
+1200170=E[1200170] exception administering Site update
+1200171=E[1200171] exception administering Site update
+1200172=E[1200172] exception administering Site update
+1200173=W[1200173] Invalid or unrecognized default language: {0}
+1200174=I[1200174] Default language set: {0}
+1200175=D[1200175] Got user principal: {0}
+1200176=W[1200176] Unexpected SecurityException in UserInfoManager
+1200177=W[1200177] Invalid or unrecognized default language: {0}
+1200178=I[1200178] Default language set: {0}
+1200179=W[1200179] Jetspeed engine does not work properly.
+1200180=W[1200180] The included login template file threw the exception.
+1200181=W[1200181] I/O error occurred on the included login template file.
+1200182=D[1200182] Starting method: HealthCheckValve.invoke()
+1200183=D[1200183] Starting validator execution: {0}
+1200184=D[1200184] Validator execution: {0}
+1200185=E[1200185] Exception while running HealthCheckValve
+1200186=E[1200186] Exception while running HealthCheckValve
+1200187=E[1200187] Failed to refresh action window.
+1200188=W[1200188] Portlet action was canceled because the session was expired. The actionWindow's id is {0}
+1200189=F[1200189] Unable to retrieve portlet container!
+1200190=W[1200190] Unexpected PortletException in ActionValveImpl
+1200191=E[1200191] Unexpected IOException in ActionValveImpl
+1200192=E[1200192] Illegal State Exception. Response was written to in Action Phase
+1200193=E[1200193] Unknown exception processing Action
+1200194=I[1200194] Action processed and response committed (pipeline processing stopped)
+1200195=E[1200195] CleanupValveImpl: failed while trying to render fragment {0}
+1200196=E[1200196] CleanupValveImpl: Unable to complete all renderings
+1200197=D[1200197] Session object: {0}
+1200198=D[1200198] Session footprint: {0}
+1200199=D[1200199] Exception in dumpSession().
+1200200=D[1200200] o = {0}, {1}, size = {2}
+1200201=D[1200201] Exception in serializeObject(String name, Object o).
+1200202=I[1200202] -- Jetspeed Debug Valve: Debugging standard headers --
+1200203=I[1200203] http header = {0} : {1}
+1200204=I[1200204] Invoking the VerySimpleLayoutValve...
+1200205=E[1200205] VerySimpleLayout: Unable to include layout header. Layout not processed
+1200206=E[1200206] Exception occurred during creating user folder.
+1200207=E[1200207] {0}
+1200208=E[1200208] Failed to invoke HttpServletReponse.sendError: {0}
+1200209=E[1200209] {0}
+1200210=E[1200210] Failed to invoke HttpServletReponse.sendError: {0}
+1200211=E[1200211] Exception in request pipeline: {0}
+1200212=E[1200212] exceptin in JetspeedRequestContext.locatePage
+1200213=E[1200213] JetspeedRequestContextComponent: Failed to create a Class object for RequestContext: {0}
+1200214=E[1200214] Cannot call getRequestContext(HttpServletRequest request) before it has been created and set for this thread.
+1200215=E[1200215] Failed to refresh resource window.
+1200216=F[1200216] Unable to retrieve portlet container!
+1200217=W[1200217] Unexpected PortletException
+1200218=E[1200218] Unexpected IOException
+1200219=E[1200219] Unexpected IllegalStateException.
+1200220=E[1200220] Unexpected Exception
+1200221=E[1200221] Exception in request pipeline: {0}
+1200222=E[1200222] Exception in request pipeline: {0}
+1200223=I[1200223] PortletApplicationManager Descriptor Change Monitor started!
+1200224=W[1200224] Unable to start PortletApplicationManager Descriptor Change Monitor: {0}
+1200225=I[1200225] Loading portlet.xml....{0}
+1200226=I[1200226] Loading web.xml....{0}
+1200227=E[1200227] Failed to load portlet application for {0}
+1200228=I[1200228] Registered the portlet application {0}
+1200229=I[1200229] AutoCreated role: {0} from portlet application {1} its web definition
+1200230=W[1200230] Failed to autoCreate roles for portlet application {0} : {1}
+1200231=E[1200231] Failed to register portlet application, {0}
+1200232=E[1200232] Failed to rollback registration of portlet application {0}
+1200233=D[1200233] Is portlet application {0} monitored? -> {1}
+1200234=D[1200234] Try to start portlet application {0}.
+1200235=D[1200235] New checksum for portlet application {0} is {1}
+1200236=E[1200236] Invalid PA WAR for {0}
+1200237=D[1200237] Portlet Application {0} found in registry.
+1200238=D[1200238] unregistering portlet application {0}...
+1200239=D[1200239] Register new portlet application {0}.
+1200240=D[1200240] Error register new portlet application {0}.
+1200241=D[1200241] Re-register existing portlet application {0}.
+1200242=D[1200242] Node for Portlet application {0} is NEW.
+1200243=W[1200243] The portlet application {0} is registered in the database but not locally .... we will reregister
+1200244=W[1200244] The provided portlet application {0} is a different version than in the database (db-checksum={1}, local-checksum=: {2}) .... we will redeploy (also to the database)
+1200245=D[1200245] Node for Portlet application {0} is SAVED
+1200246=W[1200246] The provided portlet application {0} is a different version than in the local node info and the database (db-checksum={1}, local-checksum=: {2}) .... we will reregister AND redeploy (also to the database)
+1200247=D[1200247] Node for Portlet application {0} is OUTDATED (local PA.id < DB PA.id).");
+1200248=E[1200248] The portlet application {0} provided for the upgrade IS WRONG. The database checksum= {1}, but the local={2}....THIS NEEDS TO BE CORRECTED
+1200249=D[1200249] Register (deploy=true) Portlet application {0} in database.
+1200250=D[1200250] Re-Register (reregister=true) Portlet application {0}.
+1200251=E[1200251] Adding node for portlet application {0} caused exception
+1200252=D[1200252] Register Portlet application {0} in portlet factory.
+1200253=D[1200253] Add change monitor for application {0} with checksum {1}.
+1200254=E[1200254] Error starting portlet application {0}
+1200255=D[1200255] Add change monitor for application {0} and set unsuccessful starts to 1.
+1200256=E[1200256] Failed to close PA WAR for {0}
+1200257=I[1200257] Un-Registered the portlet application in the search engine... {0}
+1200258=I[1200258] Registered the portlet application in the search engine... {0}
+1200259=I[1200259] Remove all registry entries defined for portlet application {0}
+1200260=E[1200260] Failed to delete Portlet Entity {0}
+1200261=E[1200261] Error granting default permissions for {0}
+1200262=E[1200262] Error revoking default permissions for {0}
+1200263=D[1200263] checksum check for descriptors for application {0}: old ({1}) new ({2}).
+1200264=D[1200264] portlet descriptors for application {0} have changed.
+1200265=D[1200265] check for portlet application descriptor changes.
+1200266=E[1200266] Failed to restart PortletApplication {0}
+1200267=W[1200267] Failed to restart PortletApplication {0}
+1200268=D[1200268] Number of unsuccessful PA starts is {0}.
+1200269=E[1200269] Max number of retries ({0}) reached. Ignoring Monitor for {1}
+1200270=E[1200270] Descriptor Change check failure for PortletApplication {0}
+1200271=E[1200271] Invalid PA WAR for {0}
+1200272=E[1200272] Error starting portlet application {0}
+1200273=E[1200273] Unknown server: {0}
+1200274=E[1200274] IOException: {0}
+1200275=D[1200275] Linking user attribute ref: [[name, {0}], [linked name, {1}]]
+1200276=D[1200276] {0} is set to null
+1200277=D[1200277] Getting user info for portlet application: {0}
+1200278=D[1200278] {0} is set to null
+1200279=D[1200279] {0} is set to null
+1200280=D[1200280] Found {0} children for {1}
+1200281=E[1200281] BackingStoreException: {0}
+1200282=D[1200282] Got user principal: {0}
+1200283=W[1200283] Unexpected SecurityException in UserInfoManager
+1200284=D[1200284] Got user principal: {0}
+1200285=W[1200285] Unexpected SecurityException in UserInfoManager
+1200286=E[1200286] Undefined security role {0} referenced from portlet {1}
+1200287=I[1200287] No extended metadata found.
+1200288=W[1200288] Unsupported encoding.
+1200289=W[1200289] Unsupported encoding.
+1200290=I[1200290] Adding {0} to class path.
+1200291=I[1200291] Adding {0} to class path.
+1200292=W[1200292] {0}
+1200293=E[1200293] Unable to locate template: {0}
+1200294=E[1200294] {0}
+1200295=E[1200295] Unable to reteive portlet title: {0}
+1200296=E[1200296] Unable to reteive portlet title: {0}
+1200297=E[1200297] getVelocityEngine(): unable create base descriptor
+1200298=W[1200298] getVelocityEngine(): unable read decorator properties from {0}
+1200299=D[1200299] initVelocity(): create new VelocityEngine instance to support {0} decoration template macros
+1200300=D[1200300] initVelocity(): create new default VelocityEngine instance
+1200301=E[1200301] initVelocity(): unable to initialize velocity engine instance, using default singleton
+1200302=E[1200302] Error processing vm template
+1200303=E[1200303] Error writing error message to vm template
+
# 13: components/portal-site
+1300001=D[1300001] Missing/forbidden page selection fallback: request path={0}, attempting fallback request path={1}
+1300002=D[1300002] Request page modified by profile locator: request path={0}
+1300003=D[1300003] Request page: request path={0}
+1300004=D[1300004] Selected folder historical page: path={0}
+1300005=D[1300005] Selected folder default page: path={0}
+1300006=D[1300006] Selected first folder page, path={0}
+1300007=D[1300007] Selected page, path={0}
+1300008=D[1300008] {0}
+1300009=D[1300009] Created site view: search paths={0}
+1300010=D[1300010] Page manager update event, (node={0}): set session context state stale
+1300011=D[1300011] Page manager update event: set session context state stale
+1300012=D[1300012] Session activation event: set session context state stale
+1300013=D[1300013] Session deactivation event: clear session context state
+1300014=D[1300014] Session bound event: setup page manager listener
+1300015=D[1300015] Session unbound event: clear page manager listener and session context state
# 14: components/portlet-factory
1400001=E[1400001] Cannot create PreferencesValidator instance {0} for Portlet {1}
1400002=E[1400002] exception in JetspeedPortletFactory.getPreferencesValidator()
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -5,8 +5,9 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -90,10 +91,11 @@
}
catch (IOException e)
{
- log
- .warn(
- "Could not redirect to a SSL page.",
- e);
+ //log
+ // .warn(
+ // "Could not redirect to a SSL page.",
+ // e);
+ log.log("1200001", e); // REPLACED
}
}
}
@@ -111,10 +113,11 @@
}
catch (IOException e)
{
- log
- .warn(
- "Could not redirect to a non-SSL page.",
- e);
+ //log
+ // .warn(
+ // "Could not redirect to a non-SSL page.",
+ // e);
+ log.log("1200002", e); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,6 +20,9 @@
import javax.servlet.jsp.JspException;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.folder.Folder;
import org.apache.taglibs.random.RandomStrg;
@@ -47,6 +50,8 @@
// '*','@', '#', '$', '%', '^',
// '+',
+ protected static final Log log = LogFactory.getLog(AdminUtil.class);
+
public String generatePassword()
{
RandomStrg rs = new RandomStrg();
@@ -64,7 +69,8 @@
// this would only get thrown if we tried a secure random and the
// provider
// was not available.
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200003", e); // REPLACED
}
// DONE Findbugs
// rs.setLength(new Integer(12));
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -26,8 +26,9 @@
import javax.portlet.Portlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.FailedToRenderFragmentException;
import org.apache.jetspeed.aggregator.PageAggregator;
@@ -352,11 +353,14 @@
}
else
{
- log
- .error("HeaderAggregatorImpl.initializeHeaderOrderConfigurationDefaults() ignoring specification of unknown header section type; header-section-name="
- + headerName
- + " header-section-type="
- + headerTypeObj.toString());
+ //log
+ // .error("HeaderAggregatorImpl.initializeHeaderOrderConfigurationDefaults() ignoring specification of unknown header section type; header-section-name="
+ // + headerName
+ // + " header-section-type="
+ // + headerTypeObj.toString());
+ Object[] args = new Object[]
+ {headerName, headerTypeObj.toString()};
+ log.log("1200004", args); // REPLACED
}
}
}
@@ -563,11 +567,14 @@
.length() > 0);
if (headerTypeId < 0 && !headerRefFlagSpecified)
{
- log
- .error("HeaderAggregatorImpl.registerAndOrderNamedHeaderResource() ignoring specification of unknown header section type; header-section-name="
- + headerName
- + " header-section-type="
- + headerType);
+ //log
+ // .error("HeaderAggregatorImpl.registerAndOrderNamedHeaderResource() ignoring specification of unknown header section type; header-section-name="
+ // + headerName
+ // + " header-section-type="
+ // + headerType);
+ Object[] args = new Object[]
+ {headerName, headerType};
+ log.log("1200005", args); // REPLACED
}
if ((headerTypeId >= 0) || headerRefFlagSpecified)
@@ -1558,8 +1565,14 @@
if (portlet != null
&& portlet instanceof SupportsHeaderPhase)
{
- log.debug("renderHeaderFragment: " + pd.getName()
- + " supports header phase");
+ //log.debug("renderHeaderFragment: " + pd.getName()
+ // + " supports header phase");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {pd.getName()};
+ log.log("1200006", args); // REPLACED
+ }
HeaderResource hr = getHeaderResourceFactory()
.getHeaderResource(context, this.baseUrlAccess,
@@ -1581,7 +1594,8 @@
}
catch (Exception e)
{
- log.error("renderHeaderFragment failed", e);
+ //log.error("renderHeaderFragment failed", e);
+ log.log("1200007", e); // REPLACED
}
return false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HttpBufferedResponse.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.pluto.util.PrintWriterServletOutputStream;
public class HttpBufferedResponse extends
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.io.IOException;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.FailedToRenderFragmentException;
import org.apache.jetspeed.aggregator.PageAggregator;
@@ -128,7 +129,10 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ //log.error(e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200008", args, e); // REPLACED
maxedContentFragment
.overrideRenderedContent("Sorry, but we were unable access the requested portlet. Send the following message to your portal admin: "
+ e.getMessage());
@@ -136,8 +140,9 @@
}
else
{
- String message = "Maximized fragment not found.";
- log.error(message);
+ //String message = "Maximized fragment not found.";
+ //log.error(message);
+ log.log("1200009"); // REPLACED
// DONE Findbugs
// if (maxedContentFragment != null)
// maxedContentFragment
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,9 +25,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.ContentDispatcher;
@@ -202,9 +203,16 @@
"Access Denied."); }
if (portletTracking.isOutOfService(portletWindow))
{
- log.info("Taking portlet out of service: "
- + portletDefinition.getUniqueName() + " for window "
- + fragment.getId());
+ //log.info("Taking portlet out of service: "
+ // + portletDefinition.getUniqueName() + " for window "
+ // + fragment.getId());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {portletDefinition.getUniqueName(), fragment.getId()};
+ log.log("1200010", args); // REPLACED
+ }
+
fragment.overrideRenderedContent(OUT_OF_SERVICE_MESSAGE);
return;
}
@@ -241,7 +249,10 @@
catch (Exception e)
{
fragment.overrideRenderedContent(e.getLocalizedMessage());
- log.error(e.toString(), e);
+ //log.error(e.toString(), e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1200011", args); // REPLACED
}
}
@@ -289,7 +300,10 @@
}
catch (Exception e)
{
- log.error("render() failed: " + e.toString(), e);
+ //log.error("render() failed: " + e.toString(), e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1200012", args, e); // REPLACED
fragment.overrideRenderedContent(e.getLocalizedMessage());
}
@@ -388,7 +402,10 @@
}
catch (Exception e1)
{
- log.error("render() failed: " + e1.toString(), e1);
+ //log.error("render() failed: " + e1.toString(), e1);
+ Object[] args = new Object[]
+ {e1.toString()};
+ log.log("1200013", args, e1); // REPLACED
// TODO Findbugs
fragment.overrideRenderedContent(e1.getLocalizedMessage());
}
@@ -617,7 +634,10 @@
}
catch (NumberFormatException nfe)
{
- log.warn("Invalid timeout metadata: " + nfe.getMessage());
+ //log.warn("Invalid timeout metadata: " + nfe.getMessage());
+ Object[] args = new Object[]
+ {nfe.getMessage()};
+ log.log("1200014", args); // REPLACED
}
}
}
@@ -660,8 +680,11 @@
}
catch (Exception e)
{
- log.error("Unable to reteive portlet title: " + e.getMessage(),
- e);
+ //log.error("Unable to reteive portlet title: " + e.getMessage(),
+ // e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200015", args, e); // REPLACED
}
}
else
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -30,8 +30,9 @@
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.ContentDispatcherCtrl;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
@@ -195,9 +196,14 @@
synchronized (portletContent)
{
if (log.isDebugEnabled())
- log
- .debug("Notifying completion of rendering job for fragment "
- + fragment.getId());
+ {
+ //log
+ // .debug("Notifying completion of rendering job for fragment "
+ // + fragment.getId());
+ Object[] args = new Object[]
+ {fragment.getId()};
+ log.log("1200016", args); // REPLACED
+ }
portletContent.notifyAll();
}
}
@@ -218,8 +224,13 @@
try
{
if (log.isDebugEnabled())
- log.debug("Rendering OID " + this.window.getId() + " "
- + this.request + " " + this.response);
+ {
+ //log.debug("Rendering OID " + this.window.getId() + " "
+ // + this.request + " " + this.response);
+ Object[] args = new Object[]
+ {this.window.getId(), this.request, this.response};
+ log.log("1200017", args); // REPLACED
+ }
// if the current thread is worker, then store attribues in that.
if (this.workerAttributes != null)
@@ -314,14 +325,20 @@
if (t instanceof UnavailableException)
{
// no need to dump a full stack trace to the log
- log.error("Error rendering portlet OID " + curWindow.getId()
- + ": " + t.toString());
+ //log.error("Error rendering portlet OID " + curWindow.getId()
+ // + ": " + t.toString());
+ Object[] args = new Object[]
+ {curWindow.getId(), t.toString()};
+ log.log("1200018", args); // REPLACED
}
else
{
- log
- .error("Error rendering portlet OID "
- + curWindow.getId(), t);
+ //log
+ // .error("Error rendering portlet OID "
+ // + curWindow.getId(), t);
+ Object[] args = new Object[]
+ {curWindow.getId()};
+ log.log("1200019", args, t); // REPLACED
}
fragment.overrideRenderedContent(t.getMessage());
}
@@ -353,10 +370,19 @@
if (exceededTimeout)
{
// took too long to render
- log.info("Portlet Exceeded timeout: "
- + curWindow.getPortletEntity()
- .getPortletDefinition().getName()
- + " for window " + curWindow.getId());
+ //log.info("Portlet Exceeded timeout: "
+ // + curWindow.getPortletEntity()
+ // .getPortletDefinition().getName()
+ // + " for window " + curWindow.getId());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {
+ curWindow.getPortletEntity()
+ .getPortletDefinition().getName(),
+ curWindow.getId()};
+ log.log("1200020", args); // REPLACED
+ }
portletTracking.incrementRenderTimeoutCount(curWindow);
}
else
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.aggregator.RenderingJob;
import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.aggregator.WorkerMonitor;
@@ -163,8 +164,14 @@
// process it
if (this.job != null)
{
- log.debug("Processing job for window :"
- + ((RenderingJob) job).getWindow().getId());
+ //log.debug("Processing job for window :"
+ // + ((RenderingJob) job).getWindow().getId());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {((RenderingJob) job).getWindow().getId()};
+ log.log("1200021", args); // REPLACED
+ }
Subject subject = null;
if (this.context != null)
{
@@ -183,7 +190,8 @@
}
catch (Throwable t)
{
- log.error("Thread error", t);
+ //log.error("Thread error", t);
+ log.log("1200022", t); // REPLACED
}
return null;
}
@@ -197,7 +205,8 @@
}
catch (Throwable t)
{
- log.error("Thread error", t);
+ //log.error("Thread error", t);
+ log.log("1200023", t); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -26,8 +26,9 @@
import java.util.List;
import java.util.Stack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.aggregator.RenderingJob;
import org.apache.jetspeed.aggregator.Worker;
@@ -135,8 +136,14 @@
wCount = maxWorkers - wCurrent;
}
- log.info("Creating " + wCount + " workers -> "
- + (wCurrent + wCount));
+ //log.info("Creating " + wCount + " workers -> "
+ // + (wCurrent + wCount));
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {wCount, (wCurrent + wCount)};
+ log.log("1200024", args); // REPLACED
+ }
for (int i = 0; i < wCount; ++i)
{
@@ -205,7 +212,8 @@
}
catch (Throwable t)
{
- log.error("Worker exception", t);
+ //log.error("Worker exception", t);
+ log.log("1200025", t); // REPLACED
}
}
}
@@ -237,10 +245,11 @@
}
catch (Exception e)
{
- log
- .error(
- "Exception during synchronizing all portlet rendering jobs.",
- e);
+ //log
+ // .error(
+ // "Exception during synchronizing all portlet rendering jobs.",
+ // e);
+ log.log("1200026", e); // REPLACED
}
}
@@ -392,7 +401,8 @@
}
catch (Exception e)
{
- log.error("Exception during job monitoring.", e);
+ //log.error("Exception during job monitoring.", e);
+ log.log("1200027", e); // REPLACED
}
try
@@ -413,14 +423,17 @@
{
try
{
- if (log.isWarnEnabled())
- {
- PortletWindow window = job.getWindow();
- ObjectID windowId = (null != window ? window.getId() : null);
- log
- .warn("Portlet Rendering job to be interrupted by timeout ("
- + job.getTimeout() + "ms): " + windowId);
- }
+ //if (log.isWarnEnabled())
+ //{
+ PortletWindow window = job.getWindow();
+ ObjectID windowId = (null != window ? window.getId() : null);
+ //log
+ // .warn("Portlet Rendering job to be interrupted by timeout ("
+ // + job.getTimeout() + "ms): " + windowId);
+ Object[] args = new Object[]
+ {job.getTimeout(), windowId};
+ log.log("1200028", args); // REPLACED
+ //}
PortletContent content = job.getPortletContent();
@@ -437,7 +450,8 @@
}
catch (Exception e)
{
- log.error("Exceptiong during job killing.", e);
+ //log.error("Exceptiong during job killing.", e);
+ log.log("1200029", e); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -29,8 +29,9 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.layout.impl.Constants;
import org.apache.jetspeed.request.RequestContext;
import org.apache.velocity.VelocityContext;
@@ -153,7 +154,13 @@
else
{
// Log an informational message
- log.debug("could not find the object named:" + objectKey);
+ //log.debug("could not find the object named:" + objectKey);
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {objectKey};
+ log.log("1200030", args); // REPLACED
+ }
// Return an error response
buildError(requestContext);
@@ -248,13 +255,15 @@
}
else
{
- log.error("could not create builder context");
+ //log.error("could not create builder context");
+ log.log("1200031"); // REPLACED
buildError(requestContext);
}
}
catch (Exception e)
{
- log.error("builder failed", e);
+ //log.error("builder failed", e);
+ log.log("1200032", e); // REPLACED
inputMap.put(Constants.REASON, e.toString());
buildError(requestContext);
@@ -274,7 +283,8 @@
{
// Not much can be done here, an exception while handling an
// exception
- log.error("exception while trying to build an error message", e);
+ //log.error("exception while trying to build an error message", e);
+ log.log("1200033", e); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.capabilities.Capabilities;
import org.apache.jetspeed.capabilities.CapabilityMap;
import org.apache.jetspeed.capabilities.Client;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -17,8 +17,9 @@
package org.apache.jetspeed.capabilities.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.capabilities.Capabilities;
import org.apache.jetspeed.capabilities.CapabilityMap;
import org.apache.jetspeed.capabilities.MediaType;
@@ -79,14 +80,16 @@
if (mediaType == null)
{
- log.error("CapabilityMap returned a null media type");
+ //log.error("CapabilityMap returned a null media type");
+ log.log("1200034"); // REPLACED
throw new PipelineException(
"CapabilityMap returned a null media type");
}
if (mimeType == null)
{
- log.error("CapabilityMap returned a null mime type");
+ //log.error("CapabilityMap returned a null mime type");
+ log.log("1200035"); // REPLACED
throw new PipelineException(
"CapabilityMap returned a null mime type");
}
@@ -103,9 +106,18 @@
if (log.isDebugEnabled())
{
- log.debug("MediaType: " + mediaType.getName());
- log.debug("Encoding: " + encoding);
- log.debug("Mimetype: " + mimeType.getName());
+ //log.debug("MediaType: " + mediaType.getName());
+ Object[] args1 = new Object[]
+ {mediaType.getName()};
+ log.log("1200036", args1); // REPLACED
+ //log.debug("Encoding: " + encoding);
+ Object[] args2 = new Object[]
+ {encoding};
+ log.log("1200037", args2); // REPLACED
+ //log.debug("Mimetype: " + mimeType.getName());
+ Object[] args3 = new Object[]
+ {mimeType.getName()};
+ log.log("1200038", args3); // REPLACED
}
// Put the encoding in the request
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import java.io.ObjectOutputStream;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -78,10 +79,13 @@
}
catch (Exception e)
{
- log.error("Failed to write nodes data file to "
- + rootIndexDir.getAbsolutePath() + "/nodeInfo.ser"
- + " - error : " + e.getLocalizedMessage());
- e.printStackTrace();
+ //log.error("Failed to write nodes data file to "
+ // + rootIndexDir.getAbsolutePath() + "/nodeInfo.ser"
+ // + " - error : " + e.getLocalizedMessage());
+ //e.printStackTrace();
+ Object[] args = new Object[]
+ {rootIndexDir.getAbsolutePath(), e.getLocalizedMessage()};
+ log.log("1200039", args); // REPLACED
}
}
@@ -100,9 +104,12 @@
}
catch (Exception e)
{
- log.error("Failed to read nodes data file from "
- + data.getAbsolutePath() + " - error : "
- + e.getLocalizedMessage());
+ //log.error("Failed to read nodes data file from "
+ // + data.getAbsolutePath() + " - error : "
+ // + e.getLocalizedMessage());
+ Object[] args = new Object[]
+ {data.getAbsolutePath(), e.getLocalizedMessage()};
+ log.log("1200040", args); // REPLACED
nodes = new HashMap();
}
}
@@ -114,9 +121,12 @@
}
catch (Exception e)
{
- log.error("Failed to create new nodes data file error : "
- + e.getLocalizedMessage());
- e.printStackTrace();
+ //log.error("Failed to create new nodes data file error : "
+ // + e.getLocalizedMessage());
+ //e.printStackTrace();
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1200041", args); // REPLACED
}
nodes = new HashMap();
}
@@ -175,9 +185,12 @@
}
catch (Exception e)
{
- log.error("Failed to create nodeInformation for "
- + nodeInformationBean + " error : "
- + e.getLocalizedMessage());
+ //log.error("Failed to create nodeInformation for "
+ // + nodeInformationBean + " error : "
+ // + e.getLocalizedMessage());
+ Object[] args = new Object[]
+ {nodeInformationBean, e.getLocalizedMessage()};
+ log.log("1200042", args); // REPLACED
throw new ClassNotFoundException("Spring failed to create the "
+ " nodeInformation bean.", e);
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
import org.apache.pluto.PortletContainer;
@@ -89,9 +90,17 @@
*/
public void start() throws PortletContainerException
{
- log.info("Attmepting to start Pluto portal container...");
+ //log.info("Attmepting to start Pluto portal container...");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200043"); // REPLACED
+ }
this.init(containerId, servletConfig, environment, properties);
- log.info("Pluto portlet container successfully started.");
+ //log.info("Pluto portlet container successfully started.");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200044"); // REPLACED
+ }
}
/**
@@ -122,15 +131,21 @@
if (portletWindow.getPortletEntity() == null)
{
- log.warn("Could not render PortletWindow " + portletWindow.getId()
- + " as it has no PortletEntity defined.");
+ //log.warn("Could not render PortletWindow " + portletWindow.getId()
+ // + " as it has no PortletEntity defined.");
+ Object[] args = new Object[]
+ {portletWindow.getId()};
+ log.log("1200045", args); // REPLACED
return;
}
if (portletWindow.getPortletEntity().getPortletDefinition() == null)
{
- log.warn("Could not render PortletWindow" + portletWindow.getId()
- + " as it has no PortletDefintion defined.");
+ //log.warn("Could not render PortletWindow" + portletWindow.getId()
+ // + " as it has no PortletDefintion defined.");
+ Object[] args = new Object[]
+ {portletWindow.getId()};
+ log.log("1200046", args); // REPLACED
return;
}
pluto.renderPortlet(portletWindow, servletRequest, servletResponse);
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,8 +16,9 @@
*/
package org.apache.jetspeed.container;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -60,7 +61,10 @@
{
if (log.isDebugEnabled())
{
- log.debug(toString() + " is DISABLED");
+ //log.debug(toString() + " is DISABLED");
+ Object[] args = new Object[]
+ {toString()};
+ log.log("1200047", args); // REPLACED
}
}
else
@@ -83,8 +87,9 @@
curPageId);
if (log.isDebugEnabled())
{
- log
- .debug("No previous page Id found in session, setting it for the first time");
+ //log
+ // .debug("No previous page Id found in session, setting it for the first time");
+ log.log("1200048"); // REPLACED
}
}
else
@@ -94,8 +99,9 @@
{
if (log.isDebugEnabled())
{
- log
- .debug("Previous page id is same as current page id, not clearing page state");
+ //log
+ // .debug("Previous page id is same as current page id, not clearing page state");
+ log.log("1200049"); // REPLACED
}
}
else
@@ -104,6 +110,9 @@
{
log.debug("Page Change encountered Current Page:"
+ curPageId + " Prev Page:" + prevPageId);
+ Object[] args = new Object[]
+ {curPageId, prevPageId};
+ log.log("1200050", args); // REPLACED
}
// Make sure we set the prevPageId in session
request.setSessionAttribute(
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -30,8 +30,9 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.ContainerConstants;
import org.apache.jetspeed.container.PortletRequestContext;
@@ -153,10 +154,11 @@
}
catch (IOException e)
{
- log
- .error(
- "LocalPortletInvokerImpl.load() - Error while dispatching portlet.",
- e);
+ //log
+ // .error(
+ // "LocalPortletInvokerImpl.load() - Error while dispatching portlet.",
+ // e);
+ log.log("1200051", e); // REPLACED
throw new PortletException(e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -32,8 +32,9 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
import org.apache.jetspeed.container.ContainerConstants;
@@ -185,10 +186,11 @@
}
catch (IOException e)
{
- log
- .error(
- "ServletPortletInvokerImpl.load() - Error while dispatching portlet.",
- e);
+ //log
+ // .error(
+ // "ServletPortletInvokerImpl.load() - Error while dispatching portlet.",
+ // e);
+ log.log("1200052", e); // REPLACED
throw new PortletException(e);
}
}
@@ -246,10 +248,14 @@
.getContext(portletApplicationName);
if (null == appContext)
{
- String message = "Failed to find Servlet context for Portlet Application: "
- + portletApplicationName;
- log.error(message);
- throw new PortletException(message);
+ //String message = "Failed to find Servlet context for Portlet Application: "
+ // + portletApplicationName;
+ //log.error(message);
+ Object[] args = new Object[]
+ {portletApplicationName};
+ log.log("1200053", args); // REPLACED
+ //throw new PortletException(message);
+ throw new PortletException(log.getString("1200053"));
}
PortletInstance portletInstance = portletFactory.getPortletInstance(
appContext, portletDefinition);
@@ -257,12 +263,16 @@
.getRequestDispatcher(servletMappingName);
if (null == dispatcher)
{
- String message = "Failed to get Request Dispatcher for Portlet Application: "
- + portletApplicationName
- + ", servlet: "
- + servletMappingName;
- log.error(message);
- throw new PortletException(message);
+ //String message = "Failed to get Request Dispatcher for Portlet Application: "
+ // + portletApplicationName
+ // + ", servlet: "
+ // + servletMappingName;
+ //log.error(message);
+ Object[] args = new Object[]
+ {portletApplicationName, servletMappingName};
+ log.log("1200054", args); // REPLACED
+ //throw new PortletException(message);
+ throw new PortletException(log.getString("1200054"));
}
// gather all required data from request and response
@@ -348,12 +358,16 @@
}
catch (Exception e)
{
- String message = "Failed to dispatch.include for Portlet Application: "
- + portletApplicationName
- + ", servlet: "
- + servletMappingName;
- log.error(message, e);
- throw new PortletException(message, e);
+ //String message = "Failed to dispatch.include for Portlet Application: "
+ // + portletApplicationName
+ // + ", servlet: "
+ // + servletMappingName;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {portletApplicationName, servletMappingName};
+ log.log("1200055", args); // REPLACED
+ //throw new PortletException(message, e);
+ throw new PortletException(log.getString("1200055"), e);
}
finally
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/services/log/PlutoLogService.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/services/log/PlutoLogService.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/services/log/PlutoLogService.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,9 +16,10 @@
*/
package org.apache.jetspeed.container.services.log;
-import org.apache.commons.logging.Log;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.logging.LogConfigurationException;
-import org.apache.commons.logging.LogFactory;
import org.apache.pluto.services.log.LogService;
import org.apache.pluto.services.log.Logger;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
/**
* PortalSessionsManagerImpl
@@ -196,12 +196,16 @@
if (portalSession == paSession)
{
// On WebSphere 6.1.0.11, strange symptoms like this occur...
- log
- .warn("servlet context name of paSession("
- + paSession.getId()
- + "): "
- + paSession.getServletContext()
- .getServletContextName());
+ //log
+ // .warn("servlet context name of paSession("
+ // + paSession.getId()
+ // + "): "
+ // + paSession.getServletContext()
+ // .getServletContextName());
+ Object[] args = new Object[]
+ {paSession.getId(),
+ paSession.getServletContext().getServletContextName()};
+ log.log("1200056", args); // REPLACED
return;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,9 +24,10 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.PortalReservedParameters;
@@ -137,7 +138,10 @@
if (buffer.length() > 0)
{
buffer.append("]");
- log.debug("navstate decoded=" + buffer.toString());
+ //log.debug("navstate decoded=" + buffer.toString());
+ Object[] args = new Object[]
+ {buffer.toString()};
+ log.log("1200057", args); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionFullExtendedNavigationalState.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,6 +16,9 @@
*/
package org.apache.jetspeed.container.state.impl;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cache.JetspeedContentCache;
import org.apache.jetspeed.container.PageHistoryValve;
import org.apache.jetspeed.request.RequestContext;
@@ -34,6 +37,9 @@
private boolean clearStateOnPageChangeEnabled = false;
+ protected static final Log log = LogFactory
+ .getLog(SessionFullExtendedNavigationalState.class);
+
public SessionFullExtendedNavigationalState(NavigationalStateCodec codec,
JetspeedContentCache cache)
{
@@ -82,7 +88,10 @@
resetPagePortlets = clearPagePortletsModeAndWindowState(context);
if (log.isDebugEnabled())
{
- log.debug("resetPagePortlets:" + resetPagePortlets);
+ //log.debug("resetPagePortlets:" + resetPagePortlets);
+ Object[] args = new Object[]
+ {resetPagePortlets};
+ log.log("1200058", args); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/SessionNavigationalState.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -21,8 +21,9 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.cache.JetspeedContentCache;
import org.apache.jetspeed.container.state.NavigationalState;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,6 +23,9 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.container.ContainerConstants;
import org.apache.jetspeed.container.state.NavigationalState;
@@ -72,6 +75,8 @@
protected String characterEncoding = "UTF-8";
+ protected static final Log log = LogFactory.getLog(AbstractPortalURL.class);
+
public AbstractPortalURL(NavigationalState navState,
PortalContext portalContext, BasePortalURL base)
{
@@ -136,7 +141,8 @@
}
catch (UnsupportedEncodingException e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200059", e); // REPLACED
return "";
}
}
@@ -151,7 +157,8 @@
}
catch (UnsupportedEncodingException e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200060", e); // REPLACED
return "";
}
}
@@ -294,8 +301,9 @@
catch (UnsupportedEncodingException e)
{
// should never happen
- e.printStackTrace();
+ //e.printStackTrace();
// to keep the compiler happy
+ log.log("1200061", e); // REPLACED
return null;
}
}
@@ -311,8 +319,9 @@
catch (UnsupportedEncodingException e)
{
// should never happen
- e.printStackTrace();
+ // e.printStackTrace();
// to keep the compiler happy
+ log.log("1200062", e); // REPLACED
return null;
}
}
@@ -346,8 +355,9 @@
catch (UnsupportedEncodingException e)
{
// should never happen
- e.printStackTrace();
+ //e.printStackTrace();
// to keep the compiler happy
+ log.log("1200063", e); // REPLACED
return null;
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/DesktopEncodingPortalURL.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/DesktopEncodingPortalURL.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/DesktopEncodingPortalURL.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,6 +24,9 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.state.NavigationalState;
@@ -57,6 +60,9 @@
private String desktopRenderPipelinePath = null;
+ protected static final Log log = LogFactory
+ .getLog(DesktopEncodingPortalURL.class);
+
public DesktopEncodingPortalURL(NavigationalState navState,
PortalContext portalContext, String desktopRenderPipelinePath,
String desktopActionPipelinePath)
@@ -257,8 +263,9 @@
catch (UnsupportedEncodingException e)
{
// should never happen
- e.printStackTrace();
+ //e.printStackTrace();
// to keep the compiler happy
+ log.log("1200064", e); // REPLACED
return null;
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -8,6 +8,9 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.container.state.NavigationalState;
import org.apache.jetspeed.container.url.BasePortalURL;
@@ -16,6 +19,9 @@
public class GlassFishPathInfoEncodingPortalURL extends AbstractPortalURL
{
+ protected static final Log log = LogFactory
+ .getLog(GlassFishPathInfoEncodingPortalURL.class);
+
public GlassFishPathInfoEncodingPortalURL(NavigationalState navState,
PortalContext portalContext, BasePortalURL base)
{
@@ -58,7 +64,8 @@
}
catch (UnsupportedEncodingException e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200065", e); // REPLACED
return "";
}
}
@@ -74,7 +81,8 @@
}
catch (UnsupportedEncodingException e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200066", e); // REPLACED
return "";
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cache.PortletWindowCache;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletentity.PortletEntityNotGeneratedException;
@@ -238,8 +239,15 @@
.getPortletEntityForFragment(fragment, principal);
if (portletEntity == null)
{
- log.info("No portlet entity defined for fragment ID "
- + fragment.getId() + " attempting to auto-generate...");
+ //log.info("No portlet entity defined for fragment ID "
+ // + fragment.getId() + " attempting to auto-generate...");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {fragment.getId()};
+ log.log("1200067", args); // REPLACED
+ }
+
try
{
portletEntity = entityAccessor.generateEntityFromFragment(
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -28,8 +28,9 @@
import java.util.Properties;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.util.Path;
/**
@@ -123,9 +124,15 @@
if (log.isDebugEnabled())
{
- log.debug("BaseDecoration basePath: " + basePath.toString());
- log.debug("BaseDecoration baseClientPath: "
- + baseClientPath.toString());
+ //log.debug("BaseDecoration basePath: " + basePath.toString());
+ Object[] args1 = new Object[]
+ {basePath.toString()};
+ log.log("1200068", args1); // REPLACED
+ //log.debug("BaseDecoration baseClientPath: "
+ // + baseClientPath.toString());
+ Object[] args2 = new Object[]
+ {baseClientPath.toString()};
+ log.log("1200069", args2); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -31,8 +31,9 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.JetspeedCache;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
@@ -196,7 +197,10 @@
+ decorationName + "\""))
+ " specified for page could either not be located or does not support desktop). No desktop compatible "
+ fragment.getType() + " decoration is available.";
- log.error(errMsg);
+ //log.error(errMsg);
+ Object[] args = new Object[]
+ {errMsg};
+ log.log("1200070", args); // REPLACED
}
}
}
@@ -321,19 +325,25 @@
}
else
{
- log.warn("Could not locate the " + Decoration.CONFIG_FILE_NAME
- + " configuration file for decoration \"" + name
- + "\". This decoration may not exist.");
+ //log.warn("Could not locate the " + Decoration.CONFIG_FILE_NAME
+ // + " configuration file for decoration \"" + name
+ // + "\". This decoration may not exist.");
+ Object[] args = new Object[]
+ {Decoration.CONFIG_FILE_NAME, name};
+ log.log("1200071", args); // REPLACED
props.setProperty("id", name);
props.setProperty("name", name);
}
}
catch (Exception e)
{
- log
- .warn("Failed to load the " + Decoration.CONFIG_FILE_NAME
- + " configuration file for decoration \"" + name
- + "\".", e);
+ //log
+ // .warn("Failed to load the " + Decoration.CONFIG_FILE_NAME
+ // + " configuration file for decoration \"" + name
+ // + "\".", e);
+ Object[] args = new Object[]
+ {Decoration.CONFIG_FILE_NAME, name};
+ log.log("1200072", args, e); // REPLACED
props.setProperty("id", name);
props.setProperty("name", name);
}
@@ -347,7 +357,8 @@
}
catch (IOException e)
{
- log.warn("Failed to close decoration configuration.", e);
+ //log.warn("Failed to close decoration configuration.", e);
+ log.log("1200073", e); // REPLACED
}
}
String decorationIdPropVal = props.getProperty("id");
@@ -389,19 +400,25 @@
}
else
{
- log.debug("Could not locate the "
- + Decoration.CONFIG_DESKTOP_FILE_NAME
- + " configuration file for decoration \"" + name
- + "\". This decoration may not exist.");
+ //.debug("Could not locate the "
+ // + Decoration.CONFIG_DESKTOP_FILE_NAME
+ // + " configuration file for decoration \"" + name
+ // + "\". This decoration may not exist.");
+ Object[] args = new Object[]
+ {Decoration.CONFIG_DESKTOP_FILE_NAME, name};
+ log.log("1200074", args); // REPLACED
}
}
catch (Exception e)
{
- log
- .warn("Failed to load the "
- + Decoration.CONFIG_DESKTOP_FILE_NAME
- + " configuration file for decoration \"" + name
- + "\".", e);
+ //log
+ // .warn("Failed to load the "
+ // + Decoration.CONFIG_DESKTOP_FILE_NAME
+ // + " configuration file for decoration \"" + name
+ // + "\".", e);
+ Object[] args = new Object[]
+ {Decoration.CONFIG_DESKTOP_FILE_NAME, name};
+ log.log("1200075", args, e); // REPLACED
}
finally
{
@@ -413,10 +430,11 @@
}
catch (IOException e)
{
- log
- .warn(
- "Failed to close decoration desktop configuration.",
- e);
+ //log
+ // .warn(
+ // "Failed to close decoration desktop configuration.",
+ // e);
+ log.log("1200076"); // REPLACED
}
}
if (props.getProperty(Decoration.DESKTOP_SUPPORTED_PROPERTY) == null)
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -26,8 +26,9 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.cache.CacheElement;
@@ -349,10 +350,13 @@
}
catch (Exception e)
{
- log.error(
- "Failed to instantiate custom DecoratorActionsAdaptor "
- + decoratorActionsAdapterClassName
- + ", falling back to default.", e);
+ //log.error(
+ // "Failed to instantiate custom DecoratorActionsAdaptor "
+ // + decoratorActionsAdapterClassName
+ // + ", falling back to default.", e);
+ Object[] args = new Object[]
+ {decoratorActionsAdapterClassName};
+ log.log("1200077", args, e); // REPLACED
adapter = (DecoratorActionsFactory) decoratorActionsAdapterCache
.get(defaultDecoratorActionsFactory.getClass()
.getName());
@@ -633,7 +637,8 @@
}
catch (Exception e)
{
- log.warn("Unable to initalize PageLayout actions", e);
+ //log.warn("Unable to initalize PageLayout actions", e);
+ log.log("1200078", e); // REPLACED
pageModes = null;
}
@@ -693,8 +698,11 @@
}
catch (Exception e)
{
- log.warn("Unable to initalize actions for fragment "
- + fragment.getId(), e);
+ //log.warn("Unable to initalize actions for fragment "
+ // + fragment.getId(), e);
+ Object[] args = new Object[]
+ {fragment.getId()};
+ log.log("1200079", args, e); // REPLACED
}
return fragmentSupportsActions;
}
@@ -753,8 +761,11 @@
}
catch (Exception e)
{
- log.warn("Unable to initalize actions for fragment "
- + fragment.getId(), e);
+ //log.warn("Unable to initalize actions for fragment "
+ // + fragment.getId(), e);
+ Object[] args = new Object[]
+ {fragment.getId()};
+ log.log("1200080", args, e); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/PageActionAccess.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/PageActionAccess.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/PageActionAccess.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.om.page.Page;
@@ -134,7 +135,10 @@
}
catch (IndexOutOfBoundsException e)
{
- log.error("Unknown action: " + action, e);
+ //log.error("Unknown action: " + action, e);
+ Object[] args = new Object[]
+ {action};
+ log.log("1200081", args, e); // REPLACED
return false;
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,9 +25,10 @@
import java.util.Iterator;
import java.util.List;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
import org.apache.jetspeed.deployment.DeploymentException;
@@ -101,7 +102,13 @@
if (id == null) { throw new DeploymentException(
"Unable to deploy decorator, \"id\" attribute not defined in configuration"); }
- log.info("Found decorator deployment archive " + id);
+ //log.info("Found decorator deployment archive " + id);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {id};
+ log.log("1200082", args); // REPLACED
+ }
try
{
@@ -118,7 +125,14 @@
}
// redeploy/deploy decorator w/o META_INF jar metadata
- log.info("Deploying decorator " + id + " to " + deployPath);
+ //log.info("Deploying decorator " + id + " to " + deployPath);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {id, deployPath};
+ log.log("1200083", args); // REPLACED
+ }
+
JarExpander.expand(event.getDeploymentObject().getFile(),
deployPathFile);
File metaInf = new File(deployPathFile, "META-INF");
@@ -142,8 +156,15 @@
File deployToPathFile = new File(baseDeployPath
+ localeDeployPathFile.getPath().substring(
deployPath.length()) + File.separator + id);
- log.info("Deploying locale specific decorator component to "
- + deployToPathFile.getPath());
+ //log.info("Deploying locale specific decorator component to "
+ // + deployToPathFile.getPath());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {deployToPathFile.getPath()};
+ log.log("1200084", args); // REPLACED
+ }
+
// TODO Findbugs
deployToPathFile.mkdirs();
@@ -182,7 +203,14 @@
}
}
- log.info("Decorator " + id + " deployed successfuly.");
+ //log.info("Decorator " + id + " deployed successfuly.");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {id};
+ log.log("1200085", args); // REPLACED
+ }
+
event.setStatus(DeploymentStatus.STATUS_OKAY);
}
catch (DeploymentException de)
@@ -219,8 +247,14 @@
try
{
// undeploy decorator
- log.info("Undeploying decorator " + id + " at "
- + deployPathFile.getAbsolutePath());
+ //log.info("Undeploying decorator " + id + " at "
+ // + deployPathFile.getAbsolutePath());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {id, deployPathFile.getAbsolutePath()};
+ log.log("1200086", args); // REPLACED
+ }
// detect language/country localized decorator components
final List localeSpecificDeployPathsList = getLocaleSpecificDeployPaths(deployPathFile
@@ -234,9 +268,15 @@
(File) localeSpecificDeployPathsList.get(i), id);
if (localeDeployPathFile.exists())
{
- log
- .info("Undeploying locale specific decorator component at "
- + localeDeployPathFile.getPath());
+ //log
+ // .info("Undeploying locale specific decorator component at "
+ // + localeDeployPathFile.getPath());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {localeDeployPathFile.getPath()};
+ log.log("1200087", args); // REPLACED
+ }
DirectoryHelper cleanup = new DirectoryHelper(
localeDeployPathFile);
cleanup.remove();
@@ -251,7 +291,13 @@
cleanup.remove();
cleanup.close();
- log.info("Decorator " + id + " undeployed successfuly.");
+ //log.info("Decorator " + id + " undeployed successfuly.");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {id};
+ log.log("1200088", args); // REPLACED
+ }
}
catch (Exception e)
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
@@ -177,7 +178,10 @@
// to be seen as local app from testcases resulting in an exception
if (!new File(localApps[i], "WEB-INF/portlet.xml").exists())
{
- log.warn("Not a local application " + localApps[i].getName());
+ //log.warn("Not a local application " + localApps[i].getName());
+ Object[] args = new Object[]
+ {localApps[i].getName()};
+ log.log("1200089", args); // REPLACED
}
else
{
@@ -191,8 +195,11 @@
}
catch (Exception e)
{
- log.error("Failed to start Local Portlet Application "
- + localApps[i], e);
+ //log.error("Failed to start Local Portlet Application "
+ // + localApps[i], e);
+ Object[] args = new Object[]
+ {localApps[i]};
+ log.log("1200090", args, e); // REPLACED
}
}
}
@@ -290,8 +297,14 @@
webInfClasses = new File(paDir, ("WEB-INF/classes/"));
if (webInfClasses.exists())
{
- log.info("Adding " + webInfClasses.toURL()
- + " to class path for Local PA " + paDir.getName());
+ //log.info("Adding " + webInfClasses.toURL()
+ // + " to class path for Local PA " + paDir.getName());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {webInfClasses.toURL(), paDir.getName()};
+ log.log("1200091", args); // REPLACED
+ }
urls.add(webInfClasses.toURL());
}
@@ -304,8 +317,14 @@
for (int i = 0; i < jars.length; i++)
{
File jar = jars[i];
- log.info("Adding " + jar.toURL()
- + " to class path for Local PA " + paDir.getName());
+ //log.info("Adding " + jar.toURL()
+ // + " to class path for Local PA " + paDir.getName());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {jar.toURL(), paDir.getName()};
+ log.log("1200092", args); // REPLACED
+ }
urls.add(jar.toURL());
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -27,6 +27,9 @@
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentException;
@@ -53,6 +56,9 @@
private String jettyContextsDir;
+ protected static final Log log = LogFactory
+ .getLog(JettyDeployPortletAppEventListener.class);
+
public JettyDeployPortletAppEventListener(PortletApplicationManagement pam,
PortletRegistry registry, String webAppDir, String localAppDir,
boolean stripLoggers, String jettyContextsDir)
@@ -243,7 +249,11 @@
String target = src.getName();
if ("META-INF/jetspeed-jetty-context.xml".equals(target))
{
- System.out.println("Found jetspeed-jetty-context.xml");
+ //System.out.println("Found jetspeed-jetty-context.xml");
+ if (log.isDebugEnabled())
+ {
+ log.log("1200093"); // REPLACED
+ }
source = jin.getInputStream(src);
return parseJettyContext(source);
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -27,8 +27,9 @@
import java.util.Iterator;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
@@ -110,18 +111,33 @@
public void start()
{
- log.info("Starting auto deployment service: " + getClass().getName());
+ //log.info("Starting auto deployment service: " + getClass().getName());
- log.info("Deployment scanning delay: " + scanningDelay);
+ //log.info("Deployment scanning delay: " + scanningDelay);
- log.info("Deployment staging directory: " + stagingDirectories);
+ //log.info("Deployment staging directory: " + stagingDirectories);
+ if (log.isInfoEnabled())
+ {
+ Object[] args1 = new Object[]
+ {getClass().getName()};
+ log.log("1200094", args1); // REPLACED
+ Object[] args2 = new Object[]
+ {scanningDelay};
+ log.log("1200095", args2); // REPLACED
+ Object[] args3 = new Object[]
+ {stagingDirectories};
+ log.log("1200096", args3); // REPLACED
+ }
for (int i = 0; i < stagingDirectoriesAsFiles.length; i++)
{
if (!stagingDirectoriesAsFiles[i].exists())
{
- log.error(stagingDirectoriesAsFiles[i].getAbsolutePath()
- + " does not exist, auto deployment disabled.");
+ //log.error(stagingDirectoriesAsFiles[i].getAbsolutePath()
+ // + " does not exist, auto deployment disabled.");
+ Object[] args = new Object[]
+ {stagingDirectoriesAsFiles[i].getAbsolutePath()};
+ log.log("1200097", args); // REPLACED
stop();
return;
}
@@ -146,14 +162,21 @@
// getContextClassLoader());
scanner.setContextClassLoader(getClass().getClassLoader());
scanner.start();
- log.info("Deployment scanner successfuly started!");
+ //log.info("Deployment scanner successfuly started!");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200098"); // REPLACED
+ }
}
catch (Exception e)
{
- log
- .warn(
- "Unable to intialize Catalina Portlet Application Manager. Auto deployment will be disabled: "
- + e.toString(), e);
+ //log
+ // .warn(
+ // "Unable to intialize Catalina Portlet Application Manager. Auto deployment will be disabled: "
+ // + e.toString(), e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1200099", args, e); // REPLACED
stop();
return;
@@ -161,8 +184,14 @@
}
else
{
- log.info("Scanning delay set to " + scanningDelay
- + " has disabled automatic scanning of staging directory.");
+ //log.info("Scanning delay set to " + scanningDelay
+ // + " has disabled automatic scanning of staging directory.");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {scanningDelay};
+ log.log("1200100", args); // REPLACED
+ }
}
}
@@ -233,12 +262,21 @@
{
if (aFile.exists())
{
- log.info("File: " + aFile.getAbsolutePath()
- + " deployed");
+ //log.info("File: " + aFile.getAbsolutePath()
+ // + " deployed");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {aFile.getAbsolutePath()};
+ log.log("1200101", args); // REPLACED
+ }
boolean result = aFile.delete();
if (!result)
{
- log.error("Failed to remove: " + aFile);
+ //log.error("Failed to remove: " + aFile);
+ Object[] args = new Object[]
+ {aFile};
+ log.log("1200102", args); // REPLACED
}
}
}
@@ -247,19 +285,28 @@
if (status == null
|| status.getStatus() == DeploymentStatus.STATUS_EVAL)
{
- log
- .warn("Unrecognized file "
- + aFile.getAbsolutePath());
+ //log
+ // .warn("Unrecognized file "
+ // + aFile.getAbsolutePath());
+ Object[] args = new Object[]
+ {aFile.getAbsolutePath()};
+ log.log("1200103", args); // REPLACED
}
else if (de != null)
{
- log.error("Failure deploying "
- + aFile.getAbsolutePath(), de);
+ //log.error("Failure deploying "
+ // + aFile.getAbsolutePath(), de);
+ Object[] args = new Object[]
+ {aFile.getAbsolutePath()};
+ log.log("1200104", args, de); // REPLACED
}
else
{
- log.error("Failure deploying "
- + aFile.getAbsolutePath());
+ //log.error("Failure deploying "
+ // + aFile.getAbsolutePath());
+ Object[] args = new Object[]
+ {aFile.getAbsolutePath()};
+ log.log("1200105", args); // REPLACED
}
// DONE Findbugs
// ignoredFiles.put(aFile.getAbsolutePath(), new Long(aFile
@@ -296,7 +343,10 @@
}
catch (DeploymentException e)
{
- log.error(e.getMessage(), e);
+ //log.error(e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200106", args, e); // REPLACED
event.setStatus(DeploymentStatus.STATUS_FAILED);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopEncoderRedirectValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.desktop.JetspeedDesktop;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,8 +25,9 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.JetspeedCache;
@@ -307,8 +308,9 @@
if (this.desktopServletPath == null
|| this.desktopServletPath.length() == 0)
{
- log
- .warn("JetspeedDesktopImpl initialization is incomplete due to undefined desktop servlet path.");
+ //log
+ // .warn("JetspeedDesktopImpl initialization is incomplete due to undefined desktop servlet path.");
+ log.log("1200107"); // REPLACED
this.desktopServletPath = null;
}
@@ -457,10 +459,13 @@
}
else
{
- log
- .error("Failed to find desktop layout decoration "
- + layoutDecorationName
- + " - layout decoration properties cannot be added to content.");
+ //log
+ // .error("Failed to find desktop layout decoration "
+ // + layoutDecorationName
+ // + " - layout decoration properties cannot be added to content.");
+ Object[] args = new Object[]
+ {layoutDecorationName};
+ log.log("1200108", args); // REPLACED
}
Set desktopPortletDecorationsNames = decorationFactory
@@ -776,9 +781,12 @@
layoutDecorationTemplatePath = (layoutDecorationTemplatePath == null
|| layoutDecorationTemplatePath.length() == 0 ? "null"
: layoutDecorationTemplatePath);
- log.error(
- "Failed to include desktop layout decoration at path "
- + layoutDecorationTemplatePath, e);
+ //log.error(
+ // "Failed to include desktop layout decoration at path "
+ // + layoutDecorationTemplatePath, e);
+ Object[] args = new Object[]
+ {layoutDecorationTemplatePath};
+ log.log("1200109", args, e); // REPLACED
request.getResponse().getWriter().println(
"Desktop layout decoration "
+ layoutDecorationTemplatePath
@@ -786,10 +794,11 @@
}
else
{
- log
- .error(
- "Failed to initialize for inclusion of desktop layout decoration",
- e);
+ //log
+ // .error(
+ // "Failed to initialize for inclusion of desktop layout decoration",
+ // e);
+ log.log("1200110", e); // REPLACED
request
.getResponse()
.getWriter()
@@ -799,10 +808,11 @@
}
catch (IOException ioe)
{
- log
- .error(
- "Failed to write desktop layout decoration exception information to servlet output writer",
- ioe);
+ //log
+ // .error(
+ // "Failed to write desktop layout decoration exception information to servlet output writer",
+ // ioe);
+ log.log("1200111", ioe); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -35,8 +35,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
@@ -566,12 +567,21 @@
{
value = context.getUserInfoMap(portletAppDef.getId());
if (log.isDebugEnabled() && (null != value))
- log.debug(PortletRequest.USER_INFO + " map size: "
- + ((Map) value).size());
+ {
+ //log.debug(PortletRequest.USER_INFO + " map size: "
+ // + ((Map) value).size());
+ Object[] args = new Object[]
+ {PortletRequest.USER_INFO, ((Map) value).size()};
+ log.log("1200112", args); // REPLACED
+ }
+
}
else
{
- log.error("Entity is null:" + entityID);
+ //log.error("Entity is null:" + entityID);
+ Object[] args = new Object[]
+ {entityID};
+ log.log("1200113", args); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,8 +25,9 @@
import javax.sql.DataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.springframework.jdbc.support.JdbcUtils;
/**
@@ -88,8 +89,9 @@
{
if (isDebugEnabled)
{
- log
- .debug("Starting method: DatasourceAvailableHealthCheckValidator.validate()");
+ //log
+ // .debug("Starting method: DatasourceAvailableHealthCheckValidator.validate()");
+ log.log("1200114"); // REPLACED
}
HealthCheckValidatorResult result = new HealthCheckValidatorResult();
boolean allDataSourcesStatus = true;
@@ -107,7 +109,10 @@
messages.append(dbName + ":");
if (isDebugEnabled)
{
- log.debug("Database: " + dbName);
+ //log.debug("Database: " + dbName);
+ Object[] args = new Object[]
+ {dbName};
+ log.log("1200115", args); // REPLACED
}
DataSourcesValidationBean dsBean = (DataSourcesValidationBean) resources
.get(dbName);
@@ -167,7 +172,8 @@
{
// if any exceptions occur, even runtime exceptions, return a failed
// result
- log.error("Exception while running the datasource validator", e);
+ //log.error("Exception while running the datasource validator", e);
+ log.log("1200116", e); // REPLACED
result
.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED);
messages
@@ -176,7 +182,10 @@
}
if (isDebugEnabled)
{
- log.debug(messages.toString());
+ //log.debug(messages.toString());
+ Object[] args = new Object[]
+ {messages.toString()};
+ log.log("1200117", args); // REPLACED
}
result.setResultMessage(messages.toString());
return result;
@@ -207,7 +216,8 @@
catch (SQLException ex)
{
dsStatus = false;
- log.error("The datasource is not available", ex);
+ //log.error("The datasource is not available", ex);
+ log.log("1200118", ex); // REPLACED
}
finally
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
@@ -103,7 +104,10 @@
String paName = (String) it.next();
if (isDebugEnabled)
{
- log.debug("Checking portlet application: " + paName);
+ //log.debug("Checking portlet application: " + paName);
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200119", args); // REPLACED
}
if (messages.length() > 0)
{
@@ -138,10 +142,11 @@
{
// if any exceptions occur, even runtime exceptions, return a failed
// result
- log
- .error(
- "Exception while running the portlet application validator",
- e);
+ //log
+ // .error(
+ // "Exception while running the portlet application validator",
+ // e);
+ log.log("1200120"); // REPLACED
result
.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED);
messages
@@ -150,7 +155,10 @@
}
if (isDebugEnabled)
{
- log.debug(messages.toString());
+ //log.debug(messages.toString());
+ Object[] args = new Object[]
+ {messages.toString()};
+ log.log("1200121", args); // REPLACED
}
result.setResultMessage(messages.toString());
return result;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -131,9 +132,12 @@
}
catch (Exception ex)
{
- log.error(
- "Failure to construct nested context for fragment "
- + layoutId, ex);
+ //log.error(
+ // "Failure to construct nested context for fragment "
+ // + layoutId, ex);
+ Object[] args = new Object[]
+ {layoutId};
+ log.log("1200122", args, ex); // REPLACED
success = false;
resultMap
.put(REASON,
@@ -165,8 +169,11 @@
}
catch (Exception ex)
{
- log.error("Failure to locate copy of fragment "
- + layoutId, ex);
+ //log.error("Failure to locate copy of fragment "
+ // + layoutId, ex);
+ Object[] args = new Object[]
+ {layoutId};
+ log.log("1200123", args, ex); // REPLACED
success = false;
resultMap.put(REASON,
"Failed to find new fragment for specified layout id: "
@@ -207,7 +214,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while adding a portlet", e);
+ //log.error("exception while adding a portlet", e);
+ log.log("1200124", e); // REPLACED
resultMap.put(REASON, e.toString());
// Return a failure indicator
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,8 +20,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.ajax.AJAXException;
@@ -273,7 +274,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while changing portlet/page action", e);
+ //log.error("exception while changing portlet/page action", e);
+ log.log("1200125", e); // REPLACED
resultMap.put(REASON, e.toString());
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,8 +20,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -150,8 +151,9 @@
catch (Exception e)
{
// Log the exception
- e.printStackTrace();
- log.error("exception while getting folder info", e);
+ //e.printStackTrace();
+ //log.error("exception while getting folder info", e);
+ log.log("1200126", e); // REPLACED
resultMap.put(STATUS, "failure");
resultMap.put(REASON, e.getMessage());
// Return a failure indicator
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -146,8 +147,9 @@
catch (Exception e)
{
// Log the exception
- e.printStackTrace();
- log.error("exception while getting folder info", e);
+ //e.printStackTrace();
+ //log.error("exception while getting folder info", e);
+ log.log("1200127", e); // REPLACED
// Return a failure indicator
success = false;
@@ -265,7 +267,8 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200128", e); // REPLACED
return false;
}
finally
@@ -305,7 +308,8 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1200129", e); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -70,7 +71,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting folder info", e);
+ //log.error("exception while getting folder info", e);
+ log.log("1200130", e); // REPLACED
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderListAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -94,7 +95,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting theme info", e);
+ //log.error("exception while getting theme info", e);
+ log.log("1200131", e); // REPLACED
// Return a failure indicator
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -79,7 +80,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting theme info", e);
+ //log.error("exception while getting theme info", e);
+ log.log("1200132", e); // REPLACED
// Return a failure indicator
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -71,7 +72,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting link info", e);
+ //log.error("exception while getting link info", e);
+ log.log("1200133", e); // REPLACED
resultMap.put(REASON, e.getMessage());
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -118,7 +119,8 @@
}
catch (Exception e)
{
- log.error("Exception while getting page menus info", e);
+ //log.error("Exception while getting page menus info", e);
+ log.log("1200134", e); // REPLACED
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -150,7 +151,8 @@
}
catch (Exception e)
{
- log.error("Exception while getting page menus info", e);
+ //log.error("Exception while getting page menus info", e);
+ log.log("1200135", e); // REPLACED
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -21,8 +21,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -213,7 +214,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting page", e);
+ //log.error("exception while getting page", e);
+ log.log("1200136", e); // REPLACED
// Return a failure indicator
success = false;
@@ -278,9 +280,12 @@
}
else if (portletDef == null)
{
- log
- .error("GetPageAction could not obtain PortletDefinition for portlet "
- + portletName);
+ //log
+ // .error("GetPageAction could not obtain PortletDefinition for portlet "
+ // + portletName);
+ Object[] args = new Object[]
+ {portletName};
+ log.log("1200137", args); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -79,7 +80,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting portlet info", e);
+ //log.error("exception while getting portlet info", e);
+ log.log("1200138", e); // REPLACED
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.ArrayList;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -132,7 +133,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting actions for a fragment", e);
+ //log.error("exception while getting actions for a fragment", e);
+ log.log("1200139", e); // REPLACED
resultMap.put(REASON, e.toString());
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,9 +25,10 @@
import java.util.Locale;
import java.util.Map;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -108,7 +109,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting portlet info", e);
+ //log.error("exception while getting portlet info", e);
+ log.log("1200140", e); // REPLACED
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -90,7 +91,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while getting theme info", e);
+ //log.error("exception while getting theme info", e);
+ log.log("1200141", e); // REPLACED
// Return a failure indicator
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -26,8 +26,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
@@ -116,7 +117,8 @@
}
catch (Exception e)
{
- log.error("exception with user account access", e);
+ //log.error("exception with user account access", e);
+ log.log("1200142"); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -26,8 +26,9 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -309,7 +310,8 @@
// TODO Findbugs
catch (Exception e)
{
- log.error("exception statistics access", e);
+ //log.error("exception statistics access", e);
+ log.log("1200143", e); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -240,9 +241,12 @@
}
catch (Exception ex)
{
- log.error(
- "Failure to construct nested context for fragment "
- + moveFragmentId, ex);
+ //log.error(
+ // "Failure to construct nested context for fragment "
+ // + moveFragmentId, ex);
+ Object[] args = new Object[]
+ {moveFragmentId};
+ log.log("1200144", args, ex); // REPLACED
success = false;
resultMap.put(REASON,
"Cannot construct nested context for fragment");
@@ -278,8 +282,11 @@
}
catch (Exception ex)
{
- log.error("Failure to locate copy of fragment "
- + moveFragmentId, ex);
+ //log.error("Failure to locate copy of fragment "
+ // + moveFragmentId, ex);
+ Object[] args = new Object[]
+ {moveFragmentId};
+ log.log("1200145", args, ex); // REPLACED
success = false;
resultMap.put(REASON,
"Failed to find new fragment for portlet id: "
@@ -314,9 +321,12 @@
}
catch (Exception ex)
{
- log.error(
- "Failure to locate copy of destination fragment "
- + moveToLayoutFragment.getId(), ex);
+ //log.error(
+ // "Failure to locate copy of destination fragment "
+ // + moveToLayoutFragment.getId(), ex);
+ Object[] args = new Object[]
+ {moveToLayoutFragment.getId()};
+ log.log("1200146", args, ex); // REPLACED
success = false;
resultMap.put(REASON,
"Failed to find copy of destination fragment");
@@ -372,7 +382,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while moving a portlet", e);
+ //log.error("exception while moving a portlet", e);
+ log.log("1200147", e); // REPLACED
resultMap.put(REASON, e.toString());
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -316,12 +316,14 @@
}
else
{
- log.error("could not create builder context");
+ //log.error("could not create builder context");
+ log.log("1200148"); // REPLACED
}
}
catch (Exception e)
{
- log.error("builder failed", e);
+ //log.error("builder failed", e);
+ log.log("1200149", e); // REPLACED
p_oInputMap.put(Constants.REASON, e.toString());
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/NestedFragmentContext.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.layout.PortletPlacementException;
import org.apache.jetspeed.om.page.Fragment;
@@ -120,28 +121,44 @@
}
catch (PortletPlacementException ppex)
{
- log
- .error(
- "getFragmentOnNewPage failure to locate fragment on new page (index="
- + i
- + ") :"
- + eol
- + this.toString()
- + (placement != null ? (eol + placement
- .dumpFragments(null)) : "")
- + eol, ppex);
+ //log
+ // .error(
+ // "getFragmentOnNewPage failure to locate fragment on new page (index="
+ // + i
+ // + ") :"
+ // + eol
+ // + this.toString()
+ // + (placement != null ? (eol + placement
+ // .dumpFragments(null)) : "")
+ // + eol, ppex);
+ Object[] args = new Object[]
+ {
+ i,
+ eol
+ + this.toString()
+ + (placement != null ? (eol + placement
+ .dumpFragments(null)) : "") + eol,};
+ log.log("1200150", args, ppex); // REPLACED
throw ppex;
}
catch (RuntimeException ex)
{
- log.error(
- "getFragmentOnNewPage failure to locate fragment on new page (index="
- + i
- + ") :"
- + eol
+ //log.error(
+ // "getFragmentOnNewPage failure to locate fragment on new page (index="
+ // + i
+ // + ") :"
+ // + eol
+ // + this.toString()
+ // + (placement != null ? (eol + placement
+ // .dumpFragments(null)) : "") + eol, ex);
+ Object[] args = new Object[]
+ {
+ i,
+ eol
+ this.toString()
+ (placement != null ? (eol + placement
- .dumpFragments(null)) : "") + eol, ex);
+ .dumpFragments(null)) : "") + eol};
+ log.log("1200151", args, ex); // REPLACED
throw ex;
}
if (nextFragment == null) { throw new PortletPlacementException(
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.security.Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.administration.PortalConfiguration;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
@@ -72,8 +73,11 @@
Principal principal = context.getRequest().getUserPrincipal();
String userName = this.guest;
if (principal != null) userName = principal.getName();
- log.warn("Insufficient access to page " + page.getPath()
- + " by user " + userName);
+ //log.warn("Insufficient access to page " + page.getPath()
+ // + " by user " + userName);
+ Object[] args = new Object[]
+ {page.getPath(), userName};
+ log.log("1200152", args); // REPLACED
return false;
}
return true;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathBehavior.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,8 +16,9 @@
*/
package org.apache.jetspeed.layout.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.om.folder.Folder;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.layout.Coordinate;
import org.apache.jetspeed.layout.PortletPlacementContext;
@@ -450,7 +451,13 @@
public Fragment debugFragments(String debug)
{
- log.info(dumpFragments(debug));
+ //log.info(dumpFragments(debug));
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {debug};
+ log.log("1200153", args); // REPLACED
+ }
return layoutContainerFragment;
}
@@ -890,9 +897,14 @@
if (!"layout".equals(layoutFragment.getType()))
{
if (!suppressErrorLogging)
- log.error("getColumnCountAndSizes not a layout fragment - "
- + layoutFragment.getId() + " type="
- + layoutFragment.getType());
+ {
+ //log.error("getColumnCountAndSizes not a layout fragment - "
+ // + layoutFragment.getId() + " type="
+ // + layoutFragment.getType());
+ Object[] args = new Object[]
+ {layoutFragment.getId(), layoutFragment.getType()};
+ log.log("1200154", args); // REPLACED
+ }
}
else
{ // get layout fragment sizes
@@ -943,30 +955,50 @@
}
} while (startPos < sizesLen && sepPos != -1);
if (!suppressErrorLogging && columnCount <= 0)
- log.error("getColumnCountAndSizes invalid columnCount - "
- + layoutFragment.getId() + " / " + layoutName
- + " count=" + columnCount + " sizes=" + sizesVal);
+ {
+ //log.error("getColumnCountAndSizes invalid columnCount - "
+ // + layoutFragment.getId() + " / " + layoutName
+ // + " count=" + columnCount + " sizes=" + sizesVal);
+ Object[] args = new Object[]
+ {layoutFragment.getId(), layoutName, columnCount, sizesVal};
+ log.log("1200155", args); // REPLACED
+ }
}
else if (paramSet == null)
{
if (!suppressErrorLogging)
{
if (layoutName == null)
- log
- .error("getColumnCountAndSizes null sizes, null layoutName - "
- + layoutFragment.getId());
+ {
+ //log
+ // .error("getColumnCountAndSizes null sizes, null layoutName - "
+ // + layoutFragment.getId());
+ Object[] args = new Object[]
+ {layoutFragment.getId()};
+ log.log("1200156", args); // REPLACED
+ }
else if (portletDef == null)
- log
- .error("getColumnCountAndSizes null sizes, null PortletDefinition - "
- + layoutFragment.getId()
- + " / "
- + layoutName);
+ {
+ //log
+ // .error("getColumnCountAndSizes null sizes, null PortletDefinition - "
+ // + layoutFragment.getId()
+ // + " / "
+ // + layoutName);
+ Object[] args = new Object[]
+ {layoutFragment.getId(), layoutName};
+ log.log("1200157", args); // REPLACED
+ }
else
- log
- .error("getColumnCountAndSizes null sizes, null ParameterSet - "
- + layoutFragment.getId()
- + " / "
- + layoutName);
+ {
+ //log
+ // .error("getColumnCountAndSizes null sizes, null ParameterSet - "
+ // + layoutFragment.getId()
+ // + " / "
+ // + layoutName);
+ Object[] args = new Object[]
+ {layoutFragment.getId(), layoutName};
+ log.log("1200158", args); // REPLACED
+ }
}
}
else
@@ -1016,11 +1048,16 @@
else
{
if (!suppressErrorLogging)
- log
- .error("getColumnCountAndSizes null sizes, columns not defined in ParameterSet - "
- + layoutFragment.getId()
- + " / "
- + layoutName);
+ {
+ //log
+ // .error("getColumnCountAndSizes null sizes, columns not defined in ParameterSet - "
+ // + layoutFragment.getId()
+ // + " / "
+ // + layoutName);
+ Object[] args = new Object[]
+ {layoutFragment.getId(), layoutName};
+ log.log("1200159", args); // REPLACED
+ }
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -115,9 +116,12 @@
}
catch (Exception ex)
{
- log.error(
- "Failure to construct nested context for fragment "
- + portletId, ex);
+ //log.error(
+ // "Failure to construct nested context for fragment "
+ // + portletId, ex);
+ Object[] args = new Object[]
+ {portletId};
+ log.log("1200160", args, ex); // REPLACED
success = false;
resultMap.put(REASON,
"Cannot construct nested context for fragment");
@@ -144,9 +148,12 @@
}
catch (Exception ex)
{
- log.error(
- "Failure to locate copy of fragment " + portletId,
- ex);
+ //log.error(
+ // "Failure to locate copy of fragment " + portletId,
+ // ex);
+ Object[] args = new Object[]
+ {portletId};
+ log.log("1200161", args, ex); // REPLACED
success = false;
resultMap.put(REASON,
"Failed to find new fragment for portlet id: "
@@ -191,7 +198,8 @@
catch (Exception e)
{
// Log the exception
- log.error("exception while adding a portlet", e);
+ //log.error("exception while adding a portlet", e);
+ log.log("1200162", e); // REPLACED
resultMap.put(REASON, e.toString());
// Return a failure indicator
success = false;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/RolesSecurityBehavior.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.request.RequestContext;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -22,8 +22,9 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -71,7 +72,11 @@
public boolean run(RequestContext requestContext, Map resultMap)
throws AJAXException
{
- System.out.println("SecurityConstraintsAction run");
+ //System.out.println("SecurityConstraintsAction run");
+ if (log.isDebugEnabled())
+ {
+ log.log("1200163"); // REPLACED
+ }
boolean success = true;
String status = "success";
try
@@ -118,16 +123,29 @@
}
catch (Exception e)
{
- System.out
- .println("SecurityConstraintsAction run failure caused by "
- + e.getClass().getName() + " " + e.getMessage());
- e.printStackTrace();
- log.error("exception administering portal permissions", e);
+ //System.out
+ // .println("SecurityConstraintsAction run failure caused by "
+ // + e.getClass().getName() + " " + e.getMessage());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {e.getClass().getName(), e.getMessage()};
+ log.log("1200164", args); // REPLACED
+ }
+ //e.printStackTrace();
+ //log.error("exception administering portal permissions", e);
+ log.log("1200165"); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
- System.out.println("SecurityConstraintsAction complete "
- + resultMap.toString());
+ //System.out.println("SecurityConstraintsAction complete "
+ // + resultMap.toString());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {resultMap.toString()};
+ log.log("1200166", args); // REPLACED
+ }
return success;
}
@@ -158,8 +176,12 @@
protected int updateConstraintDefinition(RequestContext requestContext,
Map resultMap) throws AJAXException
{
- System.out
- .println("SecurityConstraintsAction updateConstraintDefinition started");
+ //System.out
+ // .println("SecurityConstraintsAction updateConstraintDefinition started");
+ if (log.isDebugEnabled())
+ {
+ log.log("1200167"); // REPLACED
+ }
int count = 0;
boolean added = false;
@@ -241,13 +263,16 @@
// TODO Findbugs
catch (Exception e)
{
- System.out
- .println("SecurityConstraintsAction updateConstraintDefinition failure caused by "
- + e.getClass().getName() + " " + e.getMessage());
- e.printStackTrace();
- log.error(
- "SecurityConstraintsAction updateConstraintDefinition failure caused by "
- + e.getClass().getName() + " " + e.getMessage(), e);
+ //System.out
+ // .println("SecurityConstraintsAction updateConstraintDefinition failure caused by "
+ // + e.getClass().getName() + " " + e.getMessage());
+ //e.printStackTrace();
+ //log.error(
+ // "SecurityConstraintsAction updateConstraintDefinition failure caused by "
+ // + e.getClass().getName() + " " + e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getClass().getName(), e.getMessage()};
+ log.log("1200168", args); // REPLACED
throw new AJAXException(e);
}
return count;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -118,7 +119,8 @@
}
catch (Exception e)
{
- log.error("exception administering portal permissions", e);
+ //log.error("exception administering portal permissions", e);
+ log.log("1200169"); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateFolderAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -174,7 +175,8 @@
}
catch (Exception e)
{
- log.error("exception administering Site update", e);
+ //log.error("exception administering Site update", e);
+ log.log("1200170"); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdateLinkAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -174,7 +175,8 @@
}
catch (Exception e)
{
- log.error("exception administering Site update", e);
+ //log.error("exception administering Site update", e);
+ log.log("1200171"); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/UpdatePageAction.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
@@ -253,7 +254,8 @@
}
catch (Exception e)
{
- log.error("exception administering Site update", e);
+ //log.error("exception administering Site update", e);
+ log.log("1200172"); // REPLACED
resultMap.put(REASON, e.toString());
success = false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.i18n.CurrentLocale;
@@ -86,12 +87,21 @@
{
// not a valid language
defaultLocale = null;
- log.warn("Invalid or unrecognized default language: "
- + language);
+ //log.warn("Invalid or unrecognized default language: "
+ // + language);
+ Object[] args = new Object[]
+ {language};
+ log.log("1200173", args); // REPLACED
}
else
{
- log.info("Default language set: " + defaultLocale);
+ //log.info("Default language set: " + defaultLocale);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {defaultLocale};
+ log.log("1200174", args); // REPLACED
+ }
}
}
@@ -120,7 +130,13 @@
UserPrincipal.class);
if (null != userPrincipal)
{
- log.debug("Got user principal: " + userPrincipal.getName());
+ //log.debug("Got user principal: " + userPrincipal.getName());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {userPrincipal.getName()};
+ log.log("1200175", args); // REPLACED
+ }
UserManager userMgr = (UserManager) Jetspeed
.getComponentManager().getComponent(
UserManager.class);
@@ -148,10 +164,11 @@
}
catch (SecurityException e)
{
- log
- .warn(
- "Unexpected SecurityException in UserInfoManager",
- e);
+ //log
+ // .warn(
+ // "Unexpected SecurityException in UserInfoManager",
+ // e);
+ log.log("1200176", e); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/localization/impl/SimplifiedLocalizationValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -19,8 +19,9 @@
import java.util.Enumeration;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.i18n.CurrentLocale;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -75,12 +76,21 @@
{
// not a valid language
defaultLocale = null;
- log.warn("Invalid or unrecognized default language: "
- + language);
+ //log.warn("Invalid or unrecognized default language: "
+ // + language);
+ Object[] args = new Object[]
+ {language};
+ log.log("1200177", args); // REPLACED
}
else
{
- log.info("Default language set: " + defaultLocale);
+ //log.info("Default language set: " + defaultLocale);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {defaultLocale};
+ log.log("1200178", args); // REPLACED
+ }
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginServlet.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginServlet.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginServlet.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.engine.Engine;
@@ -77,7 +78,8 @@
}
catch (JetspeedException e)
{
- log.warn("Jetspeed engine does not work properly.", e);
+ //log.warn("Jetspeed engine does not work properly.", e);
+ log.log("1200179", e); // REPLACED
// forward to JetspeedServlet
response.sendRedirect(response.encodeURL(request
.getContextPath()
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/impl/LoginJSPViewValve.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,10 +25,11 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.collections.map.LRUMap;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.login.LoginConstants;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -95,20 +96,23 @@
}
catch (ServletException e)
{
- log
- .warn(
- "The included login template file threw the exception.",
- e);
+ //log
+ // .warn(
+ // "The included login template file threw the exception.",
+ // e);
+ log.log("1200180", e); // REPLACED
throw new PipelineException(
- "The included login template file threw the exception.", e);
+ //"The included login template file threw the exception.", e);
+ log.getString("1200180"), e);
}
catch (IOException e)
{
- log.warn("I/O error occurred on the included login template file.",
- e);
+ //log.warn("I/O error occurred on the included login template file.",
+ // e);
+ log.log("1200181", e); // REPLACED
throw new PipelineException(
- "I/O error occurred on the included login template file.",
- e);
+ //"I/O error occurred on the included login template file.",
+ log.getString("1200181"), e);
}
// Pass control to the next Valve in the Pipeline
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -256,7 +256,7 @@
{
writer.println("Error: Failed to start Portlet Application "
+ paName + ": " + e.getMessage());
- e.printStackTrace(writer);
+ //e.printStackTrace(writer);
return ERROR_UNEXPECTED;
}
}
@@ -318,7 +318,7 @@
{
writer.println("Error: Failed to stop Portlet Application "
+ paName + ": " + e.getMessage());
- e.printStackTrace(writer);
+ //e.printStackTrace(writer);
return ERROR_UNEXPECTED;
}
}
@@ -360,7 +360,7 @@
{
writer.println("Error: Failed to undeploy Portlet Application "
+ paName + ": " + e.getMessage());
- e.printStackTrace(writer);
+ //e.printStackTrace(writer);
return ERROR_UNEXPECTED;
}
}
@@ -382,7 +382,7 @@
{
writer.println("Error: Failed to unregister Portlet Application "
+ paName + ": " + e.getMessage());
- e.printStackTrace(writer);
+ //e.printStackTrace(writer);
return ERROR_UNEXPECTED;
}
}
@@ -445,7 +445,7 @@
{
writer.println("Error: Failed to deploy file "
+ fileName + ": " + e.getMessage());
- e.printStackTrace(writer);
+ //e.printStackTrace(writer);
return ERROR_UNEXPECTED;
}
}
@@ -456,7 +456,7 @@
{
writer.println("Error: Failed to process uploaded data: "
+ e.getMessage());
- e.printStackTrace(writer);
+ //e.printStackTrace(writer);
return ERROR_UNEXPECTED;
}
finally
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.healthcheck.validators.HealthCheckValidator;
import org.apache.jetspeed.healthcheck.validators.HealthCheckValidatorResult;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -96,7 +97,11 @@
{
if (isDebugEnabled)
{
- log.debug("Starting method: HealthCheckValve.invoke()");
+ //log.debug("Starting method: HealthCheckValve.invoke()");
+ if (log.isDebugEnabled())
+ {
+ log.log("1200182"); // REPLACED
+ }
}
List messages = new ArrayList();
HttpServletResponse response = request.getResponse();
@@ -109,8 +114,11 @@
HealthCheckValidator hcv = (HealthCheckValidator) it.next();
if (isDebugEnabled)
{
- log.debug("Starting validator execution: "
- + hcv.getClass().getName());
+ //log.debug("Starting validator execution: "
+ // + hcv.getClass().getName());
+ Object[] args = new Object[]
+ {hcv.getClass().getName()};
+ log.log("1200183", args); // REPLACED
}
HealthCheckValidatorResult result = null;
// execute the validator until it succeeds or until the
@@ -120,9 +128,12 @@
result = hcv.validate();
if (isDebugEnabled)
{
- log
- .debug("Validator execution: "
- + (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED));
+ //log
+ // .debug("Validator execution: "
+ // + (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED));
+ Object[] args = new Object[]
+ {(result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED)};
+ log.log("1200184", args); // REPLACED
}
if (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED)
{
@@ -188,7 +199,8 @@
}
catch (Exception e)
{
- log.error("Exception while running HealthCheckValve", e);
+ //log.error("Exception while running HealthCheckValve", e);
+ log.log("1200185", e); // REPLACED
// if any exceptions occur, even runtime exceptions, simply reset
// the response's buffer and add any messages to it (if required)
try
@@ -209,7 +221,8 @@
}
catch (Exception e1)
{
- log.error("Exception while running HealthCheckValve", e1);
+ //log.error("Exception while running HealthCheckValve", e1);
+ log.log("1200185", e1); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/ActionValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,8 +25,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.cache.ContentCacheKey;
import org.apache.jetspeed.cache.JetspeedContentCache;
@@ -129,7 +130,8 @@
}
catch (Exception e)
{
- log.error("Failed to refresh action window.", e);
+ //log.error("Failed to refresh action window.", e);
+ log.log("1200187", e); // REPLACED
}
}
@@ -139,10 +141,12 @@
// have portlet entity.
// Redirect the user back to the target page (with possibly
// retaining the other windows navigational state).
- log
- .warn("Portlet action was canceled because the session was expired. The actionWindow's id is "
- + actionWindow.getId());
-
+ //log
+ // .warn("Portlet action was canceled because the session was expired. The actionWindow's id is "
+ // + actionWindow.getId());
+ Object[] args = new Object[]
+ {actionWindow.getId()};
+ log.log("1200188", args); // REPLACED
request.setActionWindow(null);
MutableNavigationalState state = (MutableNavigationalState) request
.getPortalURL().getNavigationalState();
@@ -196,34 +200,40 @@
}
catch (PortletContainerException e)
{
- log.fatal("Unable to retrieve portlet container!", e);
+ //log.fatal("Unable to retrieve portlet container!", e);
+ log.log("1200189", e); // REPLACED
throw new PipelineException(
- "Unable to retrieve portlet container!", e);
+ //"Unable to retrieve portlet container!", e);
+ log.getString("1200189"), e);
}
catch (PortletException e)
{
- log.warn("Unexpected PortletException in ActionValveImpl", e);
+ //log.warn("Unexpected PortletException in ActionValveImpl", e);
+ log.log("1200190", e); // REPLACED
// throw new PipelineException("Unexpected PortletException in
// ActionValveImpl", e);
}
catch (IOException e)
{
- log.error("Unexpected IOException in ActionValveImpl", e);
+ //log.error("Unexpected IOException in ActionValveImpl", e);
+ log.log("1200191", e); // REPLACED
// throw new PipelineException("Unexpected IOException in
// ActionValveImpl", e);
}
catch (IllegalStateException e)
{
- log
- .error(
- "Illegal State Exception. Response was written to in Action Phase",
- e);
+ //log
+ // .error(
+ // "Illegal State Exception. Response was written to in Action Phase",
+ // e);
+ log.log("1200192", e); // REPLACED
responseCommitted = true;
}
catch (Throwable t)
{
- log.error("Unknown exception processing Action", t);
+ //log.error("Unknown exception processing Action", t);
+ log.log("1200193"); // REPLACED
}
finally
{
@@ -232,8 +242,12 @@
// (Pluto will redirect the client after PorletAction processing)
if (responseCommitted)
{
- log
- .info("Action processed and response committed (pipeline processing stopped)");
+ //log
+ // .info("Action processed and response committed (pipeline processing stopped)");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200194"); // REPLACED
+ }
}
else
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/CleanupValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.CleanupValve;
@@ -91,10 +92,14 @@
}
catch (Exception e)
{
- log
- .error("CleanupValveImpl: failed while trying to render fragment "
- + fragment);
- log.error("CleanupValveImpl: Unable to complete all renderings", e);
+ //log
+ // .error("CleanupValveImpl: failed while trying to render fragment "
+ // + fragment);
+ Object[] args = new Object[]
+ {fragment};
+ log.log("1200195", args); // REPLACED
+ //log.error("CleanupValveImpl: Unable to complete all renderings", e);
+ log.log("1200196", e); // REPLACED
}
}
@@ -124,12 +129,25 @@
count++;
}
out.close();
- log.debug("Session object: " + count);
- log.debug("Session footprint: " + bout.size());
+ //log.debug("Session object: " + count);
+ //log.debug("Session footprint: " + bout.size());
+ if (log.isDebugEnabled())
+ {
+ Object[] args1 = new Object[]
+ {count};
+ log.log("1200197", args1); // REPLACED
+ Object[] args2 = new Object[]
+ {bout.size()};
+ log.log("1200198", args2); // REPLACED
+ }
}
catch (Throwable t)
{
- log.debug("Exception in dumpSession().", t);
+ //log.debug("Exception in dumpSession().", t);
+ if (log.isDebugEnabled())
+ {
+ log.log("1200199"); // REPLACED
+ }
}
}
@@ -141,14 +159,24 @@
ObjectOutputStream out = new ObjectOutputStream(bout);
out.writeObject(o);
out.close();
- log.debug("o = " + name + ", " + o + ", size = " + bout.size());
+ //log.debug("o = " + name + ", " + o + ", size = " + bout.size());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {name, o, bout.size()};
+ log.log("1200200", args); // REPLACED
+ }
}
catch (Throwable t)
{
- log
- .debug(
- "Exception in serializeObject(String name, Object o).",
- t);
+ //log
+ // .debug(
+ // "Exception in serializeObject(String name, Object o).",
+ // t);
+ if (log.isDebugEnabled())
+ {
+ log.log("1200201", t); // REPLACED
+ }
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/DebugValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,8 +18,9 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
@@ -60,13 +61,24 @@
private void debugHeaders(HttpServletRequest req)
{
- log.info("-- Jetspeed Debug Valve: Debugging standard headers --");
+ //log.info("-- Jetspeed Debug Valve: Debugging standard headers --");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200202"); // REPLACED
+ }
+
java.util.Enumeration e = req.getHeaderNames();
while (e.hasMoreElements())
{
String name = (String) e.nextElement();
String value = req.getHeader(name);
- log.info("http header = " + name + " : " + value);
+ //log.info("http header = " + name + " : " + value);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {name, value};
+ log.log("1200203", args); // REPLACED
+ }
// System.out.println("http header = " + name + " : " + value);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/impl/VerySimpleLayoutValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.LayoutValve;
@@ -61,7 +62,11 @@
{
try
{
- log.info("Invoking the VerySimpleLayoutValve...");
+ //log.info("Invoking the VerySimpleLayoutValve...");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200204"); // REPLACED
+ }
HttpServletRequest httpRequest = request.getRequest();
RequestDispatcher rd = httpRequest
.getRequestDispatcher("/pages/SimpleLayoutHeader.jsp");
@@ -82,10 +87,11 @@
{
try
{
- log
- .error(
- "VerySimpleLayout: Unable to include layout header. Layout not processed",
- e);
+ //log
+ // .error(
+ // "VerySimpleLayout: Unable to include layout header. Layout not processed",
+ // e);
+ log.log("1200205", e); // REPLACED
PrintWriter pw = request.getResponse().getWriter();
pw
.write("VerySimpleLayoutFailed failed to include servlet resources. (details below) <br/>");
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreatePageValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,8 +16,9 @@
*/
package org.apache.jetspeed.profiler.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,8 +16,9 @@
*/
package org.apache.jetspeed.profiler.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
import org.apache.jetspeed.page.PageManager;
@@ -129,7 +130,8 @@
}
catch (Exception e)
{
- log.error("Exception occurred during creating user folder.", e);
+ //log.error("Exception occurred during creating user folder.", e);
+ log.log("1200206", e); // REPLACED
}
finally
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.decoration.PageActionAccess;
import org.apache.jetspeed.om.page.ContentPageImpl;
@@ -302,7 +303,10 @@
}
// return standard HTTP 403 - FORBIDDEN status
- log.error(se.getMessage(), se);
+ //log.error(se.getMessage(), se);
+ Object[] args = new Object[]
+ {se.getMessage()};
+ log.log("1200207", args); // REPLACED
try
{
request.getResponse().sendError(
@@ -310,14 +314,20 @@
}
catch (IOException ioe)
{
- log.error("Failed to invoke HttpServletReponse.sendError: "
- + ioe.getMessage(), ioe);
+ //log.error("Failed to invoke HttpServletReponse.sendError: "
+ // + ioe.getMessage(), ioe);
+ Object[] args1 = new Object[]
+ {ioe.getMessage()};
+ log.log("1200208", args1, ioe); // REPLACED
}
}
catch (NodeNotFoundException nnfe)
{
// return standard HTTP 404 - NOT FOUND status
- log.error(nnfe.getMessage(), nnfe);
+ //log.error(nnfe.getMessage(), nnfe);
+ Object[] args = new Object[]
+ {nnfe.getMessage()};
+ log.log("1200209", args, nnfe); // REPLACED
try
{
request.getResponse().sendError(
@@ -325,13 +335,19 @@
}
catch (IOException ioe)
{
- log.error("Failed to invoke HttpServletReponse.sendError: "
- + ioe.getMessage(), ioe);
+ //log.error("Failed to invoke HttpServletReponse.sendError: "
+ // + ioe.getMessage(), ioe);
+ Object[] args1 = new Object[]
+ {ioe.getMessage()};
+ log.log("1200210", args1, ioe); // REPLACED
}
}
catch (Exception e)
{
- log.error("Exception in request pipeline: " + e.getMessage(), e);
+ //log.error("Exception in request pipeline: " + e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200211", args, e); // REPLACED
throw new PipelineException(e.toString(), e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -30,6 +30,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.ContentDispatcher;
@@ -116,6 +119,9 @@
private final Map objects;
+ protected static final Log log = LogFactory
+ .getLog(JetspeedRequestContext.class);
+
/**
* Create a new Request Context
*
@@ -720,7 +726,8 @@
}
catch (Throwable t)
{
- t.printStackTrace();
+ //t.printStackTrace();
+ log.log("1200212", t); // REPLACED
}
return null;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
import org.apache.jetspeed.userinfo.UserInfoManager;
@@ -97,9 +98,12 @@
}
catch (Exception e)
{
- String msg = "JetspeedRequestContextComponent: Failed to create a Class object for RequestContext: "
- + e.toString();
- log.error(msg, e);
+ //String msg = "JetspeedRequestContextComponent: Failed to create a Class object for RequestContext: "
+ // + e.toString();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1200213", args); // REPLACED
}
tlRequestContext.set(context);
return context;
@@ -127,10 +131,12 @@
}
else
{
- log
- .error("Cannot call getRequestContext(HttpServletRequest request) before it has been created and set for this thread.");
+ //log
+ // .error("Cannot call getRequestContext(HttpServletRequest request) before it has been created and set for this thread.");
+ log.log("1200214"); // REPLACED
throw new IllegalStateException(
- "Cannot call getRequestContext(HttpServletRequest request) before it has been created and set for this thread.");
+ //"Cannot call getRequestContext(HttpServletRequest request) before it has been created and set for this thread.");
+ log.getString("1200214"));
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/ResourceValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/ResourceValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/ResourceValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,8 +23,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
@@ -96,7 +97,8 @@
}
catch (Exception e)
{
- log.error("Failed to refresh resource window.", e);
+ //log.error("Failed to refresh resource window.", e);
+ log.log("1200215", e); // REPLACED
}
}
((MutablePortletEntity) resourceWindow.getPortletEntity())
@@ -131,26 +133,30 @@
}
catch (PortletContainerException e)
{
- log.fatal("Unable to retrieve portlet container!", e);
+ //log.fatal("Unable to retrieve portlet container!", e);
+ log.log("1200216", e); // REPLACED
throw new PipelineException(
"Unable to retrieve portlet container!", e);
}
catch (PortletException e)
{
- log.warn("Unexpected PortletException", e);
-
+ //log.warn("Unexpected PortletException", e);
+ log.log("1200217", e); // REPLACED
}
catch (IOException e)
{
- log.error("Unexpected IOException", e);
+ //log.error("Unexpected IOException", e);
+ log.log("1200218", e); // REPLACED
}
catch (IllegalStateException e)
{
- log.error("Unexpected IllegalStateException.", e);
+ //log.error("Unexpected IllegalStateException.", e);
+ log.log("1200219", e); // REPLACED
}
catch (Exception t)
{
- log.error("Unexpected Exception", t);
+ //log.error("Unexpected Exception", t);
+ log.log("1200220", t); // REPLACED
}
}
else
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/LoginValidationValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,8 +20,9 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.login.LoginConstants;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -207,7 +208,10 @@
}
catch (Exception e)
{
- log.error("Exception in request pipeline: " + e.getMessage(), e);
+ //log.error("Exception in request pipeline: " + e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200221", args); // REPLACED
throw new PipelineException(e.toString(), e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -21,8 +21,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.PageProfilerValve;
@@ -186,7 +187,10 @@
}
catch (Exception e)
{
- log.error("Exception in request pipeline: " + e.getMessage(), e);
+ //log.error("Exception in request pipeline: " + e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200222", args); // REPLACED
throw new PipelineException(e.toString(), e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -24,8 +24,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cluster.NodeManager;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletentity.PortletEntityNotDeletedException;
@@ -138,14 +139,21 @@
monitor.setContextClassLoader(getClass().getClassLoader());
monitor.start();
- log
- .info("PortletApplicationManager Descriptor Change Monitor started!");
+ //log
+ // .info("PortletApplicationManager Descriptor Change Monitor started!");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200223"); // REPLACED
+ }
}
catch (Exception e)
{
- log.warn(
- "Unable to start PortletApplicationManager Descriptor Change Monitor: "
- + e.toString(), e);
+ //log.warn(
+ // "Unable to start PortletApplicationManager Descriptor Change Monitor: "
+ // + e.toString(), e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1200224", args); // REPLACED
monitor.safeStop();
monitor = null;
}
@@ -349,12 +357,24 @@
try
{
- log.info("Loading portlet.xml...." + paName);
+ //log.info("Loading portlet.xml...." + paName);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200225", args); // REPLACED
+ }
pa = paWar.createPortletApp(paClassLoader);
pa.setApplicationType(paType);
// load the web.xml
- log.info("Loading web.xml...." + paName);
+ //log.info("Loading web.xml...." + paName);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200226", args); // REPLACED
+ }
MutableWebApplication wa = paWar.createWebApp();
paWar.validate();
@@ -397,10 +417,14 @@
}
catch (Exception e)
{
- String msg = "Failed to load portlet application for "
- + paWar.getPortletApplicationName();
- log.error(msg, e);
- throw new RegistryException(msg);
+ //String msg = "Failed to load portlet application for "
+ // + paWar.getPortletApplicationName();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {paWar.getPortletApplicationName()};
+ log.log("1200227", args); // REPLACED
+ //throw new RegistryException(msg);
+ throw new RegistryException(log.getString("1200227"));
}
// register the portlet application
@@ -408,7 +432,13 @@
{
registry.registerPortletApplication(pa);
registered = true;
- log.info("Registered the portlet application " + paName);
+ //log.info("Registered the portlet application " + paName);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200228", args); // REPLACED
+ }
// add to search engine result
this.updateSearchEngine(false, pa);
@@ -437,17 +467,26 @@
if (!roleManager.roleExists(sr.getRoleName()))
{
roleManager.addRole(sr.getRoleName());
- log.info("AutoCreated role: " + sr.getRoleName()
- + " from portlet application " + paName
- + " its web definition");
+ //log.info("AutoCreated role: " + sr.getRoleName()
+ // + " from portlet application " + paName
+ // + " its web definition");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {sr.getRoleName(), paName};
+ log.log("1200229", args); // REPLACED
+ }
}
}
}
catch (SecurityException sex)
{
- log.warn(
- "Failed to autoCreate roles for portlet application "
- + paName + ": " + sex.getMessage(), sex);
+ //log.warn(
+ // "Failed to autoCreate roles for portlet application "
+ // + paName + ": " + sex.getMessage(), sex);
+ Object[] args = new Object[]
+ {paName, sex.getMessage()};
+ log.log("1200230", args, sex); // REPLACED
}
}
@@ -455,8 +494,11 @@
}
catch (Exception e)
{
- String msg = "Failed to register portlet application, " + paName;
- log.error(msg, e);
+ //String msg = "Failed to register portlet application, " + paName;
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200231", args); // REPLACED
if (registered)
{
@@ -467,13 +509,17 @@
}
catch (Exception re)
{
- log.error(
- "Failed to rollback registration of portlet application "
- + paName, re);
+ //log.error(
+ // "Failed to rollback registration of portlet application "
+ // + paName, re);
+ Object[] args1 = new Object[]
+ {paName};
+ log.log("1200232", args1, re); // REPLACED
}
}
- throw new RegistryException(msg, e);
+ //throw new RegistryException(msg, e);
+ throw new RegistryException(log.getString("1200231"), e);
}
}
@@ -497,16 +543,22 @@
}
if (log.isDebugEnabled())
{
- log.debug("Is portlet application " + contextName
- + " monitored? -> " + monitored);
+ //log.debug("Is portlet application " + contextName
+ // + " monitored? -> " + monitored);
+ Object[] args = new Object[]
+ {contextName, monitored};
+ log.log("1200233", args); // REPLACED
}
PortletApplicationWar paWar = null;
try
{
if (log.isDebugEnabled())
{
- log.debug("Try to start portlet application " + contextName
- + ".");
+ //log.debug("Try to start portlet application " + contextName
+ // + ".");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200234", args); // REPLACED
}
// create PA from war (file) structure
// paWar = new PortletApplicationWar(warStruct, contextName, "/" +
@@ -525,14 +577,20 @@
if (log.isDebugEnabled())
{
- log.debug("New checksum for portlet application "
- + contextName + " is " + checksum);
+ //log.debug("New checksum for portlet application "
+ // + contextName + " is " + checksum);
+ Object[] args = new Object[]
+ {contextName, checksum};
+ log.log("1200235", args); // REPLACED
}
}
catch (IOException e)
{
- String msg = "Invalid PA WAR for " + contextName;
- log.error(msg, e);
+ //String msg = "Invalid PA WAR for " + contextName;
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200236", args); // REPLACED
if (paClassLoader == null)
{
// nothing to be done about it anymore: this pa is beyond
@@ -550,8 +608,11 @@
{
if (log.isDebugEnabled())
{
- log.debug("Portlet Application " + contextName
- + " found in registry.");
+ //log.debug("Portlet Application " + contextName
+ // + " found in registry.");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200237", args); // REPLACED
}
if (pa.getApplicationType() != paType) { throw new RegistryException(
"Cannot start portlet application " + contextName
@@ -563,8 +624,11 @@
}
if (log.isDebugEnabled())
{
- log.debug("unregistering portlet application "
- + contextName + "...");
+ //log.debug("unregistering portlet application "
+ // + contextName + "...");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200238", args); // REPLACED
}
portletFactory.unregisterPortletApplication(pa);
}
@@ -578,8 +642,11 @@
{
if (log.isDebugEnabled())
{
- log.debug("Register new portlet application "
- + contextName + ".");
+ //log.debug("Register new portlet application "
+ // + contextName + ".");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200239", args); // REPLACED
}
// TODO Findbugs
pa = registerPortletApplication(paWar, pa, paType,
@@ -587,14 +654,18 @@
}
catch (Exception e)
{
- String msg = "Error register new portlet application "
- + contextName + ".";
+ //String msg = "Error register new portlet application "
+ // + contextName + ".";
if (log.isDebugEnabled())
{
- log.debug(msg);
+ //log.debug(msg);
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200240", args); // REPLACED
}
- throw new RegistryException(msg);
+ //throw new RegistryException(msg);
+ throw new RegistryException(log.getString("1200240"));
}
}
@@ -602,8 +673,11 @@
{
if (log.isDebugEnabled())
{
- log.debug("Re-register existing portlet application "
- + contextName + ".");
+ //log.debug("Re-register existing portlet application "
+ // + contextName + ".");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200241", args); // REPLACED
}
int status = nodeManager.checkNode(new Long(pa.getId()
.toString()), pa.getName());
@@ -614,28 +688,37 @@
case NodeManager.NODE_NEW: {
if (log.isDebugEnabled())
{
- log.debug("Node for Portlet application "
- + contextName + " is NEW.");
+ //log.debug("Node for Portlet application "
+ // + contextName + " is NEW.");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200242", args); // REPLACED
}
// only reason is that the file got somehow corrupted
// so we really do not know what is going on here...
// the best chance at this point is to reregister (which
// might be the absolute wrong choice)
- log
- .warn("The portlet application "
- + pa.getName()
- + " is registered in the database but not locally .... we will reregister");
+ //log
+ // .warn("The portlet application "
+ // + pa.getName()
+ // + " is registered in the database but not locally .... we will reregister");
+ Object[] args = new Object[]
+ {pa.getName()};
+ log.log("1200243", args); // REPLACED
reregister = true;
if (checksum != pa.getChecksum())
{
- log
- .warn("The provided portlet application "
- + pa.getName()
- + " is a different version than in the database (db-checksum="
- + pa.getChecksum()
- + ", local-checksum=: "
- + checksum
- + ") .... we will redeploy (also to the database)");
+ //log
+ // .warn("The provided portlet application "
+ // + pa.getName()
+ // + " is a different version than in the database (db-checksum="
+ // + pa.getChecksum()
+ // + ", local-checksum=: "
+ // + checksum
+ // + ") .... we will redeploy (also to the database)");
+ Object[] args1 = new Object[]
+ {pa.getName(), pa.getChecksum(), checksum};
+ log.log("1200244", args1); // REPLACED
deploy = true;
}
break;
@@ -643,19 +726,28 @@
case NodeManager.NODE_SAVED: {
if (log.isDebugEnabled())
{
- log.debug("Node for Portlet application "
- + contextName + " is SAVED.");
+ //log.debug("Node for Portlet application "
+ // + contextName + " is SAVED.");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200245", args); // REPLACED
+ }
}
if (checksum != pa.getChecksum())
{
- log
- .warn("The provided portlet application "
- + pa.getName()
- + " is a different version than in the local node info and the database (db-checksum="
- + pa.getChecksum()
- + ", local-checksum=: "
- + checksum
- + ") .... we will reregister AND redeploy (also to the database)");
+ //log
+ // .warn("The provided portlet application "
+ // + pa.getName()
+ // + " is a different version than in the local node info and the database (db-checksum="
+ // + pa.getChecksum()
+ // + ", local-checksum=: "
+ // + checksum
+ // + ") .... we will reregister AND redeploy (also to the database)");
+ Object[] args = new Object[]
+ {pa.getName(), pa.getChecksum(), checksum};
+ log.log("1200246", args); // REPLACED
// database and local node info are in synch, so we
// assume that this is a brand new
// war .... let's deploy
@@ -669,22 +761,28 @@
// cluster node
if (log.isDebugEnabled())
{
- log.debug("Node for Portlet application "
- + contextName
- + " is OUTDATED (local PA.id < DB PA.id).");
+ //log.debug("Node for Portlet application "
+ // + contextName
+ // + " is OUTDATED (local PA.id < DB PA.id).");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200247", args); // REPLACED
}
// database version is older (determined by id) than the
// database
// let's deploy and reregister
if (checksum != pa.getChecksum())
{
- log
- .error("The portlet application "
- + pa.getName()
- + " provided for the upgrade IS WRONG. The database checksum= "
- + pa.getChecksum()
- + ", but the local=" + checksum
- + "....THIS NEEDS TO BE CORRECTED");
+ //log
+ //.error("The portlet application "
+ // + pa.getName()
+ // + " provided for the upgrade IS WRONG. The database checksum= "
+ // + pa.getChecksum()
+ // + ", but the local=" + checksum
+ // + "....THIS NEEDS TO BE CORRECTED");
+ Object[] args = new Object[]
+ {pa.getName(), pa.getChecksum(), checksum};
+ log.log("1200248", args); // REPLACED
// if the checksums do not match make sure the
// database is updated with the new PA from file
// system
@@ -700,9 +798,12 @@
{
if (log.isDebugEnabled())
{
- log
- .debug("Register (deploy=true) Portlet application "
- + contextName + " in database.");
+ //log
+ // .debug("Register (deploy=true) Portlet application "
+ // + contextName + " in database.");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200249", args); // REPLACED
}
pa = registerPortletApplication(paWar, pa, paType,
paClassLoader);
@@ -711,9 +812,12 @@
{
if (log.isDebugEnabled())
{
- log
- .debug("Re-Register (reregister=true) Portlet application "
- + contextName + ".");
+ //log
+ // .debug("Re-Register (reregister=true) Portlet application "
+ // + contextName + ".");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200250", args); // REPLACED
}
// add to search engine result
this.updateSearchEngine(true, pa);
@@ -728,8 +832,11 @@
}
catch (Exception e)
{
- log.error("Adding node for portlet application "
- + pa.getName() + " caused exception", e);
+ //log.error("Adding node for portlet application "
+ // + pa.getName() + " caused exception", e);
+ Object[] args = new Object[]
+ {pa.getName()};
+ log.log("1200251", args, e); // REPLACED
}
}
@@ -739,8 +846,11 @@
{
if (log.isDebugEnabled())
{
- log.debug("Register Portlet application " + contextName
- + " in portlet factory.");
+ //log.debug("Register Portlet application " + contextName
+ // + " in portlet factory.");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200252", args); // REPLACED
}
portletFactory.registerPortletApplication(pa, paClassLoader);
}
@@ -751,6 +861,9 @@
{
log.debug("Add change monitor for application "
+ contextName + " with checksum " + checksum + ".");
+ Object[] args = new Object[]
+ {contextName, checksum};
+ log.log("1200253", args); // REPLACED
}
changeMonitor.monitor(contextName, contextPath, paClassLoader,
paType, warStruct.getRootDirectory(), checksum);
@@ -759,9 +872,12 @@
// TODO Findbugs
catch (Exception e)
{
- String msg = "Error starting portlet application " + contextName;
+ //String msg = "Error starting portlet application " + contextName;
- log.error(msg, e);
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200254", args); // REPLACED
// monitor PA for changes
// do not add monitor if a monitor already exists
if (!monitored && changeMonitor != null)
@@ -769,15 +885,19 @@
// this code should be hit only during startup process
if (log.isDebugEnabled())
{
- log.debug("Add change monitor for application "
- + contextName
- + " and set unsuccessful starts to 1.");
+ //log.debug("Add change monitor for application "
+ // + contextName
+ // + " and set unsuccessful starts to 1.");
+ Object[] args1 = new Object[]
+ {contextName};
+ log.log("1200255", args1); // REPLACED
}
changeMonitor.monitor(contextName, contextPath, paClassLoader,
paType, warStruct.getRootDirectory(), checksum);
changeMonitor.get(contextName).setUnsuccessfulStarts(1);
}
- throw new RegistryException(msg);
+ //throw new RegistryException(msg);
+ throw new RegistryException(log.getString("1200254"));
}
finally
{
@@ -789,7 +909,10 @@
}
catch (IOException e)
{
- log.error("Failed to close PA WAR for " + contextName, e);
+ //log.error("Failed to close PA WAR for " + contextName, e);
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200256", args, e); // REPLACED
}
}
}
@@ -832,17 +955,29 @@
{
searchEngine.remove(pa);
searchEngine.remove(pa.getPortletDefinitions());
- log
- .info("Un-Registered the portlet application in the search engine... "
- + pa.getName());
+ //log
+ // .info("Un-Registered the portlet application in the search engine... "
+ // + pa.getName());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {pa.getName()};
+ log.log("1200257", args); // REPLACED
+ }
}
else
{
searchEngine.add(pa);
searchEngine.add(pa.getPortletDefinitions());
- log
- .info("Registered the portlet application in the search engine... "
- + pa.getName());
+ //log
+ // .info("Registered the portlet application in the search engine... "
+ // + pa.getName());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {pa.getName()};
+ log.log("1200258", args); // REPLACED
+ }
}
}
@@ -853,8 +988,14 @@
{
updateSearchEngine(true, pa);
- log.info("Remove all registry entries defined for portlet application "
- + pa.getName());
+ //log.info("Remove all registry entries defined for portlet application "
+ // + pa.getName());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {pa.getName()};
+ log.log("1200259", args); // REPLACED
+ }
Iterator portlets = pa.getPortletDefinitions().iterator();
@@ -877,10 +1018,14 @@
}
catch (PortletEntityNotDeletedException e)
{
- String msg = "Failed to delete Portlet Entity "
- + entity.getId();
- log.error(msg, e);
- throw new RegistryException(msg, e);
+ //String msg = "Failed to delete Portlet Entity "
+ // + entity.getId();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {entity.getId()};
+ log.log("1200260", args, e); // REPLACED
+ //throw new RegistryException(msg, e);
+ throw new RegistryException(log.getString("1200260"), e);
}
}
@@ -920,7 +1065,10 @@
}
catch (SecurityException e)
{
- log.error("Error granting default permissions for " + paName, e);
+ //log.error("Error granting default permissions for " + paName, e);
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200261", args, e); // REPLACED
}
}
@@ -947,7 +1095,10 @@
}
catch (SecurityException e)
{
- log.error("Error revoking default permissions for " + paName, e);
+ //log.error("Error revoking default permissions for " + paName, e);
+ Object[] args = new Object[]
+ {paName};
+ log.log("1200262", args, e); // REPLACED
}
}
@@ -1068,22 +1219,28 @@
.getChecksum(descriptors);
if (log.isDebugEnabled())
{
- log
- .debug("checksum check for descriptors for application "
- + contextName
- + ": old ("
- + checksum
- + ") new ("
- + newChecksum + ").");
+ //log
+ // .debug("checksum check for descriptors for application "
+ // + contextName
+ // + ": old ("
+ // + checksum
+ // + ") new ("
+ // + newChecksum + ").");
+ Object[] args = new Object[]
+ {contextName, checksum, newChecksum};
+ log.log("1200263", args); // REPLACED
}
if (checksum != newChecksum)
{
if (log.isDebugEnabled())
{
- log
- .debug("portlet descriptors for application "
- + contextName
- + " have changed.");
+ //log
+ // .debug("portlet descriptors for application "
+ // + contextName
+ // + " have changed.");
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200264", args); // REPLACED
}
checksum = newChecksum;
// reset this to restart unsuccessful PA start
@@ -1228,7 +1385,8 @@
if (log.isDebugEnabled())
{
- log.debug("check for portlet application descriptor changes.");
+ //log.debug("check for portlet application descriptor changes.");
+ log.log("1200265"); // REPLACED
}
for (int i = size - 1; i > -1; i--)
@@ -1291,21 +1449,27 @@
{
if (monitorInfo.isChanged())
{
- log
- .error(
- "Failed to restart PortletApplication "
- + monitorInfo
- .getContextName(),
- e);
+ //log
+ // .error(
+ // "Failed to restart PortletApplication "
+ // + monitorInfo
+ // .getContextName(),
+ // e);
+ Object[] args = new Object[]
+ {monitorInfo.getContextName()};
+ log.log("1200266", args, e); // REPLACED
}
else if (log.isWarnEnabled())
{
- log
- .warn(
- "Failed to restart PortletApplication "
- + monitorInfo
- .getContextName(),
- e);
+ //log
+ // .warn(
+ // "Failed to restart PortletApplication "
+ // + monitorInfo
+ // .getContextName(),
+ // e);
+ Object[] args = new Object[]
+ {monitorInfo.getContextName()};
+ log.log("1200267", args); // REPLACED
}
// we encountered an error while starting
// the PA
@@ -1317,20 +1481,27 @@
.setUnsuccessfulStarts(unsuccessfulStarts + 1);
if (log.isDebugEnabled())
{
- log
- .debug("Number of unsuccessful PA starts is "
- + monitorInfo
- .getUnsuccessfulStarts()
- + ".");
+ //log
+ // .debug("Number of unsuccessful PA starts is "
+ // + monitorInfo
+ // .getUnsuccessfulStarts()
+ // + ".");
+ Object[] args = new Object[]
+ {monitorInfo.getUnsuccessfulStarts()};
+ log.log("1200268", args); // REPLACED
}
if (monitorInfo.getUnsuccessfulStarts() > maxRetriedStarts)
{
- log
- .error("Max number of retries ("
- + maxRetriedStarts
- + ") reached. Ignoring Monitor for "
- + monitorInfo
- .getContextName());
+ //log
+ // .error("Max number of retries ("
+ // + maxRetriedStarts
+ // + ") reached. Ignoring Monitor for "
+ // + monitorInfo
+ // .getContextName());
+ Object[] args = new Object[]
+ {maxRetriedStarts,
+ monitorInfo.getContextName()};
+ log.log("1200269", args); // REPLACED
}
}
}
@@ -1339,9 +1510,12 @@
{
// ignore filesystem and/or descriptor errors, maybe
// next time round they'll be fixed again
- log.error(
- "Descriptor Change check failure for PortletApplication "
- + monitorInfo.getContextName(), e);
+ //log.error(
+ // "Descriptor Change check failure for PortletApplication "
+ // + monitorInfo.getContextName(), e);
+ Object[] args = new Object[]
+ {monitorInfo.getContextName()};
+ log.log("1200270", args, e); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -21,8 +21,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.portletregistry.RegistryException;
@@ -108,8 +109,11 @@
}
catch (IOException e)
{
- String msg = "Invalid PA WAR for " + contextName;
- log.error(msg, e);
+ //String msg = "Invalid PA WAR for " + contextName;
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200271", args); // REPLACED
if (paClassLoader == null)
{
// nothing to be done about it anymore: this pa is beyond
@@ -160,9 +164,13 @@
// TODO Findbugs
catch (Exception e)
{
- String msg = "Error starting portlet application " + contextName;
- log.error(msg, e);
- throw new RegistryException(msg, e);
+ //String msg = "Error starting portlet application " + contextName;
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {contextName};
+ log.log("1200272", args); // REPLACED
+ //throw new RegistryException(msg, e);
+ throw new RegistryException(log.getString("1200272"), e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/LocalizedFieldRule.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -18,9 +18,10 @@
import java.util.Locale;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.digester.Rule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.LocalizedField;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/PortletRule.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,9 +16,10 @@
*/
package org.apache.jetspeed.tools.pamanager.rules;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.digester.Rule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRule.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,9 +16,10 @@
*/
package org.apache.jetspeed.tools.pamanager.rules;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.digester.Rule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -16,10 +16,11 @@
*/
package org.apache.jetspeed.tools.pamanager.rules;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSetBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -23,6 +23,9 @@
import java.net.Socket;
import java.net.UnknownHostException;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
@@ -30,8 +33,6 @@
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* <p>
@@ -292,13 +293,19 @@
}
catch (UnknownHostException e1)
{
- log.error("Unknown server: " + e1.toString());
+ //log.error("Unknown server: " + e1.toString());
+ Object[] args = new Object[]
+ {e1.toString()};
+ log.log("1200273", args); // REPLACED
return false;
}
catch (IOException e1)
{
- log.error("IOException: " + e1.toString());
+ //log.error("IOException: " + e1.toString());
+ Object[] args = new Object[]
+ {e1.toString()};
+ log.log("1200274", args); // REPLACED
return false;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,8 +20,9 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
@@ -79,13 +80,19 @@
.equals(currentAttributeRef.getNameLink()))
{
if (log.isDebugEnabled())
- log
- .debug("Linking user attribute ref: [[name, "
- + currentAttribute
- .getName()
- + "], [linked name, "
- + currentAttributeRef
- .getName() + "]]");
+ {
+ //log
+ // .debug("Linking user attribute ref: [[name, "
+ // + currentAttribute
+ // .getName()
+ // + "], [linked name, "
+ // + currentAttributeRef
+ // .getName() + "]]");
+ Object[] args = new Object[]
+ {currentAttribute.getName(),
+ currentAttributeRef.getName()};
+ log.log("1200275", args); // REPLACED
+ }
linkedUserAttributes.add(currentAttributeRef);
linkedAttribute = true;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/MultiSourceUserInfoManagerImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,8 +25,9 @@
import javax.portlet.PortletRequest;
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.request.RequestContext;
@@ -73,7 +74,13 @@
// System.out.println("*** PA = " + pa);
if (null == pa)
{
- log.debug(PortletRequest.USER_INFO + " is set to null");
+ //log.debug(PortletRequest.USER_INFO + " is set to null");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {PortletRequest.USER_INFO};
+ log.log("1200276", args); // REPLACED
+ }
return null;
}
Collection userAttributes = pa.getUserAttributes();
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -28,8 +28,9 @@
import javax.portlet.PortletRequest;
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
@@ -123,8 +124,13 @@
public Map getUserInfoMap(ObjectID oid, RequestContext context)
{
if (log.isDebugEnabled())
- log.debug("Getting user info for portlet application: "
- + oid.toString());
+ {
+ //log.debug("Getting user info for portlet application: "
+ // + oid.toString());
+ Object[] args = new Object[]
+ {oid.toString()};
+ log.log("1200277", args); // REPLACED
+ }
// Check if user info map is in cache.
if (userInfoMapCache.containsKey(oid)) { return (Map) userInfoMapCache
@@ -133,14 +139,26 @@
Preferences userPrefs = getUserPreferences(context);
if (null == userPrefs)
{
- log.debug(PortletRequest.USER_INFO + " is set to null");
+ //log.debug(PortletRequest.USER_INFO + " is set to null");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {PortletRequest.USER_INFO};
+ log.log("1200278", args); // REPLACED
+ }
return null;
}
MutablePortletApplication pa = registry.getPortletApplication(oid);
if (null == pa)
{
- log.debug(PortletRequest.USER_INFO + " is set to null");
+ //log.debug(PortletRequest.USER_INFO + " is set to null");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {PortletRequest.USER_INFO};
+ log.log("1200279", args); // REPLACED
+ }
return null;
}
Preferences userInfoPrefs = userPrefs.node(userInfoPropertySet);
@@ -178,12 +196,20 @@
{
propertyKeys = userInfoPrefs.keys();
if ((null != propertyKeys) && log.isDebugEnabled())
- log.debug("Found " + propertyKeys.length + " children for "
- + userInfoPrefs.absolutePath());
+ {
+ //log.debug("Found " + propertyKeys.length + " children for "
+ // + userInfoPrefs.absolutePath());
+ Object[] args = new Object[]
+ {propertyKeys.length, userInfoPrefs.absolutePath()};
+ log.log("1200280", args); // REPLACED
+ }
}
catch (BackingStoreException bse)
{
- log.error("BackingStoreException: " + bse.toString());
+ //log.error("BackingStoreException: " + bse.toString());
+ Object[] args = new Object[]
+ {bse.toString()};
+ log.log("1200281", args); // REPLACED
}
if (null == propertyKeys) { return null; }
@@ -247,7 +273,13 @@
UserPrincipal.class);
if (null != userPrincipal)
{
- log.debug("Got user principal: " + userPrincipal.getName());
+ //log.debug("Got user principal: " + userPrincipal.getName());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {userPrincipal.getName()};
+ log.log("1200282", args); // REPLACED
+ }
try
{
if (userMgr.userExists(userPrincipal.getName()))
@@ -258,8 +290,9 @@
}
catch (SecurityException sex)
{
- log.warn("Unexpected SecurityException in UserInfoManager",
- sex);
+ //log.warn("Unexpected SecurityException in UserInfoManager",
+ // sex);
+ log.log("1200283", sex); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -25,8 +25,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.SecurityException;
@@ -80,7 +81,13 @@
UserPrincipal.class);
if (null != userPrincipal)
{
- log.debug("Got user principal: " + userPrincipal.getName());
+ //log.debug("Got user principal: " + userPrincipal.getName());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {userPrincipal.getName()};
+ log.log("1200284", args); // REPLACED
+ }
try
{
if (userManager.userExists(userPrincipal.getName()))
@@ -105,10 +112,11 @@
}
catch (SecurityException sex)
{
- log
- .warn(
- "Unexpected SecurityException in UserInfoManager",
- sex);
+ //log
+ // .warn(
+ // "Unexpected SecurityException in UserInfoManager",
+ // sex);
+ log.log("120285", sex); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/ExtendedPortletMetadata.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -21,10 +21,11 @@
import java.util.Collection;
import java.util.Iterator;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.portlet.CustomPortletMode;
import org.apache.jetspeed.om.common.portlet.CustomWindowState;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,9 +20,10 @@
import java.util.Collection;
import java.util.Iterator;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.Support;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
@@ -328,10 +329,15 @@
}
if (roles.get(roleName) == null)
{
- String errorMsg = "Undefined security role " + roleName
- + " referenced from portlet " + portlet.getName();
- log.error(errorMsg);
- throw new PortletApplicationException(errorMsg);
+ //String errorMsg = "Undefined security role " + roleName
+ // + " referenced from portlet " + portlet.getName();
+ //log.error(errorMsg);
+ Object[] args = new Object[]
+ {roleName, portlet.getName()};
+ log.log("1200286", args); // REPLACED
+ //throw new PortletApplicationException(errorMsg);
+ throw new PortletApplicationException(log
+ .getString("1200286"));
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -39,8 +39,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
@@ -267,7 +268,12 @@
{
if (e instanceof FileNotFoundException)
{
- log.info("No extended metadata found.");
+ //log.info("No extended metadata found.");
+ if (log.isInfoEnabled())
+ {
+ log.log("1200287"); // REPLACED
+ }
+
}
else
{
@@ -350,11 +356,13 @@
}
catch (UnsupportedEncodingException e)
{
- log.warn("Unsupported encoding.", e);
+ //log.warn("Unsupported encoding.", e);
+ log.log("1200288", e); // REPLACED
}
catch (IOException e)
{
- log.warn("Unsupported encoding.", e);
+ //log.warn("Unsupported encoding.", e);
+ log.log("1200289", e); // REPLACED
}
// Reset the bytes read
@@ -733,7 +741,14 @@
("WEB-INF/classes/"));
if (webInfClasses.exists())
{
- log.info("Adding " + webInfClasses.toURL() + " to class path.");
+ //log.info("Adding " + webInfClasses.toURL() + " to class path.");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {webInfClasses.toURL()};
+ log.log("1200290", args); // REPLACED
+ }
+
urls.add(webInfClasses.toURL());
}
@@ -746,7 +761,13 @@
for (int i = 0; i < jars.length; i++)
{
File jar = jars[i];
- log.info("Adding " + jar.toURL() + " to class path.");
+ //log.info("Adding " + jar.toURL() + " to class path.");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {jar.toURL()};
+ log.log("1200291", args); // REPLACED
+ }
urls.add(jar.toURL());
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -20,8 +20,9 @@
import javax.portlet.PortletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.layout.JetspeedPowerTool;
import org.apache.jetspeed.request.RequestContext;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -34,10 +34,11 @@
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletRequest;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PortletRenderer;
@@ -493,7 +494,10 @@
}
catch (TemplateLocatorException e)
{
- log.warn(e.toString(), e);
+ //log.warn(e.toString(), e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1200292", args, e); // REPLACED
return null;
}
}
@@ -710,7 +714,10 @@
}
catch (TemplateLocatorException e)
{
- log.error("Unable to locate template: " + path, e);
+ //log.error("Unable to locate template: " + path, e);
+ Object[] args = new Object[]
+ {path};
+ log.log("1200293", args, e); // REPLACED
// System.out.println("Unable to locate template: " + path);
throw e;
}
@@ -726,7 +733,10 @@
*/
protected void handleError(Exception e, String msg, ContentFragment fragment)
{
- log.error(msg, e);
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {msg};
+ log.log("1200294", args, e); // REPLACED
Set exceptions = (Set) renderRequest
.getAttribute(FRAGMENT_PROCESSING_ERROR_PREFIX
@@ -798,8 +808,11 @@
}
catch (Exception e)
{
- log.error("Unable to reteive portlet title: " + e.getMessage(),
- e);
+ //log.error("Unable to reteive portlet title: " + e.getMessage(),
+ //e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200295", args, e); // REPLACED
return "Title Error: " + e.getMessage();
}
}
@@ -827,7 +840,10 @@
}
catch (Exception e)
{
- log.error("Unable to reteive portlet title: " + e.getMessage(), e);
+ //log.error("Unable to reteive portlet title: " + e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1200296", args, e); // REPLACED
return "Title Error: " + e.getMessage();
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -31,13 +31,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.collections.ExtendedProperties;
import org.apache.commons.collections.map.LRUMap;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.capabilities.CapabilityMap;
@@ -544,8 +545,9 @@
}
catch (TemplateLocatorException tle)
{
- log.error("getVelocityEngine(): unable create base descriptor",
- tle);
+ //log.error("getVelocityEngine(): unable create base descriptor",
+ // tle);
+ log.log("1200297", tle); // REPLACED
}
// TODO Findbugs
descriptor.setMediaType(layoutMediaType);
@@ -587,10 +589,13 @@
}
catch (ConfigurationException ce)
{
- log.warn(
- "getVelocityEngine(): unable read decorator properties from "
- + propertiesDescriptor.getAbsolutePath(),
- ce);
+ //log.warn(
+ // "getVelocityEngine(): unable read decorator properties from "
+ // + propertiesDescriptor.getAbsolutePath(),
+ // ce);
+ Object[] args = new Object[]
+ {propertiesDescriptor.getAbsolutePath()};
+ log.log("1200298", args, ce); // REPLACED
}
}
if (configuration != null)
@@ -767,24 +772,35 @@
velocity.init();
if (macros != null)
{
- log
- .debug("initVelocity(): create new VelocityEngine instance to support "
- + macros.getAppRelativePath()
- + " decoration template macros");
+ //log
+ // .debug("initVelocity(): create new VelocityEngine instance to support "
+ // + macros.getAppRelativePath()
+ // + " decoration template macros");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {macros.getAppRelativePath()};
+ log.log("1200299", args); // REPLACED
+ }
}
else
{
- log
- .debug("initVelocity(): create new default VelocityEngine instance");
+ //log
+ // .debug("initVelocity(): create new default VelocityEngine instance");
+ if (log.isDebugEnabled())
+ {
+ log.log("1200300"); // REPLACED
+ }
}
return velocity;
}
catch (Exception e)
{
- log
- .error(
- "initVelocity(): unable to initialize velocity engine instance, using default singleton",
- e);
+ //log
+ // .error(
+ // "initVelocity(): unable to initialize velocity engine instance, using default singleton",
+ // e);
+ log.log("1200301", e); // REPLACED
}
return null;
}
@@ -831,11 +847,13 @@
html.append("Content is not available");
html.append("<b>\n");
getResponseWriter(response).write(html.toString());
- log.error("Error processing vm template ", e);
+ //log.error("Error processing vm template ", e);
+ log.log("1200302", e); // REPLACED
}
catch (Exception e2)
{
- log.error("Error writing error message to vm template ", e2);
+ //log.error("Error writing error message to vm template ", e2);
+ log.log("1200303", e2); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-09-02 20:50:40 UTC (rev 1106)
@@ -31,8 +31,9 @@
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
@@ -298,13 +299,16 @@
// log fallback
if (log.isDebugEnabled())
{
- log
- .debug(
- "Missing/forbidden page selection fallback: request path="
- + requestPath
- + ", attempting fallback request path="
- + fallbackRequestPath,
- fallbackException);
+ //log
+ // .debug(
+ // "Missing/forbidden page selection fallback: request path="
+ // + requestPath
+ // + ", attempting fallback request path="
+ // + fallbackRequestPath,
+ // fallbackException);
+ Object[] args = new Object[]
+ {requestPath, fallbackRequestPath};
+ log.log("1300001", args, fallbackException); // REPLACED
}
// clear all history entries for fallback
@@ -428,9 +432,12 @@
if (log.isDebugEnabled()
&& !path.equals(requestPath))
{
- log
- .debug("Request page modified by profile locator: request path="
- + path);
+ //log
+ // .debug("Request page modified by profile locator: request path="
+ // + path);
+ Object[] args = new Object[]
+ {path};
+ log.log("1300002", args); // REPLACED
}
}
return path;
@@ -477,7 +484,10 @@
// log page request
if (log.isDebugEnabled())
{
- log.debug("Request page: request path=" + requestPath);
+ //log.debug("Request page: request path=" + requestPath);
+ Object[] args = new Object[]
+ {requestPath};
+ log.log("1300003", args); // REPLACED
}
// lookup request path in view for viewable page or folder
@@ -620,10 +630,13 @@
// log selected request page
if (log.isDebugEnabled())
{
- log
- .debug("Selected folder historical page: path="
- + view.getManagedPage(
- requestPage).getPath());
+ //log
+ // .debug("Selected folder historical page: path="
+ // + view.getManagedPage(
+ // requestPage).getPath());
+ Object[] args = new Object[]
+ {view.getManagedPage(requestPage).getPath()};
+ log.log("1300004", args); // REPLACED
}
return requestPage;
}
@@ -657,9 +670,12 @@
// log selected request page
if (log.isDebugEnabled())
{
- log.debug("Selected folder default page: path="
- + view.getManagedPage(requestPage)
- .getPath());
+ //log.debug("Selected folder default page: path="
+ // + view.getManagedPage(requestPage)
+ // .getPath());
+ Object[] args = new Object[]
+ {view.getManagedPage(requestPage).getPath()};
+ log.log("1300005", args); // REPLACED
}
return requestPage;
}
@@ -688,8 +704,11 @@
// log selected request page
if (log.isDebugEnabled())
{
- log.debug("Selected first folder page, path="
- + view.getManagedPage(requestPage).getPath());
+ //log.debug("Selected first folder page, path="
+ // + view.getManagedPage(requestPage).getPath());
+ Object[] args = new Object[]
+ {view.getManagedPage(requestPage).getPath()};
+ log.log("1300006", args); // REPLACED
}
return requestPage;
}
@@ -710,8 +729,11 @@
// log selected request page
if (log.isDebugEnabled())
{
- log.debug("Selected page, path="
- + view.getManagedPage(requestPage).getPath());
+ //log.debug("Selected page, path="
+ // + view.getManagedPage(requestPage).getPath());
+ Object[] args = new Object[]
+ {view.getManagedPage(requestPage).getPath()};
+ log.log("1300007", args); // REPLACED
}
return requestPage;
}
@@ -879,7 +901,10 @@
debug.append("null");
}
debug.append(")");
- log.debug(debug);
+ //log.debug(debug);
+ Object[] args = new Object[]
+ {debug};
+ log.log("1300008", args); // REPLACED
}
// return valid
@@ -929,8 +954,11 @@
// log site view creation
if (log.isDebugEnabled())
{
- log.debug("Created site view: search paths="
- + siteView.getSearchPathsString());
+ //log.debug("Created site view: search paths="
+ // + siteView.getSearchPathsString());
+ Object[] args = new Object[]
+ {siteView.getSearchPathsString()};
+ log.log("1300009", args); // REPLACED
}
}
return siteView;
@@ -1211,13 +1239,17 @@
{
if (node != null)
{
- log.debug("Page manager update event, (node=" + node.getPath()
- + "): set session context state stale");
+ //log.debug("Page manager update event, (node=" + node.getPath()
+ // + "): set session context state stale");
+ Object[] args = new Object[]
+ {node.getPath()};
+ log.log("1300010", args); // REPLACED
}
else
{
- log
- .debug("Page manager update event: set session context state stale");
+ //log
+ // .debug("Page manager update event: set session context state stale");
+ log.log("1300011"); // REPLACED
}
}
}
@@ -1253,8 +1285,9 @@
// log activation event
if (log.isDebugEnabled())
{
- log
- .debug("Session activation event: set session context state stale");
+ //log
+ // .debug("Session activation event: set session context state stale");
+ log.log("1300012"); // REPLACED
}
}
@@ -1273,8 +1306,9 @@
// log activation event
if (log.isDebugEnabled())
{
- log
- .debug("Session deactivation event: clear session context state");
+ //log
+ // .debug("Session deactivation event: clear session context state");
+ log.log("1300013"); // REPLACED
}
}
@@ -1300,7 +1334,8 @@
// log binding event
if (log.isDebugEnabled())
{
- log.debug("Session bound event: setup page manager listener");
+ //log.debug("Session bound event: setup page manager listener");
+ log.log("1300014"); // REPLACED
}
}
@@ -1329,8 +1364,9 @@
// log binding event
if (log.isDebugEnabled())
{
- log
- .debug("Session unbound event: clear page manager listener and session context state");
+ //log
+ // .debug("Session unbound event: clear page manager listener and session context state");
+ log.log("1300015"); // REPLACED
}
}