You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by as...@apache.org on 2017/07/14 19:21:49 UTC

[6/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK from java.util.logging to SLF4J (code review)

PLUTO-663 Migrate Portlet 3.0 TCK from java.util.logging to SLF4J (code review)


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/8cb2fa55
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/8cb2fa55
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/8cb2fa55

Branch: refs/heads/master
Commit: 8cb2fa5565cc1f2fe37b807d936a42aae13f0a8d
Parents: c58aea5
Author: Neil Griffin <ne...@gmail.com>
Authored: Fri Jul 14 15:21:13 2017 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Fri Jul 14 15:21:13 2017 -0400

----------------------------------------------------------------------
 .../TestModule1_GetInitParameterNamesTest1.java |  8 ++-----
 .../TestModule1_PortletCanBeRendered.java       |  8 +++----
 .../portlets/TestModule1_PortletConfigTest.java |  9 ++-----
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../TestModule2_CanCreateRenderURL.java         |  7 ++----
 .../portlets/TestModule2_CompanionPortlet.java  |  7 ++----
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../portlets/TestModule3_Portlet1.java          |  7 ++----
 .../portlets/TestModule3_Portlet2.java          |  7 ++----
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../AddlFilterTests_SPEC2_20_Event_event.java   | 10 ++++----
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...Tests_SPEC2_15_EventEventHandling_event.java | 11 +++++----
 ...EventEventHandling_unavailableException.java |  9 ++++---
 .../AddlPortletTests_SPEC2_15_Event_event.java  |  4 ++--
 ...ortletTests_SPEC2_5_EventHandling_event.java |  7 +++---
 ...ests_SPEC2_5_RenderGenericPortlet_event.java |  7 +++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...dlRequestTests_SPEC2_11_EventAttr_event.java |  6 ++---
 ...ddlRequestTests_SPEC2_11_EventReq_event.java |  6 ++---
 .../AddlRequestTests_SPEC2_11_Event_event.java  |  5 ++--
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../AddlResponseTests_SPEC2_12_Event_event.java |  6 ++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../AnnotationTests_ProcessEvent_ApiEvent.java  |  7 +++---
 ...tationTests_ProcessEvent_ApiEvent_event.java | 13 ++++------
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...Tests_PortletPreferences_ApiEvent_event.java |  7 +++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...rTests_EventFilter_ApiEventFilter_event.java |  7 +++---
 ...Tests_EventFilter_ApiEventFilter_event2.java |  7 +++---
 ...rTests_FilterChain_ApiEventFilter_event.java |  7 +++---
 ...ests_PortletFilter_ApiEventFilter_event.java |  7 +++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...aryTests_SPEC2_26_IncludeJSPEvent_event.java |  6 ++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...ortletTests_EventPortlet_ApiEvent_event.java |  7 +++---
 .../portlets/PortletTests_Event_ApiEvent.java   |  5 ++--
 .../PortletTests_Event_ApiEvent_event.java      |  9 ++++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../RequestTests_ActionRequest_ApiAction.java   | 13 ++++------
 ...equestTests_ClientDataRequest_ApiAction.java | 15 ++++--------
 .../RequestTests_EventRequest_ApiEvent.java     | 13 ++++------
 ...equestTests_EventRequest_ApiEvent_event.java | 15 +++++-------
 .../RequestTests_PortletRequest_ApiAction.java  | 13 ++++------
 .../RequestTests_PortletRequest_ApiEvent.java   | 13 ++++------
 ...uestTests_PortletRequest_ApiEvent_event.java | 14 +++++------
 .../RequestTests_PortletRequest_ApiRender.java  | 13 ++++------
 ...RequestTests_PortletRequest_ApiResource.java | 13 ++++------
 .../RequestTests_RenderRequest_ApiRender.java   | 13 ++++------
 ...equestTests_ResourceRequest_ApiResource.java | 12 ++++------
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 ...gTestsEvent_EventRequest_SIGEvent_event.java |  7 +++---
 ...TestsEvent_EventResponse_SIGEvent_event.java |  7 +++---
 .../SigTestsEvent_Event_SIGEvent_event.java     |  9 ++++---
 ...estsEvent_PortletRequest_SIGEvent_event.java |  7 +++---
 ...stsEvent_PortletResponse_SIGEvent_event.java |  7 +++---
 ...Event_StateAwareResponse_SIGEvent_event.java |  7 +++---
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../ResourceAsyncTests_SPEC_21_Async.java       |  2 +-
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../src/main/resources/log4j.properties         | 20 ++++++++++++++++
 .../javax/portlet/tck/beans/ClassChecker.java   | 13 ++++------
 .../javax/portlet/tck/portlets/TestPortlet.java | 25 +++++---------------
 .../tck/servlets/IncluderForwarderServlet.java  | 10 ++++----
 .../tck/servlets/MultipleIncludeServlet.java    |  7 +++---
 95 files changed, 1078 insertions(+), 276 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_GetInitParameterNamesTest1.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_GetInitParameterNamesTest1.java b/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_GetInitParameterNamesTest1.java
index b9a5c35..9624edf 100644
--- a/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_GetInitParameterNamesTest1.java
+++ b/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_GetInitParameterNamesTest1.java
@@ -45,8 +45,6 @@ import org.slf4j.LoggerFactory;
  * additionalTCs.xml file into the complete list of test case names for execution by the driver.
  */
 public class TestModule1_GetInitParameterNamesTest1 implements Portlet {
-   private static final String LOG_CLASS = 
-         TestModule1_GetInitParameterNamesTest1.class.getName();
    
    // Tests defined in this portlet
    private final static String TEST1 = "TestModule1_GetInitParameterNamesTest1"; 
@@ -62,7 +60,7 @@ public class TestModule1_GetInitParameterNamesTest1 implements Portlet {
       return t;
    }
    
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule1_GetInitParameterNamesTest1.class);
 
    private PortletConfig config = null;
 
@@ -80,9 +78,7 @@ public class TestModule1_GetInitParameterNamesTest1 implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
       
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
       

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletCanBeRendered.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletCanBeRendered.java b/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletCanBeRendered.java
index bbae3d9..19eaf6d 100644
--- a/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletCanBeRendered.java
+++ b/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletCanBeRendered.java
@@ -39,11 +39,11 @@ import org.slf4j.LoggerFactory;
  * case list automatically during the build process.
  */
 public class TestModule1_PortletCanBeRendered implements Portlet {
-   private static final String LOG_CLASS = TestModule1_PortletCanBeRendered.class.getName();
+
    private static final String tcName = "TestModule1_PortletCanBeRendered";
    private static final String tcDetail = "The test result text is displayed.";
    
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule1_PortletCanBeRendered.class);
 
    @Override
    public void init(PortletConfig config) throws PortletException {
@@ -58,9 +58,7 @@ public class TestModule1_PortletCanBeRendered implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
       
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
       

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletConfigTest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletConfigTest.java b/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletConfigTest.java
index 22459d5..3c74f3b 100644
--- a/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletConfigTest.java
+++ b/portlet-tck_3.0/TestModule1/src/main/java/javax/portlet/tck/TestModule1/portlets/TestModule1_PortletConfigTest.java
@@ -45,9 +45,6 @@ import org.slf4j.LoggerFactory;
  * additionalTCs.xml file into the complete list of test case names for execution by the driver.
  */
 public class TestModule1_PortletConfigTest implements Portlet {
-   private static final String LOG_CLASS = 
-         TestModule1_PortletConfigTest.class.getName();
-   
    
    // Tests defined in this portlet
    private final static String TEST0 = "TestModule1_PortletConfigTest";          
@@ -65,7 +62,7 @@ public class TestModule1_PortletConfigTest implements Portlet {
       return t;
    }
    
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule1_PortletConfigTest.class);
    
    private PortletConfig config = null;
 
@@ -83,9 +80,7 @@ public class TestModule1_PortletConfigTest implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
       
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
       

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule1/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule1/src/main/resources/log4j.properties b/portlet-tck_3.0/TestModule1/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/TestModule1/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/TestModule1/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CanCreateRenderURL.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CanCreateRenderURL.java b/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CanCreateRenderURL.java
index eb6f813..037b96b 100644
--- a/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CanCreateRenderURL.java
+++ b/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CanCreateRenderURL.java
@@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory;
  */
 @SuppressWarnings("deprecation")
 public class TestModule2_CanCreateRenderURL implements Portlet {
-   private static final String LOG_CLASS = TestModule2_CanCreateRenderURL.class.getName();
 
    // Tests defined in this portlet
    private final static String TEST0 = "TestModule2_CanCreateRenderURL";          
@@ -63,7 +62,7 @@ public class TestModule2_CanCreateRenderURL implements Portlet {
       return t;
    }
 
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule2_CanCreateRenderURL.class);
 
    @Override
    public void init(PortletConfig config) throws PortletException {
@@ -78,9 +77,7 @@ public class TestModule2_CanCreateRenderURL implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
 
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
       TestResult tr = null;

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CompanionPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CompanionPortlet.java b/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CompanionPortlet.java
index 9548fa5..9d22ced 100644
--- a/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CompanionPortlet.java
+++ b/portlet-tck_3.0/TestModule2/src/main/java/javax/portlet/tck/TestModule2/portlets/TestModule2_CompanionPortlet.java
@@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
  */
 @SuppressWarnings("deprecation")
 public class TestModule2_CompanionPortlet implements Portlet {
-   private static final String LOG_CLASS = TestModule2_CompanionPortlet.class.getName();
 
    // Tests defined in this portlet
    private final static String TEST4 = "TestModule2_PublicRenderParameterCanBeSetThroughUrl";   
@@ -53,7 +52,7 @@ public class TestModule2_CompanionPortlet implements Portlet {
       return t;
    }
 
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule2_CompanionPortlet.class);
 
    @Override
    public void init(PortletConfig config) throws PortletException {
@@ -68,9 +67,7 @@ public class TestModule2_CompanionPortlet implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
 
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
       TestResult tr = null;

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule2/src/main/resources/log4j.properties b/portlet-tck_3.0/TestModule2/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/TestModule2/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/TestModule2/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule3-portlet1/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet1.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule3-portlet1/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet1.java b/portlet-tck_3.0/TestModule3-portlet1/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet1.java
index a5ca80d..7732d67 100644
--- a/portlet-tck_3.0/TestModule3-portlet1/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet1.java
+++ b/portlet-tck_3.0/TestModule3-portlet1/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet1.java
@@ -42,9 +42,8 @@ import static javax.portlet.tck.beans.TestModule3Definitions.*;
  */
 @SuppressWarnings("deprecation")
 public class TestModule3_Portlet1 implements Portlet {
-   private static final String LOG_CLASS = TestModule3_Portlet1.class.getName();
 
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule3_Portlet1.class);
 
    @Override
    public void init(PortletConfig config) throws PortletException {
@@ -59,9 +58,7 @@ public class TestModule3_Portlet1 implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
 
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java b/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
index 3b4deb5..ffb0711 100644
--- a/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
+++ b/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
@@ -42,9 +42,8 @@ import static javax.portlet.tck.beans.TestModule3Definitions.*;
  */
 @SuppressWarnings("deprecation")
 public class TestModule3_Portlet2 implements Portlet {
-   private static final String LOG_CLASS = TestModule3_Portlet2.class.getName();
 
-   private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+   private final Logger LOGGER = LoggerFactory.getLogger(TestModule3_Portlet2.class);
 
    @Override
    public void init(PortletConfig config) throws PortletException {
@@ -59,9 +58,7 @@ public class TestModule3_Portlet2 implements Portlet {
    public void render(RenderRequest request, RenderResponse response)
          throws PortletException, IOException {
 
-      if (LOGGER.isTraceEnabled()) {
-         LOGGER.trace(LOG_CLASS + " render: Entry");
-      }
+      LOGGER.trace("render: Entry");
 
       PrintWriter writer = response.getWriter();
       TestResult tr = null;

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/TestModule3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule3/src/main/resources/log4j.properties b/portlet-tck_3.0/TestModule3/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/TestModule3/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/TestModule3/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
index 730e8e9..73dae52 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
@@ -50,8 +50,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  */
 public class AddlFilterTests_SPEC2_20_Event_event
     implements Portlet, EventPortlet, ResourceServingPortlet {
-  private static final String LOG_CLASS = AddlFilterTests_SPEC2_20_Event_event.class.getName();
-  private static final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(AddlFilterTests_SPEC2_20_Event_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {
@@ -66,13 +66,13 @@ public class AddlFilterTests_SPEC2_20_Event_event
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.error(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override
   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.error(LOG_CLASS + " event companion serveResource - ERROR!!");
+    LOGGER.trace("event companion serveResource - ERROR!!");
   }
 
   @Override
@@ -81,7 +81,7 @@ public class AddlFilterTests_SPEC2_20_Event_event
 
     long tid = Thread.currentThread().getId();
     portletReq.setAttribute(THREADID_ATTR, tid);
-    LOGGER.info(LOG_CLASS + " event companion processEvent - INFO!!");
+    LOGGER.trace("event companion processEvent - INFO!!");
 
   }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java
index 864c516..296532d 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java
@@ -63,9 +63,8 @@ import static javax.xml.XMLConstants.NULL_NS_URI;
  * @author ahmed
  */
 public class AddlPortletTests_SPEC2_15_EventEventHandling_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      AddlPortletTests_SPEC2_15_EventEventHandling_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlPortletTests_SPEC2_15_EventEventHandling_event.class);
 
   public static boolean tr8 = false;
 
@@ -78,7 +77,7 @@ public class AddlPortletTests_SPEC2_15_EventEventHandling_event implements Portl
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override
@@ -95,7 +94,9 @@ public class AddlPortletTests_SPEC2_15_EventEventHandling_event implements Portl
     JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
     Event event = portletReq.getEvent();
     String qName = event.getName();
-    LOGGER.info(LOG_CLASS + " Event name is " + event.getQName().getNamespaceURI());
+    if (LOGGER.isTraceEnabled()) {
+      LOGGER.trace("Event name is {}", event.getQName().getNamespaceURI());
+    }
     if (qName.equals("AddlPortletTests_SPEC2_15_EventEventHandling_empty")) {
       /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event9 */
       /* Details: "If the Event object does not have a value set when the */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.java
index 2605b9e..a0d2093 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.java
@@ -44,9 +44,8 @@ import org.slf4j.LoggerFactory;
  */
 public class AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException
     implements Portlet, EventPortlet, ResourceServingPortlet {
-  private static final String LOG_CLASS =
-      AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException.class);
 
 
   @Override
@@ -60,13 +59,13 @@ public class AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override
   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion serveResource - ERROR!!");
+    LOGGER.trace("event companion serveResource - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
index 12009e0..fd01bf8 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
@@ -48,9 +48,9 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * @author ahmed
  */
 public class AddlPortletTests_SPEC2_15_Event_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS = AddlPortletTests_SPEC2_15_Event_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
 
+  @SuppressWarnings("unused")
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlPortletTests_SPEC2_15_Event_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java
index 941ad31..201ddd3 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java
@@ -49,9 +49,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * @author ahmed
  */
 public class AddlPortletTests_SPEC2_5_EventHandling_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      AddlPortletTests_SPEC2_5_EventHandling_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlPortletTests_SPEC2_5_EventHandling_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}
@@ -62,7 +61,7 @@ public class AddlPortletTests_SPEC2_5_EventHandling_event implements Portlet, Ev
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.java
index b54a7e1..75e6cdf 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.java
@@ -52,14 +52,13 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
  * @author ahmed
  */
 public class AddlPortletTests_SPEC2_5_RenderGenericPortlet_event extends GenericPortlet {
-  private static final String LOG_CLASS =
-      AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlPortletTests_SPEC2_5_RenderGenericPortlet_event.class);
 
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @ProcessEvent(qname = "AddlPortletTests_SPEC2_5_RenderGenericPortlet")

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
index 6d462b2..85f91c1 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
@@ -50,8 +50,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * @author ahmed
  */
 public class AddlRequestTests_SPEC2_11_EventAttr_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS = AddlRequestTests_SPEC2_11_EventAttr_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlRequestTests_SPEC2_11_EventAttr_event.class);
 
 
   @Override
@@ -63,7 +63,7 @@ public class AddlRequestTests_SPEC2_11_EventAttr_event implements Portlet, Event
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
index 25f3e14..300c61d 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
@@ -55,8 +55,8 @@ import org.apache.commons.lang3.StringUtils;
  * @author ahmed
  */
 public class AddlRequestTests_SPEC2_11_EventReq_event implements Portlet, EventPortlet {
-   private static final String LOG_CLASS = AddlRequestTests_SPEC2_11_EventReq_event.class.getName();
-   private final org.slf4j.Logger LOGGER    = LoggerFactory.getLogger(LOG_CLASS);
+
+   private final Logger LOGGER = LoggerFactory.getLogger(AddlRequestTests_SPEC2_11_EventReq_event.class);
 
    @Override
    public void init(PortletConfig config) throws PortletException {
@@ -68,7 +68,7 @@ public class AddlRequestTests_SPEC2_11_EventReq_event implements Portlet, EventP
 
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
-      LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+      LOGGER.trace("event companion processAction - ERROR!!");
    }
 
    @SuppressWarnings("deprecation")

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
index dc29037..755749a 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
@@ -49,9 +49,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * @author ahmed
  */
 public class AddlRequestTests_SPEC2_11_Event_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS = AddlRequestTests_SPEC2_11_Event_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
 
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlRequestTests_SPEC2_11_Event_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}
@@ -62,7 +61,7 @@ public class AddlRequestTests_SPEC2_11_Event_event implements Portlet, EventPort
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
index 25dca2d..5844a31 100644
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
@@ -54,8 +54,8 @@ import static javax.portlet.ResourceURL.PAGE;
  */
 public class AddlResponseTests_SPEC2_12_Event_event
     implements Portlet, EventPortlet, ResourceServingPortlet {
-  private static final String LOG_CLASS = AddlResponseTests_SPEC2_12_Event_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AddlResponseTests_SPEC2_12_Event_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}
@@ -66,7 +66,7 @@ public class AddlResponseTests_SPEC2_12_Event_event
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
index 98b510a..fe485a1 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
@@ -47,8 +47,9 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class AnnotationTests_ProcessEvent_ApiEvent extends GenericPortlet {
-  private static final String LOG_CLASS = AnnotationTests_ProcessEvent_ApiEvent.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  @SuppressWarnings("unused")
+  private final Logger LOGGER = LoggerFactory.getLogger(AnnotationTests_ProcessEvent_ApiEvent.class);
 
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
@@ -62,7 +63,7 @@ public class AnnotationTests_ProcessEvent_ApiEvent extends GenericPortlet {
         .startsWith(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_QNAME)) {
       QName eventQName = new QName(TCKNAMESPACE, "AnnotationTests_ProcessEvent_ApiEvent");
       portletResp.setEvent(eventQName, "Hi!");
-      LOGGER.trace("Firing event: " + eventQName.toString());
+      LOGGER.trace("Firing event: {}", eventQName.toString());
     } else if (portletReq.getParameter(BUTTON_PARAM_NAME)
         .startsWith(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_NAME)) {
       portletResp.setEvent("AnnotationTests_ProcessEvent_ApiEvent2", "Hi!");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
index e477560..a5558cc 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
@@ -48,20 +48,19 @@ import org.slf4j.LoggerFactory;
  * not publish them. Events are published in the main portlet for the test cases.
  */
 public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet {
-  private static final String LOG_CLASS =
-      AnnotationTests_ProcessEvent_ApiEvent_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(AnnotationTests_ProcessEvent_ApiEvent_event.class);
 
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override
   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion serveResource - ERROR!!");
+    LOGGER.trace("event companion serveResource - ERROR!!");
   }
 
 
@@ -99,9 +98,7 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
         Constants.RESULT_ATTR_PREFIX + "AnnotationTests_ProcessEvent_ApiEvent", writer.toString(),
         APPLICATION_SCOPE);
 
-    LOGGER.info(LOG_CLASS + " Resulting String: " + writer.toString());
-
-
+    LOGGER.trace("Resulting String: {}", writer);
   }
 
   @ProcessEvent(name = "AnnotationTests_ProcessEvent_ApiEvent2")

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2AnnotationTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2AnnotationTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherTests2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherTests2/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherTests3S/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherTests3S/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherTests4/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherTests4/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2DispatcherTests6/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/resources/log4j.properties b/portlet-tck_3.0/V2DispatcherTests6/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletPreferences_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletPreferences_ApiEvent_event.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletPreferences_ApiEvent_event.java
index 17190e8..404e212 100644
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletPreferences_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletPreferences_ApiEvent_event.java
@@ -84,9 +84,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * @author ahmed
  */
 public class EnvironmentTests_PortletPreferences_ApiEvent_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      EnvironmentTests_PortletPreferences_ApiEvent_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(EnvironmentTests_PortletPreferences_ApiEvent_event.class);
 
   public static boolean tr32_success = false;
 
@@ -99,7 +98,7 @@ public class EnvironmentTests_PortletPreferences_ApiEvent_event implements Portl
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2EnvironmentTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2EnvironmentTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2ExceptionTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2ExceptionTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2ExceptionTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2ExceptionTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2ExceptionTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event.java b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event.java
index 0b7e29e..f9d2248 100644
--- a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event.java
+++ b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event.java
@@ -50,9 +50,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * not publish them. Events are published in the main portlet for the test cases.
  */
 public class FilterTests_EventFilter_ApiEventFilter_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      FilterTests_EventFilter_ApiEventFilter_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(FilterTests_EventFilter_ApiEventFilter_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}
@@ -63,7 +62,7 @@ public class FilterTests_EventFilter_ApiEventFilter_event implements Portlet, Ev
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event2.java b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event2.java
index 21cc33d..7fcbb68 100644
--- a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event2.java
+++ b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_EventFilter_ApiEventFilter_event2.java
@@ -43,9 +43,8 @@ import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2FILTERTESTS_EVE
  * @author ahmed
  */
 public class FilterTests_EventFilter_ApiEventFilter_event2 implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      FilterTests_EventFilter_ApiEventFilter_event2.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(FilterTests_EventFilter_ApiEventFilter_event2.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}
@@ -56,7 +55,7 @@ public class FilterTests_EventFilter_ApiEventFilter_event2 implements Portlet, E
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_FilterChain_ApiEventFilter_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_FilterChain_ApiEventFilter_event.java b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_FilterChain_ApiEventFilter_event.java
index 5ba7269..84a7179 100644
--- a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_FilterChain_ApiEventFilter_event.java
+++ b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_FilterChain_ApiEventFilter_event.java
@@ -47,9 +47,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * not publish them. Events are published in the main portlet for the test cases.
  */
 public class FilterTests_FilterChain_ApiEventFilter_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      FilterTests_FilterChain_ApiEventFilter_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(FilterTests_FilterChain_ApiEventFilter_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {}
@@ -60,7 +59,7 @@ public class FilterTests_FilterChain_ApiEventFilter_event implements Portlet, Ev
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_PortletFilter_ApiEventFilter_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_PortletFilter_ApiEventFilter_event.java b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_PortletFilter_ApiEventFilter_event.java
index f8bd3e9..260e935 100644
--- a/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_PortletFilter_ApiEventFilter_event.java
+++ b/portlet-tck_3.0/V2FilterTests/src/main/java/javax/portlet/tck/portlets/FilterTests_PortletFilter_ApiEventFilter_event.java
@@ -41,9 +41,8 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
  * not publish them. Events are published in the main portlet for the test cases.
  */
 public class FilterTests_PortletFilter_ApiEventFilter_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS =
-      FilterTests_PortletFilter_ApiEventFilter_event.class.getName();
-  private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+  private final Logger LOGGER = LoggerFactory.getLogger(FilterTests_PortletFilter_ApiEventFilter_event.class);
 
   @Override
   public void init(PortletConfig config) throws PortletException {
@@ -56,7 +55,7 @@ public class FilterTests_PortletFilter_ApiEventFilter_event implements Portlet,
   @Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
-    LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
+    LOGGER.trace("event companion processAction - ERROR!!");
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2FilterTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2FilterTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2FilterTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2FilterTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2FilterTests/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed  under the  License is distributed on an "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+######################################################################
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.ConsoleAppender
 log4j.appender.R.layout=org.apache.log4j.PatternLayout