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:44 UTC
[1/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK
from java.util.logging to SLF4J
Repository: portals-pluto
Updated Branches:
refs/heads/master 518089566 -> 8cb2fa556
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
index 63b39ff..1119316 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
@@ -44,7 +44,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -64,6 +63,9 @@ import javax.portlet.tck.beans.TestButton;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -78,7 +80,7 @@ import javax.portlet.tck.constants.Constants;
public class RequestTests_ClientDataRequest_ApiAction implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_ClientDataRequest_ApiAction.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -94,7 +96,7 @@ public class RequestTests_ClientDataRequest_ApiAction implements Portlet, Resour
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
@@ -418,7 +420,7 @@ public class RequestTests_ClientDataRequest_ApiAction implements Portlet, Resour
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -429,7 +431,7 @@ public class RequestTests_ClientDataRequest_ApiAction implements Portlet, Resour
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
index 5bd7c70..1e7bc8f 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
@@ -25,7 +25,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -41,6 +40,9 @@ import javax.portlet.ResourceServingPortlet;
import javax.portlet.tck.beans.TestButton;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -55,7 +57,7 @@ import javax.xml.namespace.QName;
public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_EventRequest_ApiEvent.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -71,7 +73,7 @@ public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServ
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -87,7 +89,7 @@ public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServ
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -99,7 +101,7 @@ public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServ
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
index 6aa4f18..c4dd7ed 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
@@ -28,7 +28,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -49,6 +48,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is the event processing portlet for the test cases. This portlet processes events,
* but does not publish them. Events are published in the main portlet for the test cases.
@@ -56,7 +58,7 @@ import javax.xml.namespace.QName;
public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_EventRequest_ApiEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -72,7 +74,7 @@ public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventP
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
QName eventQName = new QName(TCKNAMESPACE,
"PortletTests_Event_ApiEvent");
portletResp.setEvent(eventQName, "Hi!");
@@ -81,13 +83,13 @@ public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventP
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion serveResource - ERROR!!");
}
@Override
public void processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processEvent");
+ LOGGER.info(LOG_CLASS + " event companion processEvent");
portletResp.setRenderParameters(portletReq);
@@ -135,7 +137,7 @@ public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventP
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion render");
+ LOGGER.info(LOG_CLASS + " event companion render");
portletResp.setContentType("text/html");
PrintWriter writer = portletResp.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
index 363a888..93b9470 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
@@ -128,7 +128,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -155,6 +154,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
import javax.servlet.http.Cookie;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -169,7 +171,7 @@ import javax.servlet.http.Cookie;
public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_PortletRequest_ApiAction.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -185,7 +187,7 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -1271,7 +1273,7 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -1283,7 +1285,7 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
index c33aa91..040cc87 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
@@ -122,8 +122,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
-
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.Portlet;
@@ -138,6 +136,9 @@ import javax.portlet.ResourceServingPortlet;
import javax.portlet.tck.beans.TestButton;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -152,7 +153,7 @@ import javax.xml.namespace.QName;
public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_PortletRequest_ApiEvent.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -168,7 +169,7 @@ public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceSe
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -184,7 +185,7 @@ public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceSe
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -196,7 +197,7 @@ public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceSe
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
index 858d571..594d169 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
@@ -128,7 +128,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -155,6 +154,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
import javax.servlet.http.Cookie;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is the event processing portlet for the test cases. This portlet processes events,
* but does not publish them. Events are published in the main portlet for the test cases.
@@ -162,7 +164,7 @@ import javax.servlet.http.Cookie;
public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_PortletRequest_ApiEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
@@ -177,19 +179,19 @@ public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, Even
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion serveResource - ERROR!!");
}
@Override
public void processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processEvent");
+ LOGGER.info(LOG_CLASS + " event companion processEvent");
portletResp.setRenderParameters(portletReq);
@@ -1263,7 +1265,7 @@ public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, Even
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion render");
+ LOGGER.info(LOG_CLASS + " event companion render");
portletResp.setContentType("text/html");
PrintWriter writer = portletResp.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
index e9711e8..014f735 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
@@ -125,7 +125,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -150,6 +149,9 @@ import javax.portlet.tck.beans.TestLink;
import javax.portlet.tck.beans.TestResult;
import javax.servlet.http.Cookie;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -165,7 +167,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
private static final String LOG_CLASS =
RequestTests_PortletRequest_ApiRender.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -182,7 +184,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -193,7 +195,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -203,7 +205,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
index 0e2e659..bef7460 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
@@ -126,7 +126,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -152,6 +151,9 @@ import javax.portlet.tck.beans.TestLink;
import javax.portlet.tck.beans.TestResult;
import javax.servlet.http.Cookie;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -166,7 +168,7 @@ import javax.servlet.http.Cookie;
public class RequestTests_PortletRequest_ApiResource implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_PortletRequest_ApiResource.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -182,7 +184,7 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -195,7 +197,7 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -1280,7 +1282,7 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
index 275a14e..90470ba 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
@@ -25,8 +25,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
-
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.Portlet;
@@ -41,6 +39,9 @@ import javax.portlet.tck.beans.ClassChecker;
import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -55,7 +56,7 @@ import javax.portlet.tck.beans.TestResult;
public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_RenderRequest_ApiRender.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -71,7 +72,7 @@ public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceSe
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -84,7 +85,7 @@ public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceSe
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -96,7 +97,7 @@ public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceSe
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
index 7815d9e..1d19545 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
@@ -38,7 +38,6 @@ import java.io.PrintWriter;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -55,6 +54,9 @@ import javax.portlet.tck.beans.ClassChecker;
import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -69,7 +71,7 @@ import javax.portlet.tck.beans.TestResult;
public class RequestTests_ResourceRequest_ApiResource implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_ResourceRequest_ApiResource.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
@@ -84,7 +86,7 @@ public class RequestTests_ResourceRequest_ApiResource implements Portlet, Resour
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -97,7 +99,7 @@ public class RequestTests_ResourceRequest_ApiResource implements Portlet, Resour
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -222,7 +224,7 @@ public class RequestTests_ResourceRequest_ApiResource implements Portlet, Resour
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
index 309a93d..5c454d8 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
@@ -21,7 +21,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -40,6 +39,9 @@ import javax.portlet.tck.beans.JSR286SignatureTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENTREQUEST_SIGEVENT_HASGETEVENT;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENTREQUEST_SIGEVENT_HASGETEVENTRETURNS;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENTREQUEST_SIGEVENT_HASGETMETHOD;
@@ -56,7 +58,7 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
public class SigTestsEvent_EventRequest_SIGEvent_event implements Portlet, EventPortlet {
private static final String LOG_CLASS =
SigTestsEvent_EventRequest_SIGEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -69,7 +71,7 @@ public class SigTestsEvent_EventRequest_SIGEvent_event implements Portlet, Event
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
index 0f397df..6badda9 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
@@ -21,7 +21,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -39,6 +38,9 @@ import javax.portlet.tck.beans.JSR286SignatureTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENTRESPONSE_SIGEVENT_HASSETRENDERPARAMETERS;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENTRESPONSE_SIGEVENT_HASSETRENDERPARAMETERSRETURNS;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENTRESPONSE_SIGEVENT_IMPLEMENTSSTATEAWARERESPONSE;
@@ -53,7 +55,7 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
public class SigTestsEvent_EventResponse_SIGEvent_event implements Portlet, EventPortlet {
private static final String LOG_CLASS =
SigTestsEvent_EventResponse_SIGEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -66,7 +68,7 @@ public class SigTestsEvent_EventResponse_SIGEvent_event implements Portlet, Even
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
index c06726e..3b4618e 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
@@ -21,7 +21,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -38,6 +37,9 @@ import javax.portlet.tck.beans.JSR286SignatureTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENT_SIGEVENT_HASGETNAME;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENT_SIGEVENT_HASGETNAMERETURNS;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_EVENT_SIGEVENT_HASGETQNAME;
@@ -55,7 +57,7 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
public class SigTestsEvent_Event_SIGEvent_event implements Portlet, EventPortlet {
private static final String LOG_CLASS =
SigTestsEvent_Event_SIGEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -68,13 +70,13 @@ public class SigTestsEvent_Event_SIGEvent_event implements Portlet, EventPortlet
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
public void processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processEvent");
+ LOGGER.info(LOG_CLASS + " event companion processEvent");
portletResp.setRenderParameters(portletReq);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
index 81d805f..e0273c9 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -40,6 +39,9 @@ import javax.portlet.tck.beans.JSR286SignatureTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_PORTLETREQUEST_SIGEVENT_FIELDACTION_PHASE;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_PORTLETREQUEST_SIGEVENT_FIELDACTION_SCOPE_ID;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_PORTLETREQUEST_SIGEVENT_FIELDBASIC_AUTH;
@@ -142,7 +144,7 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
public class SigTestsEvent_PortletRequest_SIGEvent_event implements Portlet, EventPortlet {
private static final String LOG_CLASS =
SigTestsEvent_PortletRequest_SIGEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -153,7 +155,7 @@ public class SigTestsEvent_PortletRequest_SIGEvent_event implements Portlet, Eve
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
index 8d34e1a..146c371 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -35,6 +34,9 @@ import javax.portlet.tck.beans.JSR286SignatureTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_PORTLETRESPONSE_SIGEVENT_HASADDPROPERTY;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_PORTLETRESPONSE_SIGEVENT_HASADDPROPERTYA;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_PORTLETRESPONSE_SIGEVENT_HASADDPROPERTYB;
@@ -60,7 +62,7 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
public class SigTestsEvent_PortletResponse_SIGEvent_event implements Portlet, EventPortlet {
private static final String LOG_CLASS =
SigTestsEvent_PortletResponse_SIGEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -71,7 +73,7 @@ public class SigTestsEvent_PortletResponse_SIGEvent_event implements Portlet, Ev
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
index 94a8412..d0a06df 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -40,6 +39,9 @@ import javax.portlet.tck.beans.JSR286SignatureTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_STATEAWARERESPONSE_SIGEVENT_HASGETPORTLETMODE;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_STATEAWARERESPONSE_SIGEVENT_HASGETPORTLETMODERETURNS;
import static javax.portlet.tck.beans.JSR286SignatureTestCaseDetails.V2SIGTESTSEVENT_STATEAWARERESPONSE_SIGEVENT_HASGETRENDERPARAMETERMAP;
@@ -74,7 +76,7 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
public class SigTestsEvent_StateAwareResponse_SIGEvent_event implements Portlet, EventPortlet {
private static final String LOG_CLASS =
SigTestsEvent_StateAwareResponse_SIGEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -85,7 +87,7 @@ public class SigTestsEvent_StateAwareResponse_SIGEvent_event implements Portlet,
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
index 89cbbf4..48b6a7f 100644
--- a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
@@ -90,7 +90,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3RESOURCEASYNCTESTS_
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.inject.Inject;
import javax.portlet.ActionRequest;
@@ -115,6 +114,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.util.ModuleTestCaseDetails;
import javax.servlet.DispatcherType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -125,7 +127,7 @@ import javax.servlet.DispatcherType;
@PortletConfiguration(portletName = "ResourceAsyncTests_SPEC_21_Async", asyncSupported = true)
public class ResourceAsyncTests_SPEC_21_Async implements Portlet, ResourceServingPortlet {
- private static final Logger LOGGER = Logger.getLogger(ResourceAsyncTests_SPEC_21_Async.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(ResourceAsyncTests_SPEC_21_Async.class.getName());
@Inject private AsyncBean bean;
@Inject private AsyncBeanRunner beanRunner;
@@ -1486,7 +1488,7 @@ public class ResourceAsyncTests_SPEC_21_Async implements Portlet, ResourceServin
/* was called has returned to the container" */
} else if (testcase.equals(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2)) {
boolean isDispatched = new Boolean((String) session.getAttribute(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2));
- LOGGER.fine("isDispatched: " + isDispatched);
+ LOGGER.trace("isDispatched: " + isDispatched);
if (isDispatched) {
// 2nd time thru
session.removeAttribute(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2);
@@ -1510,7 +1512,7 @@ public class ResourceAsyncTests_SPEC_21_Async implements Portlet, ResourceServin
pac = req.startPortletAsync();
pac.dispatch();
session.setAttribute(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2, "true");
- LOGGER.fine("dispatched to resource method.");
+ LOGGER.trace("dispatched to resource method.");
} catch (Throwable t) {
result = tcd.getTestResultFailed(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2);
result.appendTcDetail("Exception starting or dispatching async: " + t.getMessage());
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
index cb228d4..1d1608e 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
@@ -22,12 +22,13 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Tool for checking class properties such as implemented interfaces, superclass, methods with signatures, etc.
*
@@ -35,7 +36,7 @@ import javax.portlet.WindowState;
*/
public class ClassChecker {
private static final String LOG_CLASS = ClassChecker.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
private Class<?> cut;
private ArrayList<Class<?>> ifList;
@@ -233,13 +234,13 @@ public class ClassChecker {
HashSet<Class<?>> mexs = new HashSet<Class<?>>();
mexs.addAll(Arrays.asList(m.getExceptionTypes()));
- if (LOGGER.isLoggable(Level.FINEST)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "hasMethod", "added exception types");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " hasMethod: added exception types");
}
if (exParm.isEmpty() && mexs.isEmpty()) {
- if (LOGGER.isLoggable(Level.FINEST)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "hasMethod", "no exceptions to check");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " hasMethod: no exceptions to check");
}
result = true;
} else {
@@ -250,14 +251,14 @@ public class ClassChecker {
sb.append("results of exception check: ").append(result).append("\n");
sb.append("method exceptions: ").append(mexs).append("\n");
sb.append("expected exceptions: ").append(exParm).append("\n");
- LOGGER.logp(Level.WARNING, LOG_CLASS, "hasMethod", sb.toString());
+ LOGGER.warn(LOG_CLASS + " hasMethod: " + sb.toString());
}
}
} catch (Exception e) {
StringBuilder txt = new StringBuilder(128);
txt.append("Could not get method: ").append(name);
- LOGGER.log(Level.WARNING, txt.toString(), e);
+ LOGGER.warn(txt.toString(), e);
}
return result;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
index d66aaeb..897fb4c 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
@@ -21,9 +21,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.Portlet;
@@ -32,20 +29,23 @@ import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Simplest possible portlet for testing the portlet container implementation
*/
public class TestPortlet implements Portlet {
private static final String LOG_CLASS = TestPortlet.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
public TestPortlet() {
}
@Override
public void init(PortletConfig config) throws PortletException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "init", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " init: Entry");
}
}
@@ -54,8 +54,8 @@ public class TestPortlet implements Portlet {
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "processAction", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " processAction: Entry");
}
@@ -65,8 +65,8 @@ public class TestPortlet implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
@@ -77,8 +77,8 @@ public class TestPortlet implements Portlet {
@Override
public void destroy() {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "destroy", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " destroy: Entry");
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
index a2f737e..808e711 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
@@ -28,7 +28,6 @@ import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_SERVLET_PATH;
import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_TARGET;
import java.io.IOException;
-import java.util.logging.Logger;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -36,6 +35,9 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Servlet for JSR 362 request dispatcher testing.
*
@@ -50,7 +52,7 @@ public class IncluderForwarderServlet extends HttpServlet {
private static final long serialVersionUID = -4104376549644600993L;
private static final String LOG_CLASS =
IncluderForwarderServlet.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -71,14 +73,14 @@ public class IncluderForwarderServlet extends HttpServlet {
String action = (String) request.getAttribute(ATTR_DISPATCH_ACTION);
if (action == null || !action.matches("(include|forward)")) {
String msg = LOG_CLASS + ": Bad action attribute. action = " + action;
- LOGGER.severe(msg);
+ LOGGER.error(msg);
throw new ServletException(msg);
}
String target = (String) request.getAttribute(ATTR_DISPATCH_TARGET);
if (target == null) {
String msg = LOG_CLASS + ": Bad target attribute. target = " + action;
- LOGGER.severe(msg);
+ LOGGER.error(msg);
throw new ServletException(msg);
}
@@ -100,7 +102,7 @@ public class IncluderForwarderServlet extends HttpServlet {
RequestDispatcher rd = request.getRequestDispatcher(target);
if (rd == null) {
String msg = LOG_CLASS + ": Could not get request dispatcher.";
- LOGGER.severe(msg);
+ LOGGER.error(msg);
throw new ServletException(msg);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
index 2795931..e805970 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
@@ -23,13 +23,15 @@ import static javax.portlet.tck.constants.Constants.MULTIPLE_INCLUDE_ATTR;
import static javax.portlet.tck.constants.Constants.MULTIPLE_INCLUDE_VAL;
import java.io.IOException;
-import java.util.logging.Logger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Servlet for JSR 362 request dispatcher testing.
*
@@ -44,7 +46,7 @@ public class MultipleIncludeServlet extends HttpServlet {
private static final long serialVersionUID = -4104376549644600993L;
private static final String LOG_CLASS =
MultipleIncludeServlet.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -61,7 +63,7 @@ public class MultipleIncludeServlet extends HttpServlet {
// The tck uses only get & post requests
protected void processTCKReq(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- LOGGER.entering(LOG_CLASS, "servlet entry");
+ LOGGER.info(LOG_CLASS + "processTCKReq: servlet entry");
String str = (String) request.getAttribute(MULTIPLE_INCLUDE_ATTR);
int num = 1;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/ServletRequestUtils.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/ServletRequestUtils.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/ServletRequestUtils.java
index 54bf3ed..04e0f14 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/ServletRequestUtils.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/ServletRequestUtils.java
@@ -20,11 +20,12 @@ package javax.portlet.tck.servlets;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* utilities for tracing information about servlet requests.
*
@@ -32,11 +33,11 @@ import javax.servlet.http.HttpServletRequest;
*
*/
public class ServletRequestUtils {
- private static final Logger LOGGER = Logger.getLogger(ServletRequestUtils.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(ServletRequestUtils.class.getName());
public static void logDebugInfo(HttpServletRequest req, String title) {
- if (LOGGER.isLoggable(Level.FINEST)) {
+ if (LOGGER.isTraceEnabled()) {
StringBuilder txt = new StringBuilder(128);
txt.append("Servlet request info: \nAttributes for ").append(title).append(":");
@@ -53,7 +54,7 @@ public class ServletRequestUtils {
txt.append("\nPathInfo:").append(req.getPathInfo());
txt.append("\nQueryString:").append(req.getQueryString());
- LOGGER.finest(txt.toString());
+ LOGGER.trace(txt.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/pom.xml b/portlet-tck_3.0/pom.xml
index a65936e..d62b2d7 100644
--- a/portlet-tck_3.0/pom.xml
+++ b/portlet-tck_3.0/pom.xml
@@ -496,6 +496,18 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -504,7 +516,10 @@
<configuration>
<archiveClasses>false</archiveClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
- <packagingExcludes>WEB-INF/liferay-portlet.xml</packagingExcludes>
+ <packagingExcludes>
+ WEB-INF/liferay-portlet.xml,
+ WEB-INF/classes/log4j.properties
+ </packagingExcludes>
<webResources>
<webResource>
<filtering>true</filtering>
@@ -523,6 +538,20 @@
</profile>
<profile>
<id>liferay</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -531,6 +560,9 @@
<configuration>
<archiveClasses>false</archiveClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
+ <packagingExcludes>
+ WEB-INF/classes/logging.properties
+ </packagingExcludes>
<webResources>
<webResource>
<filtering>true</filtering>
[6/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK
from java.util.logging to SLF4J (code review)
Posted by as...@apache.org.
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
[3/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK
from java.util.logging to SLF4J
Posted by as...@apache.org.
PLUTO-663 Migrate Portlet 3.0 TCK from java.util.logging to SLF4J
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/c58aea56
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/c58aea56
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/c58aea56
Branch: refs/heads/master
Commit: c58aea56e0aa2e0ac5ab03867d65307f3de9270e
Parents: 5180895
Author: vsingleton <vs...@gmail.com>
Authored: Thu Jul 13 12:44:07 2017 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Fri Jul 14 15:19:57 2017 -0400
----------------------------------------------------------------------
pom.xml | 10 ++++++
.../TestModule1_GetInitParameterNamesTest1.java | 13 ++++----
.../TestModule1_PortletCanBeRendered.java | 12 +++----
.../portlets/TestModule1_PortletConfigTest.java | 11 ++++---
.../src/main/resources/log4j.properties | 5 +++
.../TestModule2_CanCreateRenderURL.java | 11 ++++---
.../portlets/TestModule2_CompanionPortlet.java | 11 ++++---
.../src/main/resources/log4j.properties | 5 +++
.../portlets/TestModule3_Portlet1.java | 11 ++++---
.../portlets/TestModule3_Portlet2.java | 11 ++++---
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../AddlEnvironmentTests_SPEC2_18_Sessions.jsp | 6 ++--
.../AddlFilterTests_SPEC2_20_Event_event.java | 11 ++++---
.../src/main/resources/log4j.properties | 5 +++
...Tests_SPEC2_15_EventEventHandling_event.java | 10 +++---
...EventEventHandling_unavailableException.java | 10 +++---
.../AddlPortletTests_SPEC2_15_Event_event.java | 8 +++--
...ortletTests_SPEC2_5_EventHandling_event.java | 8 +++--
...ests_SPEC2_5_RenderGenericPortlet_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
...dlRequestTests_SPEC2_11_EventAttr_event.java | 8 +++--
...ddlRequestTests_SPEC2_11_EventReq_event.java | 8 +++--
.../AddlRequestTests_SPEC2_11_Event_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
.../AddlResponseTests_SPEC2_12_Event_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
.../AnnotationTests_ProcessEvent_ApiEvent.java | 10 +++---
...tationTests_ProcessEvent_ApiEvent_event.java | 17 +++++-----
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...pTests1_SPEC2_19_ForwardJSPActionRequest.jsp | 4 +--
...Tests1_SPEC2_19_ForwardJSPActionResponse.jsp | 4 +--
...spTests1_SPEC2_19_ForwardJSPEventRequest.jsp | 4 +--
...pTests1_SPEC2_19_ForwardJSPEventResponse.jsp | 4 +--
...pTests1_SPEC2_19_ForwardJSPRenderRequest.jsp | 4 +--
...Tests1_SPEC2_19_ForwardJSPRenderResponse.jsp | 4 +--
...ests1_SPEC2_19_ForwardJSPResourceRequest.jsp | 4 +--
...sts1_SPEC2_19_ForwardJSPResourceResponse.jsp | 4 +--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...pTests3_SPEC2_19_IncludeJSPActionRequest.jsp | 4 +--
...Tests3_SPEC2_19_IncludeJSPActionResponse.jsp | 4 +--
...spTests3_SPEC2_19_IncludeJSPEventRequest.jsp | 4 +--
...pTests3_SPEC2_19_IncludeJSPEventResponse.jsp | 4 +--
...pTests3_SPEC2_19_IncludeJSPRenderRequest.jsp | 4 +--
...Tests3_SPEC2_19_IncludeJSPRenderResponse.jsp | 4 +--
...ests3_SPEC2_19_IncludeJSPResourceRequest.jsp | 4 +--
...sts3_SPEC2_19_IncludeJSPResourceResponse.jsp | 4 +--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...Tests5S_SPEC2_19_ForwardJSPActionRequest.jsp | 4 +--
...ests5S_SPEC2_19_ForwardJSPActionResponse.jsp | 4 +--
...Tests5S_SPEC2_19_ForwardJSPRenderRequest.jsp | 4 +--
...ests5S_SPEC2_19_ForwardJSPRenderResponse.jsp | 4 +--
...sts5S_SPEC2_19_ForwardJSPResourceRequest.jsp | 4 +--
...ts5S_SPEC2_19_ForwardJSPResourceResponse.jsp | 4 +--
...Tests5S_SPEC2_19_IncludeJSPActionRequest.jsp | 4 +--
...Tests5S_SPEC2_19_IncludeJSPRenderRequest.jsp | 4 +--
...ests5S_SPEC2_19_IncludeJSPRenderResponse.jsp | 4 +--
...sts5S_SPEC2_19_IncludeJSPResourceRequest.jsp | 4 +--
...ts5S_SPEC2_19_IncludeJSPResourceResponse.jsp | 4 +--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...spatcherTests2_SPEC2_19_ForwardJSPAction.jsp | 2 +-
...ispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp | 2 +-
...spatcherTests2_SPEC2_19_ForwardJSPRender.jsp | 2 +-
...atcherTests2_SPEC2_19_ForwardJSPResource.jsp | 2 +-
...spatcherTests2_SPEC2_19_IncludeJSPAction.jsp | 2 +-
...ispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp | 2 +-
...spatcherTests2_SPEC2_19_IncludeJSPRender.jsp | 2 +-
...atcherTests2_SPEC2_19_IncludeJSPResource.jsp | 2 +-
.../src/main/resources/log4j.properties | 5 +++
...patcherTests3S_SPEC2_19_ForwardJSPAction.jsp | 4 +--
...spatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp | 4 +--
...patcherTests3S_SPEC2_19_ForwardJSPRender.jsp | 4 +--
...tcherTests3S_SPEC2_19_ForwardJSPResource.jsp | 4 +--
...patcherTests3S_SPEC2_19_IncludeJSPAction.jsp | 4 +--
...spatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp | 4 +--
...patcherTests3S_SPEC2_19_IncludeJSPRender.jsp | 4 +--
...tcherTests3S_SPEC2_19_IncludeJSPResource.jsp | 4 +--
.../src/main/resources/log4j.properties | 5 +++
...spatcherTests4_SPEC2_19_ForwardJSPAction.jsp | 4 +--
...ispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp | 4 +--
...spatcherTests4_SPEC2_19_ForwardJSPRender.jsp | 4 +--
...atcherTests4_SPEC2_19_ForwardJSPResource.jsp | 4 +--
...spatcherTests4_SPEC2_19_IncludeJSPAction.jsp | 4 +--
...ispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp | 4 +--
...spatcherTests4_SPEC2_19_IncludeJSPRender.jsp | 4 +--
...atcherTests4_SPEC2_19_IncludeJSPResource.jsp | 4 +--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...Tests_PortletPreferences_ApiEvent_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...rTests_EventFilter_ApiEventFilter_event.java | 8 +++--
...Tests_EventFilter_ApiEventFilter_event2.java | 8 +++--
...rTests_FilterChain_ApiEventFilter_event.java | 8 +++--
...ests_PortletFilter_ApiEventFilter_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
...aryTests_SPEC2_26_IncludeJSPEvent_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...ortletTests_EventPortlet_ApiEvent_event.java | 8 +++--
.../portlets/PortletTests_Event_ApiEvent.java | 6 ++--
.../PortletTests_Event_ApiEvent_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
.../RequestTests_ActionRequest_ApiAction.java | 12 ++++---
...equestTests_ClientDataRequest_ApiAction.java | 12 ++++---
.../RequestTests_EventRequest_ApiEvent.java | 12 ++++---
...equestTests_EventRequest_ApiEvent_event.java | 14 ++++----
.../RequestTests_PortletRequest_ApiAction.java | 12 ++++---
.../RequestTests_PortletRequest_ApiEvent.java | 13 ++++----
...uestTests_PortletRequest_ApiEvent_event.java | 14 ++++----
.../RequestTests_PortletRequest_ApiRender.java | 12 ++++---
...RequestTests_PortletRequest_ApiResource.java | 12 ++++---
.../RequestTests_RenderRequest_ApiRender.java | 13 ++++----
...equestTests_ResourceRequest_ApiResource.java | 12 ++++---
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
...gTestsEvent_EventRequest_SIGEvent_event.java | 8 +++--
...TestsEvent_EventResponse_SIGEvent_event.java | 8 +++--
.../SigTestsEvent_Event_SIGEvent_event.java | 10 +++---
...estsEvent_PortletRequest_SIGEvent_event.java | 8 +++--
...stsEvent_PortletResponse_SIGEvent_event.java | 8 +++--
...Event_StateAwareResponse_SIGEvent_event.java | 8 +++--
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../ResourceAsyncTests_SPEC_21_Async.java | 10 +++---
.../src/main/resources/log4j.properties | 5 +++
.../src/main/resources/log4j.properties | 5 +++
.../javax/portlet/tck/beans/ClassChecker.java | 19 +++++------
.../javax/portlet/tck/portlets/TestPortlet.java | 24 +++++++-------
.../tck/servlets/IncluderForwarderServlet.java | 12 ++++---
.../tck/servlets/MultipleIncludeServlet.java | 8 +++--
.../tck/servlets/ServletRequestUtils.java | 11 ++++---
portlet-tck_3.0/pom.xml | 34 +++++++++++++++++++-
150 files changed, 677 insertions(+), 322 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2303ab0..2bfb454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,6 +336,16 @@ TODO: Check if we need all of them. -->
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
<!-- Specification Libraries =========================================== -->
<dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 1e3d47d..b9a5c35 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
@@ -23,8 +23,6 @@ import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -36,6 +34,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.TestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases. The portlet name equals the first test case name
* and is automatically added to the test case list during the build process. The additional
@@ -61,8 +62,8 @@ public class TestModule1_GetInitParameterNamesTest1 implements Portlet {
return t;
}
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
private PortletConfig config = null;
@Override
@@ -79,8 +80,8 @@ public class TestModule1_GetInitParameterNamesTest1 implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 500cb06..bbae3d9 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
@@ -21,9 +21,6 @@ package javax.portlet.tck.TestModule1.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.Portlet;
@@ -33,6 +30,9 @@ import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This test portlet contains a single test case. The test case name is
* equal to the portlet name. The test case name will be added to the test
@@ -43,7 +43,7 @@ public class TestModule1_PortletCanBeRendered implements Portlet {
private static final String tcName = "TestModule1_PortletCanBeRendered";
private static final String tcDetail = "The test result text is displayed.";
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -58,8 +58,8 @@ public class TestModule1_PortletCanBeRendered implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 b731705..22459d5 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
@@ -23,8 +23,6 @@ import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -36,6 +34,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.TestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases. The portlet name equals the first test case name
* and is automatically added to the test case list during the build process. The additional
@@ -64,7 +65,7 @@ public class TestModule1_PortletConfigTest implements Portlet {
return t;
}
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
private PortletConfig config = null;
@@ -82,8 +83,8 @@ public class TestModule1_PortletConfigTest implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/TestModule1/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 0e99f4e..eb6f813 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
@@ -20,8 +20,6 @@ package javax.portlet.tck.TestModule2.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -36,6 +34,9 @@ import javax.portlet.tck.beans.TestCaseDetails;
import javax.portlet.tck.beans.TestLink;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This test portlet contains several tests to generate render URLs and place them
* into the markup. The test driver clicks the links to execute the tests.
@@ -62,7 +63,7 @@ public class TestModule2_CanCreateRenderURL implements Portlet {
return t;
}
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -77,8 +78,8 @@ public class TestModule2_CanCreateRenderURL implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 d2bb5ac..9548fa5 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
@@ -20,8 +20,6 @@ package javax.portlet.tck.TestModule2.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -34,6 +32,9 @@ import javax.portlet.tck.beans.TestCaseDetails;
import javax.portlet.tck.beans.TestMessage;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This test portlet contains several tests to generate render URLs and place them
* into the markup. The test driver clicks the links to execute the tests.
@@ -52,7 +53,7 @@ public class TestModule2_CompanionPortlet implements Portlet {
return t;
}
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -67,8 +68,8 @@ public class TestModule2_CompanionPortlet implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/TestModule2/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 7508f3a..a5ca80d 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
@@ -20,8 +20,6 @@ package javax.portlet.tck.TestModule3.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -33,6 +31,9 @@ import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.TestLink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.TestModule3Definitions.*;
/**
@@ -43,7 +44,7 @@ import static javax.portlet.tck.beans.TestModule3Definitions.*;
public class TestModule3_Portlet1 implements Portlet {
private static final String LOG_CLASS = TestModule3_Portlet1.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -58,8 +59,8 @@ public class TestModule3_Portlet1 implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 7b0e2d1..3b4deb5 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
@@ -20,8 +20,6 @@ package javax.portlet.tck.TestModule3.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -33,6 +31,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.TestMessage;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.TestModule3Definitions.*;
/**
@@ -43,7 +44,7 @@ import static javax.portlet.tck.beans.TestModule3Definitions.*;
public class TestModule3_Portlet2 implements Portlet {
private static final String LOG_CLASS = TestModule3_Portlet2.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -58,8 +59,8 @@ public class TestModule3_Portlet2 implements Portlet {
public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(LOG_CLASS + " render: Entry");
}
PrintWriter writer = response.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/TestModule3/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/jsp/AddlEnvironmentTests_SPEC2_18_Sessions.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/jsp/AddlEnvironmentTests_SPEC2_18_Sessions.jsp b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/jsp/AddlEnvironmentTests_SPEC2_18_Sessions.jsp
index fe40acc..ee40334 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/jsp/AddlEnvironmentTests_SPEC2_18_Sessions.jsp
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/jsp/AddlEnvironmentTests_SPEC2_18_Sessions.jsp
@@ -22,8 +22,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
@@ -61,4 +61,4 @@ limitations under the License.
+ Constants.RESULT_ATTR_PREFIX + "AddlEnvironmentTests_SPEC2_18_Sessions_tr21\"");
}
tr21.writeTo(writer);
-%>
\ No newline at end of file
+%>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 e9ab3e5..730e8e9 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
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -35,6 +34,9 @@ import javax.portlet.ResourceServingPortlet;
import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTERWRAPPER4;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
@@ -49,7 +51,7 @@ 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 final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -64,13 +66,13 @@ public class AddlFilterTests_SPEC2_20_Event_event
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.error(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+ LOGGER.error(LOG_CLASS + " event companion serveResource - ERROR!!");
}
@Override
@@ -79,6 +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!!");
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 4d48504..864c516 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -35,6 +34,9 @@ import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT9;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT3;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT5;
@@ -63,7 +65,7 @@ import static javax.xml.XMLConstants.NULL_NS_URI;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
public static boolean tr8 = false;
@@ -76,7 +78,7 @@ public class AddlPortletTests_SPEC2_15_EventEventHandling_event implements Portl
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
@@ -93,7 +95,7 @@ public class AddlPortletTests_SPEC2_15_EventEventHandling_event implements Portl
JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
Event event = portletReq.getEvent();
String qName = event.getName();
- LOGGER.entering(LOG_CLASS, "Event name is " + event.getQName().getNamespaceURI());
+ LOGGER.info(LOG_CLASS + " 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/c58aea56/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 72d4f21..2605b9e 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
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -34,6 +33,9 @@ import javax.portlet.ResourceResponse;
import javax.portlet.ResourceServingPortlet;
import javax.portlet.UnavailableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is the event processing portlet for the test cases. This portlet processes events, but does
* not publish them. Events are published in the main portlet for the test cases.
@@ -44,7 +46,7 @@ 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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
@@ -58,13 +60,13 @@ public class AddlPortletTests_SPEC2_15_EventEventHandling_unavailableException
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion serveResource - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 80e26be..12009e0 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -34,6 +33,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_15_EVENT_EVENT1;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
@@ -47,7 +49,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
*/
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
@@ -59,7 +61,7 @@ public class AddlPortletTests_SPEC2_15_Event_event implements Portlet, EventPort
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info("event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 8513c7e..941ad31 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
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -33,6 +32,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION4;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION5;
@@ -49,7 +51,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -60,7 +62,7 @@ public class AddlPortletTests_SPEC2_5_EventHandling_event implements Portlet, Ev
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 90ed7d4..b54a7e1 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
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -33,6 +32,9 @@ import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.PortletSession.APPLICATION_SCOPE;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING1;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
@@ -52,12 +54,12 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@ProcessEvent(qname = "AddlPortletTests_SPEC2_5_RenderGenericPortlet")
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 8753e55..6d462b2 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -34,6 +33,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTATTR_ATTRIBUTES1;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTATTR_ATTRIBUTES2;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTATTR_ATTRIBUTES7;
@@ -49,7 +51,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
*/
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
@@ -61,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.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 19aacad..25f3e14 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
@@ -29,7 +29,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Enumeration;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -44,6 +43,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.commons.lang3.StringUtils;
/**
@@ -54,7 +56,7 @@ import org.apache.commons.lang3.StringUtils;
*/
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 Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -66,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.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@SuppressWarnings("deprecation")
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 ca8fb9d..dc29037 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -35,6 +34,9 @@ import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.beans.TestSetupLink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PARAMETERS12;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
@@ -48,7 +50,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
*/
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
@@ -60,7 +62,7 @@ public class AddlRequestTests_SPEC2_11_Event_event implements Portlet, EventPort
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 aa31c3d..25dca2d 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -38,6 +37,9 @@ import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.servlet.http.Cookie;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLRESPONSETESTS_SPEC2_12_EVENT_COOKIE5;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLRESPONSETESTS_SPEC2_12_EVENT_COOKIE6;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLRESPONSETESTS_SPEC2_12_EVENT_COOKIE7;
@@ -53,7 +55,7 @@ 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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -64,7 +66,7 @@ public class AddlResponseTests_SPEC2_12_Event_event
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 1ab75ec..98b510a 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
@@ -21,7 +21,6 @@ import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -33,6 +32,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.TestButton;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names are defined
* in the /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate
@@ -46,7 +48,7 @@ import javax.xml.namespace.QName;
*/
public class AnnotationTests_ProcessEvent_ApiEvent extends GenericPortlet {
private static final String LOG_CLASS = AnnotationTests_ProcessEvent_ApiEvent.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
@@ -60,11 +62,11 @@ 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.finest("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!");
- LOGGER.finest("Firing event: AnnotationTests_ProcessEvent_ApiEvent2");
+ LOGGER.trace("Firing event: AnnotationTests_ProcessEvent_ApiEvent2");
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 02fe025..e477560 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
@@ -24,8 +24,6 @@ import static javax.portlet.tck.constants.Constants.TCKNAMESPACE;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -42,6 +40,9 @@ import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is the event processing portlet for the test cases. This portlet processes events, but does
* not publish them. Events are published in the main portlet for the test cases.
@@ -49,18 +50,18 @@ import javax.portlet.tck.constants.Constants;
public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet {
private static final String LOG_CLASS =
AnnotationTests_ProcessEvent_ApiEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion serveResource - ERROR!!");
}
@@ -68,12 +69,12 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
public void processEvent(EventRequest request, EventResponse response)
throws PortletException, IOException {
- if (LOGGER.isLoggable(Level.FINEST)) {
+ if (LOGGER.isTraceEnabled()) {
StringBuilder txt = new StringBuilder(128);
txt.append("Event arrived.");
txt.append(" Name: ").append(request.getEvent().getName());
txt.append(", QName: ").append(request.getEvent().getQName());
- LOGGER.fine(txt.toString());
+ LOGGER.trace(txt.toString());
}
super.processEvent(request, response);
@@ -98,7 +99,7 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
Constants.RESULT_ATTR_PREFIX + "AnnotationTests_ProcessEvent_ApiEvent", writer.toString(),
APPLICATION_SCOPE);
- LOGGER.exiting(LOG_CLASS, "Resulting String: " + writer.toString());
+ LOGGER.info(LOG_CLASS + " Resulting String: " + writer.toString());
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
index c4d5f73..abe527a 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.jsp
index 9dbb597..4a0dbf1 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
index 755fd06..d44a4c3 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse.jsp
index 57efd09..82953ee 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
index 623b03a..68a0240 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.jsp
index d982a69..77ea755 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
index 9725bfb..a55b493 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.jsp
index 83a2c8b..15a9a9d 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
index e1e1b21..b231b72 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.jsp
index 582b09a..9c6451c 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
index b9cf4ea..b0e411a 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse.jsp
index 1075d72..92e57d6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
index cc2fd8d..4de6f06 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
index b30c420..59939a1 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
[2/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK
from java.util.logging to SLF4J
Posted by as...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
index 7d2ecc8..55d5023 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
index 88376c8..118eccd 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionRequest.jsp
index b83e640..942bd2a 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionResponse.jsp
index fd77c50..ca6ccea 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPActionResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderRequest.jsp
index 269f775..9733e67 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderResponse.jsp
index 6e3f71a..7dc94cc 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPRenderResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceRequest.jsp
index eb631d1..2966b6f 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceResponse.jsp
index 5e025a4..5d83fb8 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_ForwardJSPResourceResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPActionRequest.jsp
index 7f49054..9a94bfa 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPActionRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderRequest.jsp
index 36cb606..493e4a2 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderResponse.jsp
index 230b29e..c9c822b 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPRenderResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceRequest.jsp
index 44e6b8c..b42b5dd 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceRequest.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceResponse.jsp
index c3e9ce8..96016f0 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests5S_SPEC2_19_IncludeJSPResourceResponse.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
index 00de04c..448c982 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
index b14e01c..3280564 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
index 7568144..606ca9f 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
index 3ab107f..dd7d1d1 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
index 5cea772..e4e6d14 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
index 562f443..614765b 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
index 6cd07d9..fc70229 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
index 5205fdb..be68964 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
@@ -20,7 +20,7 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
index a0308bd..811fb66 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
index a0308bd..811fb66 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
index 6422071..cf8e13d 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
index 277969d..805da07 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
index a0308bd..811fb66 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
index a0308bd..811fb66 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
index c44b25b..2bfb549 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
index c44b25b..2bfb549 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
index 87de4f8..89d7c25 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
index 029404b..025d2e1 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
index 42853ec..b82cda3 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
index 1467971..a4c5261 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
index f0844af..211a2e3 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
index d46deae..3d0f5c8 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
index 560fc27..e02ffd2 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
index 61cd6bd..82963df 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
@@ -20,8 +20,8 @@ limitations under the License.
<%@ page session="false" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
-<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="java.io.*,java.util.*,org.slf4j.*" %>
+<%@ page import="static org.slf4j.Logger.*" %>
<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 7ec1665..17190e8 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
@@ -20,7 +20,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Enumeration;
import java.util.Map;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -38,6 +37,9 @@ import javax.portlet.ValidatorException;
import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ENVIRONMENTTESTS_PORTLETPREFERENCES_APIEVENT_ISREADONLY1;
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ENVIRONMENTTESTS_PORTLETPREFERENCES_APIEVENT_ISREADONLY2;
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ENVIRONMENTTESTS_PORTLETPREFERENCES_APIEVENT_ISREADONLY3;
@@ -84,7 +86,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
public static boolean tr32_success = false;
@@ -97,7 +99,7 @@ public class EnvironmentTests_PortletPreferences_ApiEvent_event implements Portl
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2ExceptionTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 8f1f545..0b7e29e 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -36,6 +35,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
import javax.portlet.tck.filters.FilterTests_EventFilter_ApiEventFilter_filter2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2FILTERTESTS_EVENTFILTER_APIEVENTFILTER_DOFILTERISCALLED;
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2FILTERTESTS_EVENTFILTER_APIEVENTFILTER_DOFILTERPROCESSEVENT1;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
@@ -50,7 +52,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -61,7 +63,7 @@ public class FilterTests_EventFilter_ApiEventFilter_event implements Portlet, Ev
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 19885c8..21cc33d 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
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -32,6 +31,9 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2FILTERTESTS_EVENTFILTER_APIEVENTFILTER_DOFILTERBLOCK;
/**
@@ -43,7 +45,7 @@ import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2FILTERTESTS_EVE
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -54,7 +56,7 @@ public class FilterTests_EventFilter_ApiEventFilter_event2 implements Portlet, E
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 3044d04..5ba7269 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
@@ -18,7 +18,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -35,6 +34,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
import javax.portlet.tck.filters.FilterTests_FilterChain_ApiEventFilter_filter2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2FILTERTESTS_FILTERCHAIN_APIEVENTFILTER_INVOKEEVENTFILTER2;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
@@ -47,7 +49,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -58,7 +60,7 @@ public class FilterTests_FilterChain_ApiEventFilter_event implements Portlet, Ev
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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 0e42aa2..f8bd3e9 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
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -30,6 +29,9 @@ import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import static javax.portlet.PortletSession.APPLICATION_SCOPE;
@@ -41,7 +43,7 @@ import static javax.portlet.PortletSession.APPLICATION_SCOPE;
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 = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -54,7 +56,7 @@ public class FilterTests_PortletFilter_ApiEventFilter_event implements Portlet,
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/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
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2FilterTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
index 4d12ddc..8b0febd 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
@@ -17,7 +17,6 @@ package javax.portlet.tck.portlets;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -31,6 +30,9 @@ import javax.portlet.PortletRequestDispatcher;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static javax.portlet.PortletSession.APPLICATION_SCOPE;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
@@ -48,7 +50,7 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event
implements Portlet, EventPortlet {
private static final String LOG_CLASS =
PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
private PortletConfig portletConfig = null;
@@ -63,7 +65,7 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
index 87261e8..8b4084d 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
@@ -26,7 +26,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -42,6 +41,9 @@ import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is the event processing portlet for the test cases. This portlet
* processes events, but does not publish them. Events are published in the main
@@ -51,7 +53,7 @@ public class PortletTests_EventPortlet_ApiEvent_event
implements Portlet, EventPortlet {
private static final String LOG_CLASS = PortletTests_EventPortlet_ApiEvent_event.class
.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -65,7 +67,7 @@ public class PortletTests_EventPortlet_ApiEvent_event
@Override
public void processAction(ActionRequest portletReq,
ActionResponse portletResp) throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
index 5c3d9b8..2c98a7a 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
@@ -30,7 +30,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Enumeration;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -45,6 +44,9 @@ import javax.portlet.tck.beans.TestButton;
import javax.portlet.tck.beans.TestResult;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names are defined
* in the /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate
@@ -59,7 +61,7 @@ import javax.xml.namespace.QName;
public class PortletTests_Event_ApiEvent implements Portlet {
private static final String LOG_CLASS = PortletTests_Event_ApiEvent.class.getName();
@SuppressWarnings("unused")
-private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
private PortletConfig portletConfig = null;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
index c0ee9b7..2018d41 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
@@ -32,7 +32,6 @@ import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
import java.util.Enumeration;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -51,6 +50,9 @@ import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is the event processing portlet for the test cases. This portlet
* processes events, but does not publish them. Events are published in the main
@@ -60,7 +62,7 @@ public class PortletTests_Event_ApiEvent_event
implements Portlet, EventPortlet {
private static final String LOG_CLASS = PortletTests_Event_ApiEvent_event.class
.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
private PortletConfig portletConfig = null;
@Override
@@ -75,7 +77,7 @@ public class PortletTests_Event_ApiEvent_event
@Override
public void processAction(ActionRequest portletReq,
ActionResponse portletResp) throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+ LOGGER.info(LOG_CLASS + " event companion processAction - ERROR!!");
}
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f9323c7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties
@@ -0,0 +1,5 @@
+log4j.rootLogger=INFO, R
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c58aea56/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
index 8c4227c..8dc3d03 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
@@ -26,7 +26,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.logging.Logger;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -46,6 +45,9 @@ import javax.portlet.tck.beans.TestButton;
import javax.portlet.tck.beans.TestResult;
import javax.portlet.tck.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
@@ -60,7 +62,7 @@ import javax.portlet.tck.constants.Constants;
public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
RequestTests_ActionRequest_ApiAction.class.getName();
- private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
@@ -76,7 +78,7 @@ public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceSe
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+ LOGGER.info(LOG_CLASS + " main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -107,7 +109,7 @@ public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceSe
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+ LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -118,7 +120,7 @@ public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceSe
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.entering(LOG_CLASS, "main portlet render entry");
+ LOGGER.info(LOG_CLASS + " main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
[5/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK
from java.util.logging to SLF4J (code review)
Posted by as...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
index 8b0febd..de24bda 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
@@ -48,9 +48,7 @@ import static javax.portlet.tck.constants.Constants.QUERY_STRING;
*/
public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event
implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.class);
private PortletConfig portletConfig = null;
@@ -65,7 +63,7 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_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/V2PortletTagLibraryTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/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/V2PortletTagLibraryTests2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/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/V2PortletTagLibraryTests3/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/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/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
index 8b4084d..61fb345 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
@@ -51,9 +51,8 @@ import org.slf4j.LoggerFactory;
*/
public class PortletTests_EventPortlet_ApiEvent_event
implements Portlet, EventPortlet {
- private static final String LOG_CLASS = PortletTests_EventPortlet_ApiEvent_event.class
- .getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(PortletTests_EventPortlet_ApiEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -67,7 +66,7 @@ public class PortletTests_EventPortlet_ApiEvent_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/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
index 2c98a7a..61c692c 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent.java
@@ -59,9 +59,10 @@ import org.slf4j.LoggerFactory;
*
*/
public class PortletTests_Event_ApiEvent implements Portlet {
- private static final String LOG_CLASS = PortletTests_Event_ApiEvent.class.getName();
+
@SuppressWarnings("unused")
-private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(PortletTests_Event_ApiEvent.class);
+
private PortletConfig portletConfig = null;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
index 2018d41..c5ad342 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
@@ -60,10 +60,9 @@ import org.slf4j.LoggerFactory;
*/
public class PortletTests_Event_ApiEvent_event
implements Portlet, EventPortlet {
- private static final String LOG_CLASS = PortletTests_Event_ApiEvent_event.class
- .getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
- private PortletConfig portletConfig = null;
+
+ private final Logger LOGGER = LoggerFactory.getLogger(PortletTests_Event_ApiEvent_event.class);
+ private PortletConfig portletConfig = null;
@Override
public void init(PortletConfig config) throws PortletException {
@@ -77,7 +76,7 @@ public class PortletTests_Event_ApiEvent_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/V2PortletTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2PortletTests/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/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
index 8dc3d03..6dd08c3 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ActionRequest_ApiAction.java
@@ -60,11 +60,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_ActionRequest_ApiAction.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_ActionRequest_ApiAction.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -78,7 +75,7 @@ public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceSe
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -109,7 +106,7 @@ public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceSe
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -120,7 +117,7 @@ public class RequestTests_ActionRequest_ApiAction implements Portlet, ResourceSe
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
index 1119316..ba5bc79 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ClientDataRequest_ApiAction.java
@@ -78,11 +78,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_ClientDataRequest_ApiAction implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_ClientDataRequest_ApiAction.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_ClientDataRequest_ApiAction.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -96,7 +93,7 @@ public class RequestTests_ClientDataRequest_ApiAction implements Portlet, Resour
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
@@ -420,18 +417,16 @@ public class RequestTests_ClientDataRequest_ApiAction implements Portlet, Resour
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
-
-
}
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
index 1e7bc8f..66818de 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent.java
@@ -55,11 +55,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_EventRequest_ApiEvent.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_EventRequest_ApiEvent.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -73,7 +70,7 @@ public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServ
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -89,7 +86,7 @@ public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServ
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -101,7 +98,7 @@ public class RequestTests_EventRequest_ApiEvent implements Portlet, ResourceServ
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
index c4dd7ed..857a802 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_EventRequest_ApiEvent_event.java
@@ -56,11 +56,8 @@ import org.slf4j.LoggerFactory;
* but does not publish them. Events are published in the main portlet for the test cases.
*/
public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_EventRequest_ApiEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_EventRequest_ApiEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -74,7 +71,7 @@ public class RequestTests_EventRequest_ApiEvent_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!!");
QName eventQName = new QName(TCKNAMESPACE,
"PortletTests_Event_ApiEvent");
portletResp.setEvent(eventQName, "Hi!");
@@ -83,13 +80,13 @@ public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventP
@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
public void processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " event companion processEvent");
+ LOGGER.trace("event companion processEvent");
portletResp.setRenderParameters(portletReq);
@@ -137,7 +134,7 @@ public class RequestTests_EventRequest_ApiEvent_event implements Portlet, EventP
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " event companion render");
+ LOGGER.trace("event companion render");
portletResp.setContentType("text/html");
PrintWriter writer = portletResp.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
index 93b9470..b66c43e 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
@@ -169,11 +169,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_PortletRequest_ApiAction.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_PortletRequest_ApiAction.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -187,7 +184,7 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -1273,7 +1270,7 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -1285,7 +1282,7 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
index 040cc87..779217d 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent.java
@@ -151,11 +151,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_PortletRequest_ApiEvent.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_PortletRequest_ApiEvent.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -169,7 +166,7 @@ public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceSe
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -185,7 +182,7 @@ public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceSe
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -197,7 +194,7 @@ public class RequestTests_PortletRequest_ApiEvent implements Portlet, ResourceSe
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
index 594d169..bf03681 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
@@ -162,10 +162,8 @@ import org.slf4j.LoggerFactory;
* but does not publish them. Events are published in the main portlet for the test cases.
*/
public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_PortletRequest_ApiEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_PortletRequest_ApiEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -179,19 +177,19 @@ public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, Even
@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
public void processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " event companion processEvent");
+ LOGGER.trace("event companion processEvent");
portletResp.setRenderParameters(portletReq);
@@ -1265,7 +1263,7 @@ public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, Even
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " event companion render");
+ LOGGER.trace("event companion render");
portletResp.setContentType("text/html");
PrintWriter writer = portletResp.getWriter();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
index 014f735..975c0a8 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
@@ -164,13 +164,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_PortletRequest_ApiRender.class.getName();
-
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_PortletRequest_ApiRender.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -184,7 +179,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -195,7 +190,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -205,7 +200,7 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
index bef7460..01fd42a 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
@@ -166,11 +166,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_PortletRequest_ApiResource implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_PortletRequest_ApiResource.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_PortletRequest_ApiResource.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -184,7 +181,7 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -197,7 +194,7 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -1282,7 +1279,7 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
index 90470ba..1b931a5 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_RenderRequest_ApiRender.java
@@ -54,11 +54,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_RenderRequest_ApiRender.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_RenderRequest_ApiRender.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -72,7 +69,7 @@ public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceSe
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -85,7 +82,7 @@ public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceSe
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -97,7 +94,7 @@ public class RequestTests_RenderRequest_ApiRender implements Portlet, ResourceSe
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
index 1d19545..8a14a43 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_ResourceRequest_ApiResource.java
@@ -69,10 +69,8 @@ import org.slf4j.LoggerFactory;
*
*/
public class RequestTests_ResourceRequest_ApiResource implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- RequestTests_ResourceRequest_ApiResource.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
-
+
+ private final Logger LOGGER = LoggerFactory.getLogger(RequestTests_ResourceRequest_ApiResource.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -86,7 +84,7 @@ public class RequestTests_ResourceRequest_ApiResource implements Portlet, Resour
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet processAction entry");
+ LOGGER.trace("main portlet processAction entry");
portletResp.setRenderParameters(portletReq.getParameterMap());
long tid = Thread.currentThread().getId();
@@ -99,7 +97,7 @@ public class RequestTests_ResourceRequest_ApiResource implements Portlet, Resour
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet serveResource entry");
+ LOGGER.trace("main portlet serveResource entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
@@ -224,7 +222,7 @@ public class RequestTests_ResourceRequest_ApiResource implements Portlet, Resour
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " main portlet render entry");
+ LOGGER.trace("main portlet render entry");
long tid = Thread.currentThread().getId();
portletReq.setAttribute(THREADID_ATTR, tid);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2RequestTests/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/V2ResponseTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2ResponseTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2ResponseTests/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/V2SigTestsAction/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsAction/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsAction/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/V2SigTestsEnv/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsEnv/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsEnv/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/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
index 5c454d8..03e2730 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventRequest_SIGEvent_event.java
@@ -56,9 +56,8 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
* but does not publish them. Events are published in the main portlet for the test cases.
*/
public class SigTestsEvent_EventRequest_SIGEvent_event implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- SigTestsEvent_EventRequest_SIGEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(SigTestsEvent_EventRequest_SIGEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -71,7 +70,7 @@ public class SigTestsEvent_EventRequest_SIGEvent_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/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
index 6badda9..6e264b7 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_EventResponse_SIGEvent_event.java
@@ -53,9 +53,8 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
* but does not publish them. Events are published in the main portlet for the test cases.
*/
public class SigTestsEvent_EventResponse_SIGEvent_event implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- SigTestsEvent_EventResponse_SIGEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(SigTestsEvent_EventResponse_SIGEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -68,7 +67,7 @@ public class SigTestsEvent_EventResponse_SIGEvent_event implements Portlet, Even
@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/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
index 3b4618e..d179aa4 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_Event_SIGEvent_event.java
@@ -55,9 +55,8 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
* but does not publish them. Events are published in the main portlet for the test cases.
*/
public class SigTestsEvent_Event_SIGEvent_event implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- SigTestsEvent_Event_SIGEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(SigTestsEvent_Event_SIGEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {
@@ -70,13 +69,13 @@ public class SigTestsEvent_Event_SIGEvent_event implements Portlet, EventPortlet
@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 processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
- LOGGER.info(LOG_CLASS + " event companion processEvent");
+ LOGGER.trace("event companion processEvent");
portletResp.setRenderParameters(portletReq);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
index e0273c9..83e1ce6 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletRequest_SIGEvent_event.java
@@ -142,9 +142,8 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
* not publish them. Events are published in the main portlet for the test cases.
*/
public class SigTestsEvent_PortletRequest_SIGEvent_event implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- SigTestsEvent_PortletRequest_SIGEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(SigTestsEvent_PortletRequest_SIGEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -155,7 +154,7 @@ public class SigTestsEvent_PortletRequest_SIGEvent_event implements Portlet, Eve
@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/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
index 146c371..cf68b32 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_PortletResponse_SIGEvent_event.java
@@ -60,9 +60,8 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
* not publish them. Events are published in the main portlet for the test cases.
*/
public class SigTestsEvent_PortletResponse_SIGEvent_event implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- SigTestsEvent_PortletResponse_SIGEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(SigTestsEvent_PortletResponse_SIGEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -73,7 +72,7 @@ public class SigTestsEvent_PortletResponse_SIGEvent_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/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
index d0a06df..db44694 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
+++ b/portlet-tck_3.0/V2SigTestsEvent/src/main/java/javax/portlet/tck/portlets/SigTestsEvent_StateAwareResponse_SIGEvent_event.java
@@ -74,9 +74,8 @@ import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
* not publish them. Events are published in the main portlet for the test cases.
*/
public class SigTestsEvent_StateAwareResponse_SIGEvent_event implements Portlet, EventPortlet {
- private static final String LOG_CLASS =
- SigTestsEvent_StateAwareResponse_SIGEvent_event.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(SigTestsEvent_StateAwareResponse_SIGEvent_event.class);
@Override
public void init(PortletConfig config) throws PortletException {}
@@ -87,7 +86,7 @@ public class SigTestsEvent_StateAwareResponse_SIGEvent_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/V2SigTestsEvent/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsEvent/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsEvent/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/V2SigTestsException/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsException/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsException/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/V2SigTestsFilter/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsFilter/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsFilter/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/V2SigTestsRender/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsRender/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsRender/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/V2SigTestsResource/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsResource/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsResource/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/V2SigTestsURL/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsURL/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsURL/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/V2SigTestsWrapper/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties b/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2SigTestsWrapper/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2SigTestsWrapper/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/V2URLTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2URLTests/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/V2WrapperTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V2WrapperTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V2WrapperTests/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/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/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/V3PortletConfigTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V3PortletConfigTests/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/V3PortletContextTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V3PortletContextTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V3PortletContextTests/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/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
index 48b6a7f..9332218 100644
--- a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/java/javax/portlet/tck/portlets/ResourceAsyncTests_SPEC_21_Async.java
@@ -1488,7 +1488,7 @@ public class ResourceAsyncTests_SPEC_21_Async implements Portlet, ResourceServin
/* was called has returned to the container" */
} else if (testcase.equals(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2)) {
boolean isDispatched = new Boolean((String) session.getAttribute(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2));
- LOGGER.trace("isDispatched: " + isDispatched);
+ LOGGER.trace("isDispatched: {}", isDispatched);
if (isDispatched) {
// 2nd time thru
session.removeAttribute(V3RESOURCEASYNCTESTS_SPEC_21_ASYNC_ADDLISTENER2);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/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/V3URLTests/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties b/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties
index f9323c7..e4aeed6 100644
--- a/portlet-tck_3.0/V3URLTests/src/main/resources/log4j.properties
+++ b/portlet-tck_3.0/V3URLTests/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/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
index 1d1608e..2d1c145 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/ClassChecker.java
@@ -35,8 +35,7 @@ import org.slf4j.LoggerFactory;
* @author nick
*/
public class ClassChecker {
- private static final String LOG_CLASS = ClassChecker.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(ClassChecker.class);
private Class<?> cut;
private ArrayList<Class<?>> ifList;
@@ -234,14 +233,10 @@ public class ClassChecker {
HashSet<Class<?>> mexs = new HashSet<Class<?>>();
mexs.addAll(Arrays.asList(m.getExceptionTypes()));
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(LOG_CLASS + " hasMethod: added exception types");
- }
+ LOGGER.trace("hasMethod: added exception types");
if (exParm.isEmpty() && mexs.isEmpty()) {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(LOG_CLASS + " hasMethod: no exceptions to check");
- }
+ LOGGER.trace("hasMethod: no exceptions to check");
result = true;
} else {
result = mexs.containsAll(exParm);
@@ -251,7 +246,7 @@ public class ClassChecker {
sb.append("results of exception check: ").append(result).append("\n");
sb.append("method exceptions: ").append(mexs).append("\n");
sb.append("expected exceptions: ").append(exParm).append("\n");
- LOGGER.warn(LOG_CLASS + " hasMethod: " + sb.toString());
+ LOGGER.warn("hasMethod: {}", sb);
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
index 897fb4c..0fef5ed 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/portlets/TestPortlet.java
@@ -36,38 +36,29 @@ import org.slf4j.LoggerFactory;
* Simplest possible portlet for testing the portlet container implementation
*/
public class TestPortlet implements Portlet {
- private static final String LOG_CLASS = TestPortlet.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+
+ private final Logger LOGGER = LoggerFactory.getLogger(TestPortlet.class);
public TestPortlet() {
}
@Override
public void init(PortletConfig config) throws PortletException {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(LOG_CLASS + " init: Entry");
- }
-
+ LOGGER.trace("init: Entry");
}
@Override
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(LOG_CLASS + " processAction: Entry");
- }
-
-
+ LOGGER.trace("processAction: Entry");
}
@Override
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();
writer.write("I am here!");
@@ -76,11 +67,7 @@ public class TestPortlet implements Portlet {
@Override
public void destroy() {
-
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace(LOG_CLASS + " destroy: Entry");
- }
-
+ LOGGER.trace("destroy: Entry");
}
}
[4/6] portals-pluto git commit: PLUTO-663 Migrate Portlet 3.0 TCK
from java.util.logging to SLF4J (code review)
Posted by as...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
index 808e711..c8de4c2 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/IncluderForwarderServlet.java
@@ -50,9 +50,7 @@ import org.slf4j.LoggerFactory;
*/
public class IncluderForwarderServlet extends HttpServlet {
private static final long serialVersionUID = -4104376549644600993L;
- private static final String LOG_CLASS =
- IncluderForwarderServlet.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(IncluderForwarderServlet.class);
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -72,14 +70,14 @@ public class IncluderForwarderServlet extends HttpServlet {
String action = (String) request.getAttribute(ATTR_DISPATCH_ACTION);
if (action == null || !action.matches("(include|forward)")) {
- String msg = LOG_CLASS + ": Bad action attribute. action = " + action;
+ String msg = "Bad action attribute. action = " + action;
LOGGER.error(msg);
throw new ServletException(msg);
}
String target = (String) request.getAttribute(ATTR_DISPATCH_TARGET);
if (target == null) {
- String msg = LOG_CLASS + ": Bad target attribute. target = " + action;
+ String msg = "Bad target attribute. target = " + action;
LOGGER.error(msg);
throw new ServletException(msg);
}
@@ -101,7 +99,7 @@ public class IncluderForwarderServlet extends HttpServlet {
RequestDispatcher rd = request.getRequestDispatcher(target);
if (rd == null) {
- String msg = LOG_CLASS + ": Could not get request dispatcher.";
+ String msg = "Could not get request dispatcher.";
LOGGER.error(msg);
throw new ServletException(msg);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8cb2fa55/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
index e805970..a61bb65 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/MultipleIncludeServlet.java
@@ -43,10 +43,9 @@ import org.slf4j.LoggerFactory;
*
*/
public class MultipleIncludeServlet extends HttpServlet {
+
private static final long serialVersionUID = -4104376549644600993L;
- private static final String LOG_CLASS =
- MultipleIncludeServlet.class.getName();
- private final Logger LOGGER = LoggerFactory.getLogger(LOG_CLASS);
+ private final Logger LOGGER = LoggerFactory.getLogger(MultipleIncludeServlet.class);
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -63,7 +62,7 @@ public class MultipleIncludeServlet extends HttpServlet {
// The tck uses only get & post requests
protected void processTCKReq(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- LOGGER.info(LOG_CLASS + "processTCKReq: servlet entry");
+ LOGGER.trace("processTCKReq: servlet entry");
String str = (String) request.getAttribute(MULTIPLE_INCLUDE_ATTR);
int num = 1;