Author: julien_viet Date: 2010-02-24 14:49:32 -0500 (Wed, 24 Feb 2010) New Revision: 1852 Removed: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/misc/ components/pc/trunk/test/src/test/resources/jsr168/misc/log4j-war/WEB-INF/ Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java components/pc/trunk/pom.xml components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java components/pc/trunk/test/src/test/build.xml Log: GTNPC-14 : Replace log4j by GateIn logging Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java =================================================================== --- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/response/ErrorResponse.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,7 +23,7 @@ package org.gatein.pc.api.invocation.response; import org.gatein.common.util.Exceptions; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; /** * Application level error. Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java =================================================================== --- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventControllerContextSafeInvoker.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,11 +22,12 @@ ******************************************************************************/ package org.gatein.pc.controller; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.controller.event.EventControllerContext; import org.gatein.pc.controller.event.EventPhaseContext; import org.gatein.pc.controller.event.PortletWindowEvent; import org.gatein.pc.api.invocation.response.PortletInvocationResponse; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; /** * An help class to catch and log exceptions thrown by an event controller context. @@ -38,7 +39,7 @@ { /** . */ - private final Logger log = Logger.getLogger(EventControllerContextSafeInvoker.class); + private final Logger log = LoggerFactory.getLogger(EventControllerContextSafeInvoker.class); public boolean eventProduced(EventControllerContext controllerContext, EventPhaseContext phaseContext, PortletWindowEvent sourceEvent, PortletWindowEvent producedEvent) { Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java =================================================================== --- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/EventPhaseContextImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -24,7 +24,7 @@ import org.gatein.pc.controller.event.EventPhaseContext; import org.gatein.pc.controller.event.PortletWindowEvent; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import java.util.LinkedList; Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java =================================================================== --- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/RequestHandler.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,7 +23,8 @@ package org.gatein.pc.controller; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.PortletInvokerException; import org.gatein.pc.controller.request.ControllerRequest; import org.gatein.pc.controller.response.ControllerResponse; @@ -36,7 +37,7 @@ abstract class RequestHandler<T extends ControllerRequest> { /** . */ - protected static final Logger log = Logger.getLogger(RequestHandler.class); + protected static final Logger log = LoggerFactory.getLogger(RequestHandler.class); /** . */ protected PortletController controller; Modified: components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java =================================================================== --- components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/controller/src/main/java/org/gatein/pc/controller/impl/AbstractPortletControllerContext.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,6 +23,7 @@ package org.gatein.pc.controller.impl; +import org.gatein.common.logging.LoggerFactory; import org.gatein.common.util.MarkupInfo; import org.gatein.common.io.Serialization; import org.gatein.common.net.media.MediaType; @@ -48,7 +49,7 @@ import org.gatein.pc.api.spi.PortletInvocationContext; import org.gatein.pc.api.spi.PortalContext; import org.gatein.wci.IllegalRequestException; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -65,7 +66,7 @@ { /** . */ - private static Logger log = Logger.getLogger(AbstractPortletControllerContext.class); + private static Logger log = LoggerFactory.getLogger(AbstractPortletControllerContext.class); /** . */ public static final PortalContext PORTAL_CONTEXT = new AbstractPortalContext(Collections.singletonMap("javax.portlet.markup.head.element.support", "true")); Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java =================================================================== --- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ */ package org.gatein.pc.federation.impl; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.InvokerUnavailableException; import org.gatein.pc.api.NoSuchPortletException; import org.gatein.pc.api.Portlet; @@ -57,7 +58,7 @@ { /** . */ - private static final Logger log = Logger.getLogger(FederatingPortletInvokerService.class); + private static final Logger log = LoggerFactory.getLogger(FederatingPortletInvokerService.class); /** The separator used in the id to route to the correct invoker. */ static final String SEPARATOR = "."; Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,8 +22,9 @@ ******************************************************************************/ package org.gatein.pc.mc; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import org.gatein.common.io.IOTools; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.PortletInvoker; import org.gatein.pc.portlet.container.ContainerPortletInvoker; import org.gatein.pc.portlet.container.PortletContainer; @@ -91,7 +92,7 @@ } /** . */ - private Logger log = Logger.getLogger(PortletApplicationDeployer.class); + private Logger log = LoggerFactory.getLogger(PortletApplicationDeployer.class); /** . */ private PortletApplicationRegistry registry; Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployment.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.mc; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.impl.info.ContainerInfoBuilder; import org.gatein.pc.portlet.impl.info.ContainerInfoBuilderContext; import org.gatein.pc.portlet.impl.info.ContainerPortletInfo; @@ -71,7 +72,7 @@ this.listener = listener; this.webApp = webApp; this.metaData = metaData; - this.log = Logger.getLogger(PortletApplicationDeployment.class + "." + webApp.getContextPath().replace('.', '_')); + this.log = LoggerFactory.getLogger(PortletApplicationDeployment.class + "." + webApp.getContextPath().replace('.', '_')); } public PortletApplicationLifeCycle getPortletApplicationLifeCycle() Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/LocalizedStringBuilder.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,8 +23,9 @@ package org.gatein.pc.mc.metadata.factory; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import org.gatein.common.i18n.LocalizedString; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.impl.metadata.adapter.LocalizedStringAdapter; import org.gatein.pc.portlet.impl.metadata.common.LocalizedDescriptionMetaData; @@ -44,7 +45,7 @@ private Map<Object, LocalizedMetaDataContainer> map = new LinkedHashMap<Object, LocalizedMetaDataContainer>(); /** The logger. */ - private static final Logger log = Logger.getLogger(LocalizedStringBuilder.class); + private static final Logger log = LoggerFactory.getLogger(LocalizedStringBuilder.class); public void put(Object object, LocalizedDescriptionMetaData description) { Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/metadata/factory/PortletApplicationModelFactory.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,8 +23,9 @@ package org.gatein.pc.mc.metadata.factory; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import org.gatein.common.i18n.LocalizedString; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.LifeCyclePhase; import org.gatein.pc.api.TransportGuarantee; import org.gatein.pc.portlet.impl.metadata.CustomPortletModeMetaData; @@ -80,7 +81,7 @@ private LocalizedStringBuilder displayNames = new LocalizedStringBuilder(); /** Guess what? The logger. */ - private static final Logger log = Logger.getLogger(PortletApplicationModelFactory.class); + private static final Logger log = LoggerFactory.getLogger(PortletApplicationModelFactory.class); public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) { Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/pom.xml 2010-02-24 19:49:32 UTC (rev 1852) @@ -125,6 +125,15 @@ </dependencies> </dependencyManagement> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <!--<version>${org.slf4j.version}</version>--> + <scope>test</scope> + </dependency> + </dependencies> + <build> <plugins> <plugin> Modified: components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java =================================================================== --- components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/ErrorHandlingFilter.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portal; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import javax.servlet.Filter; import javax.servlet.FilterConfig; @@ -42,7 +43,7 @@ { /** . */ - private final Logger log = Logger.getLogger(ErrorHandlingFilter.class); + private final Logger log = LoggerFactory.getLogger(ErrorHandlingFilter.class); public void init(FilterConfig config) throws ServletException { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/aspects/EventPayloadInterceptor.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,6 +22,7 @@ ******************************************************************************/ package org.gatein.pc.portlet.aspects; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.invocation.PortletInvocation; import org.gatein.pc.api.invocation.EventInvocation; import org.gatein.pc.portlet.PortletInvokerInterceptor; @@ -37,7 +38,7 @@ import org.gatein.pc.portlet.impl.info.ContainerTypeInfo; import org.gatein.pc.api.PortletInvokerException; import org.gatein.common.io.IOTools; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import javax.xml.namespace.QName; import java.io.Serializable; @@ -55,7 +56,7 @@ { /** . */ - private final static Logger log = Logger.getLogger(EventPayloadInterceptor.class); + private final static Logger log = LoggerFactory.getLogger(EventPayloadInterceptor.class); public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException { Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/container/LifeCycle.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,11 +22,12 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.container; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.container.managed.ManagedObject; import org.gatein.pc.portlet.container.managed.LifeCycleStatus; import org.gatein.pc.portlet.container.managed.ManagedObjectRegistryEventListener; import org.gatein.pc.portlet.container.managed.ManagedObjectLifeCycleEvent; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import java.util.Set; import java.util.HashSet; @@ -39,7 +40,7 @@ { /** . */ - private Logger log = Logger.getLogger(LifeCycle.class); + private Logger log = LoggerFactory.getLogger(LifeCycle.class); /** . */ private LifeCycleStatus status = LifeCycleStatus.STOPPED; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerCapabilitiesInfo.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.info; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.Mode; import org.gatein.pc.api.WindowState; import org.gatein.common.net.media.MediaType; @@ -44,7 +45,7 @@ */ public class ContainerCapabilitiesInfo implements CapabilitiesInfo { - private final static Logger log = Logger.getLogger(ContainerCapabilitiesInfo.class); + private final static Logger log = LoggerFactory.getLogger(ContainerCapabilitiesInfo.class); /** . */ private final MediaTypeMapImpl<ModeInfo> supportedModes; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/info/ContainerInfoBuilder.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.info; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.Mode; import org.gatein.pc.api.WindowState; import org.gatein.common.i18n.LocaleFormat; @@ -175,7 +176,7 @@ private final Map<org.gatein.pc.api.WindowState, ContainerWindowStateInfo> customWindowStates; /** . */ - private final Logger log = Logger.getLogger(ContainerInfoBuilder.class); + private final Logger log = LoggerFactory.getLogger(ContainerInfoBuilder.class); public ContainerInfoBuilder( String portletApplicationId, Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ClassInstanceLifeCycle.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,7 +23,7 @@ package org.gatein.pc.portlet.impl.jsr168; import org.gatein.pc.portlet.container.PortletInitializationException; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/InlineBundle.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.impl.info.ContainerPortletInfo; import org.gatein.pc.api.info.MetaInfo; @@ -40,7 +41,7 @@ public class InlineBundle extends ListResourceBundle { - private static final Logger log = Logger.getLogger(InlineBundle.class); + private static final Logger log = LoggerFactory.getLogger(InlineBundle.class); /** . */ private final Object[][] content; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletApplicationImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,6 +22,7 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.impl.jsr168.api.PortletContextImpl; import org.gatein.pc.portlet.impl.jsr168.api.PortletURLGenerationListenerChain; import org.gatein.pc.portlet.impl.jsr168.api.FilterConfigImpl; @@ -33,7 +34,7 @@ import org.gatein.pc.portlet.container.PortletContainer; import org.gatein.pc.portlet.container.PortletInitializationException; import org.gatein.pc.portlet.container.object.PortletApplicationObject; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import javax.portlet.PortletContext; import javax.portlet.PortletURLGenerationListener; @@ -77,7 +78,7 @@ { this.info = info; this.portlets = new LinkedHashMap<String, PortletContainer>(); - this.log = Logger.getLogger(PortletApplication.class.getName() + "." + info.getId().replace('.', '_')); + this.log = LoggerFactory.getLogger(PortletApplication.class.getName() + "." + info.getId().replace('.', '_')); } public void setContext(PortletApplicationContext context) Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,9 +22,10 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import org.gatein.common.concurrent.Valve; import org.gatein.common.i18n.ResourceBundleManager; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.PortletInvokerException; import org.gatein.pc.api.invocation.ActionInvocation; import org.gatein.pc.api.invocation.EventInvocation; @@ -159,7 +160,7 @@ // this.info = info; this.valve = new Valve(); - this.log = Logger.getLogger("org.gatein.pc.container." + info.getClassName().replace('.', '_')); + this.log = LoggerFactory.getLogger("org.gatein.pc.container." + info.getClassName().replace('.', '_')); this.started = false; this.filters = new HashSet<PortletFilterImpl>(); } Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletFilterImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,12 +22,13 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.portlet.container.PortletApplication; import org.gatein.pc.portlet.container.PortletFilterContext; import org.gatein.pc.portlet.container.object.PortletFilterObject; import org.gatein.pc.portlet.impl.info.ContainerFilterInfo; import org.gatein.pc.api.LifeCyclePhase; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import javax.portlet.PortletContext; import javax.portlet.filter.ActionFilter; @@ -74,7 +75,7 @@ public PortletFilterImpl(ContainerFilterInfo info) { this.info = info; - this.log = Logger.getLogger(PortletFilterImpl.class); + this.log = LoggerFactory.getLogger(PortletFilterImpl.class); } public <T> T instance(Class<T> type) Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168.api; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.state.PropertyChange; import org.gatein.pc.api.state.PropertyContext; import org.gatein.pc.api.info.PreferenceInfo; @@ -52,7 +53,7 @@ { /** The logger. */ - protected static final Logger log = Logger.getLogger(PortletPreferencesImpl.class); + protected static final Logger log = LoggerFactory.getLogger(PortletPreferencesImpl.class); /** Indicates the object is used during a action phase. */ public static final int ACTION = 1; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletRequestImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168.api; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.common.util.Tools; import org.gatein.common.util.ParameterMap; import org.gatein.common.util.MultiValuedPropertyMap; @@ -80,7 +81,7 @@ { /** . */ - protected static final Logger log = Logger.getLogger(PortletRequestImpl.class); + protected static final Logger log = LoggerFactory.getLogger(PortletRequestImpl.class); /** . */ protected PortletInvocation invocation; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,8 +22,9 @@ ******************************************************************************/ package org.gatein.pc.portlet.impl.jsr168.api; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; import org.gatein.common.NotYetImplemented; +import org.gatein.common.logging.LoggerFactory; import org.gatein.common.util.Tools; import org.gatein.pc.api.ParametersStateString; import org.gatein.pc.portlet.impl.info.ContainerEventInfo; @@ -63,7 +64,7 @@ { /** . */ - private static final Logger log = Logger.getLogger(ActionResponseImpl.class); + private static final Logger log = LoggerFactory.getLogger(ActionResponseImpl.class); /** . */ protected WantUpdate wantUpdate; Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/ProducerPortletInvoker.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.portlet.state.producer; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.InvalidPortletIdException; import org.gatein.pc.api.NoSuchPortletException; import org.gatein.pc.api.Portlet; @@ -86,7 +87,7 @@ private StateConverter stateConverter; /** . */ - private Logger log = Logger.getLogger(ProducerPortletInvoker.class); + private Logger log = LoggerFactory.getLogger(ProducerPortletInvoker.class); public PortletStatePersistenceManager getPersistenceManager() { Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/ErrorResponseRenderer.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -23,7 +23,8 @@ package org.gatein.pc.test.controller; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.api.invocation.response.ErrorResponse; import java.io.IOException; @@ -36,7 +37,7 @@ { /** . */ - private static final Logger log = Logger.getLogger(ErrorResponseRenderer.class); + private static final Logger log = LoggerFactory.getLogger(ErrorResponseRenderer.class); /** . */ private ErrorResponse response; Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/PortletTestSuite.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.test.unit; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.jboss.unit.remote.driver.RemoteTestDriverServer; import org.gatein.common.net.URLNavigator; import org.gatein.common.net.URLVisitor; @@ -58,7 +59,7 @@ { /** . */ - private static final Logger log = Logger.getLogger(PortletTestSuite.class); + private static final Logger log = LoggerFactory.getLogger(PortletTestSuite.class); /** . */ private PortletTestDriver driver; Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/TestAction.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -31,8 +31,10 @@ import java.util.HashMap; import static org.jboss.unit.api.Assert.*; + +import org.gatein.common.logging.LoggerFactory; import org.gatein.common.util.Tools; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -48,7 +50,7 @@ { if (log == null) { - log = Logger.getLogger(getClass()); + log = LoggerFactory.getLogger(getClass()); } return log; } Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestPortlet.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.test.unit.base; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.test.unit.JoinPoint; import org.gatein.pc.test.unit.PortletTestCase; import org.gatein.pc.test.unit.actions.PortletActionTestAction; @@ -448,7 +449,7 @@ { throw new IllegalStateException("The logger should not be re"); } - return Logger.getLogger(getClass()); + return LoggerFactory.getLogger(getClass()); } /** Return the logger. */ Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java =================================================================== --- components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/base/AbstractUniversalTestServlet.java 2010-02-24 19:49:32 UTC (rev 1852) @@ -22,7 +22,8 @@ ******************************************************************************/ package org.gatein.pc.test.unit.base; -import org.apache.log4j.Logger; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.pc.test.unit.JoinPoint; import org.gatein.pc.test.unit.PortletTestCase; import org.gatein.pc.test.unit.actions.ServletServiceTestAction; @@ -49,7 +50,7 @@ { /** The logger. */ - private final Logger log = Logger.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); /** Jointpoint for service method. */ private final JoinPoint serviceJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.SERVLET_SERVICE); Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2010-02-24 16:43:44 UTC (rev 1851) +++ components/pc/trunk/test/src/test/build.xml 2010-02-24 19:49:32 UTC (rev 1852) @@ -333,13 +333,6 @@ <antcall target="__evaluate_properties.tomcat"/> </target> - <macrodef name="package-misc-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr168" testsuitetype="misc" testsuitename="@{test}"/> - </sequential> - </macrodef> - <macrodef name="package-ext-test"> <attribute name="test"/> <sequential> @@ -487,7 +480,6 @@ <package-ext-test test="portletmode"/> <package-ext-test test="portletconfig"/> <package-ext-test test="taglib"/> - <package-misc-test test="log4j"/> <package-jsr286-tck-test test="dispatcher"/> <package-jsr286-tck-test test="portletconfig"/> <package-jsr286-tck-test test="portletconfignonamespace"/> @@ -834,7 +826,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> -<!-- <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> --> + <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> --> <deployable type="war" file="${test.temp.lib}/manager.war"/> <file file="${test.temp.lib}/manager" todir="webapps/manager"/> <deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>