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 dd...@apache.org on 2004/10/25 17:14:32 UTC
svn commit: rev 55502 - in portals/pluto/branches/pluto-1.1/portal/src: java/org/apache/pluto/driver java/org/apache/pluto/driver/config java/org/apache/pluto/driver/tags webapp/WEB-INF
Author: ddewolf
Date: Mon Oct 25 08:14:32 2004
New Revision: 55502
Modified:
portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java
portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/tags/PortletTag.java
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/web.xml
Log:
Adding TCK Support
-- Implemented TCK Driver Servlet
-- Added supporting methods for TCK Driver
-- Mapped the TCK Driver to /tck
Modified: portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/PortalDriverServlet.java
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/PortalDriverServlet.java Mon Oct 25 08:14:32 2004
@@ -112,20 +112,25 @@
throw new ServletException(exc);
}
} else {
- String currentPage = currentURL.getRenderPath();
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("Rendering Portal: Requested Page: " + currentPage);
- }
- RenderConfig renderConfig = driverConfig.getRenderConfig();
- PageConfig page = renderConfig.getPageConfig(currentPage);
-
+ PageConfig page = getPageConfig(currentURL);
req.setAttribute(AttributeKeys.CURRENT_PAGE, page);
String uri = page.getUri();
RequestDispatcher disp = req.getRequestDispatcher(uri);
disp.forward(req, res);
}
}
+
+ protected PageConfig getPageConfig(PortalURL currentURL) {
+ String currentPage = currentURL.getRenderPath();
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Rendering Portal: Requested Page: " + currentPage);
+ }
+
+ RenderConfig renderConfig = driverConfig.getRenderConfig();
+ return renderConfig.getPageConfig(currentPage);
+ }
+
/**
* Pass all requests on to {@link #doPost(HttpServletRequest, HttpServletResponse)}.
Modified: portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/config/PageConfig.java Mon Oct 25 08:14:32 2004
@@ -52,6 +52,10 @@
return portletIds;
}
+ public void setPortletIds(Collection ids) {
+ this.portletIds = ids;
+ }
+
public void addPortlet(String contextPath, String portletName) {
portletIds.add(
PortletWindowConfig.createPortletId(contextPath, portletName));
@@ -64,5 +68,6 @@
int getOrderNumber() {
return orderNumber;
}
+
}
Modified: portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/tags/PortletTag.java
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/tags/PortletTag.java (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/java/org/apache/pluto/driver/tags/PortletTag.java Mon Oct 25 08:14:32 2004
@@ -26,6 +26,7 @@
/**
* @author <a href="david.dewolf@vivare.com">David H. DeWolf</a>
+ * @version $Id$
*/
public class PortletTag extends BodyTagSupport {
Modified: portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/web.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/web.xml Mon Oct 25 08:14:32 2004
@@ -28,18 +28,23 @@
<display-name>Pluto Portal Driver</display-name>
<description>Pluto Portal Driver Controller</description>
<servlet-class>org.apache.pluto.driver.PortalDriverServlet</servlet-class>
- <!-- Uncomment the following to allow for non latin-1 character sets in output. -->
- <!--
- <init-param>
- <param-name>charset</param-name>
- <param-value>utf-8</param-value>
- </init-param>
- -->
+ </servlet>
+
+ <servlet>
+ <servlet-name>tckDriver</servlet-name>
+ <display-name>Pluto TCK Driver</display-name>
+ <description>Pluto TCK Driver Controller</description>
+ <servlet-class>org.apache.pluto.driver.TCKDriverServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>plutoPortalDriver</servlet-name>
<url-pattern>/portal/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>tckDriver</servlet-name>
+ <url-pattern>/tck/*</url-pattern>
</servlet-mapping>
<listener>