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 2015/11/27 13:38:00 UTC
[19/38] portals-pluto git commit: fixed bugs. added tracing.
fixed bugs. added tracing.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/536c8608
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/536c8608
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/536c8608
Branch: refs/heads/V3Prototype
Commit: 536c8608a205bbee462528ecc58c194564cf67e2
Parents: 802dadb
Author: Scott Nicklous <ms...@apache.org>
Authored: Tue Oct 27 14:26:47 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Tue Oct 27 14:26:47 2015 +0100
----------------------------------------------------------------------
.../impl/PortletAppDescriptorServiceImpl.java | 35 ++++++++++++++++----
.../om/portlet/impl/ConfigurationHolder.java | 14 ++++++++
.../driver/container/PortletContextManager.java | 16 +++++++++
3 files changed, 58 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/536c8608/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java b/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
index 11cfbc4..48a9aab 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
@@ -44,7 +44,10 @@ import javax.xml.xpath.XPathFactory;
import org.apache.pluto.container.PortletAppDescriptorService;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.apache.pluto.container.om.portlet.impl.ConfigurationHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -56,11 +59,12 @@ import org.xml.sax.SAXException;
* Service that reads the portlet deployment descriptor.
*/
-public class PortletAppDescriptorServiceImpl implements
- PortletAppDescriptorService {
-
- private PortletApplicationDefinition pad = null;
- private ConfigurationHolder confHolder = new ConfigurationHolder();
+public class PortletAppDescriptorServiceImpl implements PortletAppDescriptorService {
+
+ /** Logger. */
+ private static final Logger LOG = LoggerFactory.getLogger(PortletAppDescriptorServiceImpl.class);
+ private static final boolean isDebug = LOG.isDebugEnabled();
+
public PortletAppDescriptorServiceImpl() {
}
@@ -77,6 +81,9 @@ public class PortletAppDescriptorServiceImpl implements
throw new IOException("Cannot read from a null InputStream");
}
+ PortletApplicationDefinition pad = null;
+ ConfigurationHolder confHolder = new ConfigurationHolder();
+
// read the deployment descriptor
try {
confHolder.processPortletDD(in);
@@ -93,11 +100,25 @@ public class PortletAppDescriptorServiceImpl implements
return pad;
}
- public void mergeWebDescriptor(PortletApplicationDefinition pa,
+ public void mergeWebDescriptor(PortletApplicationDefinition pad,
InputStream webDescriptor) throws Exception {
- confHolder = new ConfigurationHolder(pa);
+ ConfigurationHolder confHolder = new ConfigurationHolder(pad);
confHolder.processWebDD(webDescriptor);
+
+ if (isDebug) {
+ StringBuilder txt = new StringBuilder(128);
+ txt.append("Processed web DD for Portlet app: ").append(pad.getName());
+ txt.append(", context path: ").append(pad.getContextPath());
+ txt.append(", # portlets: ").append(pad.getPortlets().size());
+ txt.append(", names: ");
+ String sep = "";
+ for (PortletDefinition pd : pad.getPortlets()) {
+ txt.append(sep).append(pd.getPortletName());
+ sep = ", ";
+ }
+ LOG.debug(txt.toString());
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/536c8608/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
index f547bd2..51fdab9 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -201,6 +202,19 @@ public class ConfigurationHolder {
}
pad = jcp.process(jel);
+
+ if (isDebug) {
+ StringBuilder txt = new StringBuilder(128);
+ txt.append("Parsed DD for Portlet app: ").append(pad.getName());
+ txt.append(", # portlets: ").append(pad.getPortlets().size());
+ txt.append(", names: ");
+ String sep = "";
+ for (PortletDefinition pd : pad.getPortlets()) {
+ txt.append(sep).append(pd.getPortletName());
+ sep = ", ";
+ }
+ LOG.debug(txt.toString());
+ }
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/536c8608/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
----------------------------------------------------------------------
diff --git a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
index 9e6cf05..8257f8a 100644
--- a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
+++ b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
@@ -57,6 +57,8 @@ public class PortletContextManager implements PortletRegistryService, PortletCon
* Logger Instance
*/
private static final Logger LOG = LoggerFactory.getLogger(PortletContextManager.class);
+ private static final boolean isDebug = LOG.isDebugEnabled();
+
/**
* The PortletContext cache map: key is servlet context, and value is the
@@ -117,6 +119,20 @@ public class PortletContextManager implements PortletRegistryService, PortletCon
if (!portletContexts.containsKey(contextPath)) {
PortletApplicationDefinition portletApp = portletRegistry.getPortletAppDD(servletContext, contextPath, contextPath);
+
+ if (isDebug) {
+ StringBuilder txt = new StringBuilder(128);
+ txt.append("Parsed DD for Portlet app: ").append(portletApp.getName());
+ txt.append(", context path: ").append(portletApp.getContextPath());
+ txt.append(", # portlets: ").append(portletApp.getPortlets().size());
+ txt.append(", names: ");
+ String sep = "";
+ for (PortletDefinition pd : portletApp.getPortlets()) {
+ txt.append(sep).append(pd.getPortletName());
+ sep = ", ";
+ }
+ LOG.debug(txt.toString());
+ }
DriverPortletContext portletContext = new DriverPortletContextImpl(servletContext, portletApp, rdService);