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 ms...@apache.org on 2016/04/22 15:05:31 UTC
portals-pluto git commit: Worked on dispatcher tests. Added some
additional trace output that can be activated on a per-module level to log
attribute, query string, and path info.
Repository: portals-pluto
Updated Branches:
refs/heads/master 3b0e1f5bf -> c9e99f581
Worked on dispatcher tests. Added some additional trace output that can be
activated on a per-module level to log attribute, query string, and path
info.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/c9e99f58
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/c9e99f58
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/c9e99f58
Branch: refs/heads/master
Commit: c9e99f5818d5a8830c649a03d7143dc521a23ad6
Parents: 3b0e1f5
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Apr 22 15:02:57 2016 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Apr 22 15:02:57 2016 +0200
----------------------------------------------------------------------
..._19_IncThenIncludeServletRender_servlet.java | 78 ++++++++++++++++----
.../src/main/resources/logging.properties | 3 +-
.../tck/servlets/IncluderForwarderServlet.java | 31 +++++---
.../tck/servlets/MultipleIncludeServlet.java | 22 +++---
.../tck/servlets/ServletRequestUtils.java | 61 +++++++++++++++
5 files changed, 156 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c9e99f58/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
index 03dd9a2..bd69f78 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
@@ -19,18 +19,63 @@
package javax.portlet.tck.servlets;
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES1;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES1A;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES1B;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES1C;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES2;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES2A;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES2B;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES2C;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES3;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES3A;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES3B;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES3C;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES4;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES4A;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES4B;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES4C;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES5;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES5A;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES5B;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES5C;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES6;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES7;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_ATTRIBUTES8;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_DISPATCH1;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_DISPATCH2;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_DISPATCH3;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_INVOKE2;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_INVOKE4;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_INVOKE7;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_INVOKE9;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_CONTEXT_PATH;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_PATH_INFO;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_REQUEST_URI;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_SERVLET_PATH;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.SERVLET_SUFFIX;
+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.MimeResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.tck.beans.ClassChecker;
+import javax.portlet.tck.beans.CompareUtils;
+import javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails;
+import javax.portlet.tck.beans.TestResult;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* Servlet for JSR 362 request dispatcher testing.
@@ -40,6 +85,7 @@ import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
*
*/
public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet extends HttpServlet {
+ private static final long serialVersionUID = -8289710119313569554L;
private static final String LOG_CLASS =
DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.class.getName();
private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -60,6 +106,10 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet exten
protected void processTCKReq(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
LOGGER.entering(LOG_CLASS, "servlet entry");
+
+ // do request info logging if enabled
+ ServletRequestUtils.logDebugInfo(request, this.getClass().getSimpleName());
+
// values from first servlet in forward/include chain
String fsfcRequest_uri = (String) request.getAttribute(ATTR_DISPATCH_REQUEST_URI );
@@ -87,8 +137,8 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet exten
/* to the target servlet during an include" */
TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_DISPATCH1);
try {
- String qparm1 = portletReq.getParameter("qparm1");
- String qparm2 = portletReq.getParameter("qparm2");
+ String qparm1 = request.getParameter("qparm1");
+ String qparm2 = request.getParameter("qparm2");
boolean ok = ((qparm1 != null) && (qparm2 != null));
if (ok) ok = (qparm1.equals("qvalue1") && qparm2.equals("qvalue2"));
if (!ok) tr0.appendTcDetail("qparm1=" + qparm1 + ", qparm2=" + qparm2);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c9e99f58/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/logging.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/logging.properties b/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/logging.properties
index e71eca6..fb51a48 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/logging.properties
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/resources/logging.properties
@@ -10,4 +10,5 @@ org.apache.juli.FileHandler.prefix = javax.portlet-tck.
java.util.logging.ConsoleHandler.level = FINEST
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-javax.portlet.tck.level = FINEST
+javax.portlet.tck.level = FINE
+javax.portlet.tck.servlets.level = FINEST
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c9e99f58/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 42edea4..2c5dc4d 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
@@ -19,18 +19,22 @@
package javax.portlet.tck.servlets;
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_ACTION;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_CONTEXT_PATH;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_PATH_INFO;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_REQUEST_URI;
+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;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* Servlet for JSR 362 request dispatcher testing.
@@ -79,6 +83,9 @@ public class IncluderForwarderServlet extends HttpServlet {
throw new ServletException(msg);
}
+ // do logging if enabled
+ ServletRequestUtils.logDebugInfo(request, this.getClass().getSimpleName());
+
String uri = request.getRequestURI();
String cp = request.getContextPath();
String sp = request.getServletPath();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c9e99f58/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 4148467..2795931 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
@@ -19,18 +19,16 @@
package javax.portlet.tck.servlets;
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
+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;
/**
* Servlet for JSR 362 request dispatcher testing.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c9e99f58/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
new file mode 100644
index 0000000..390c6dc
--- /dev/null
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/servlets/ServletRequestUtils.java
@@ -0,0 +1,61 @@
+/* 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.
+ */
+
+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;
+
+/**
+ * utilities for tracing information about servlet requests.
+ *
+ * @author Scott Nicklous
+ *
+ */
+public class ServletRequestUtils {
+ private static final Logger LOGGER = Logger.getLogger(ServletRequestUtils.class.getName());
+
+ public static void logDebugInfo(HttpServletRequest req, String title) {
+
+ if (LOGGER.isLoggable(Level.FINEST)) {
+ StringBuilder txt = new StringBuilder(128);
+ txt.append("Servlet request info: \nAttributes for ").append(title).append(":");
+
+ @SuppressWarnings("unchecked")
+ Enumeration<String> names = req.getAttributeNames();
+ for (String name : Collections.list(names)) {
+ txt.append("\nName: ").append(name);
+ txt.append(", value: ").append(req.getAttribute(name));
+ }
+
+ txt.append("\n\nPath info:");
+ txt.append("\nRequestUri:").append(req.getRequestURI());
+ txt.append("\nContextPath:").append(req.getContextPath());
+ txt.append("\nServletPath:").append(req.getServletPath());
+ txt.append("\nPathInfo:").append(req.getPathInfo());
+ txt.append("\nQueryString:").append(req.getQueryString());
+
+ LOGGER.finest(txt.toString());
+ }
+ }
+
+}