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 dj...@apache.org on 2009/12/24 03:58:19 UTC
svn commit: r893689 [2/2] - in /portals/pluto/trunk:
pluto-container/src/main/java/org/apache/pluto/container/impl/
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driv...
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?rev=893689&r1=893688&r2=893689&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Thu Dec 24 02:58:17 2009
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -24,12 +24,12 @@
<web-app>
- <display-name>Apache Pluto Portal Driver</display-name>
+ <display-name>Apache Pluto Portal Driver</display-name>
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/pluto-portal-driver-services-config.xml</param-value>
- </context-param>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>/WEB-INF/pluto-portal-driver-services-config.xml</param-value>
+ </context-param>
<filter>
<filter-name>plutoPortalDriver</filter-name>
@@ -46,51 +46,47 @@
<url-pattern>/about.jsp/*</url-pattern>
</filter-mapping>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.pluto.driver.PortalStartupListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>plutoPortalDriver</servlet-name>
- <display-name>Pluto Portal Driver</display-name>
- <description>Pluto Portal Driver Controller</description>
- <servlet-class>org.apache.pluto.driver.PortalDriverServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>plutoPortalDriverLogout</servlet-name>
- <display-name>Pluto Portal Driver</display-name>
- <description>Pluto Portal Driver Logout</description>
- <servlet-class>org.apache.pluto.driver.PortalDriverLogoutServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>portletApplicationPublisher</servlet-name>
- <display-name>Portlet Application Publisher</display-name>
- <description>Portlet Application Publisher Service</description>
- <servlet-class>org.apache.pluto.driver.PublishServlet</servlet-class>
- </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>
- <servlet-name>AboutPortlet</servlet-name>
- <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>AboutPortlet</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <listener>
+ <listener-class>org.apache.pluto.driver.PortalStartupListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>plutoPortalDriver</servlet-name>
+ <display-name>Pluto Portal Driver</display-name>
+ <description>Pluto Portal Driver Controller</description>
+ <servlet-class>org.apache.pluto.driver.PortalDriverServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>plutoPortalDriverLogout</servlet-name>
+ <display-name>Pluto Portal Driver</display-name>
+ <description>Pluto Portal Driver Logout</description>
+ <servlet-class>org.apache.pluto.driver.PortalDriverLogoutServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>portletApplicationPublisher</servlet-name>
+ <display-name>Portlet Application Publisher</display-name>
+ <description>Portlet Application Publisher Service</description>
+ <servlet-class>org.apache.pluto.driver.PublishServlet</servlet-class>
+ </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>
+ <servlet-name>AboutPortlet</servlet-name>
+ <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-name</param-name>
+ <param-value>AboutPortlet</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
<servlet>
<servlet-name>AdminPortlet</servlet-name>
@@ -112,71 +108,71 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet-mapping>
- <servlet-name>plutoPortalDriver</servlet-name>
- <url-pattern>/portal/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>plutoPortalDriverLogout</servlet-name>
- <url-pattern>/Logout</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>portletApplicationPublisher</servlet-name>
- <url-pattern>/admin/Publish</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>tckDriver</servlet-name>
- <url-pattern>/tck/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AboutPortlet</servlet-name>
- <url-pattern>/PlutoInvoker/AboutPortlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AdminPortlet</servlet-name>
- <url-pattern>/PlutoInvoker/AdminPortlet</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>plutoPortalDriver</servlet-name>
+ <url-pattern>/portal/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>plutoPortalDriverLogout</servlet-name>
+ <url-pattern>/Logout</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>portletApplicationPublisher</servlet-name>
+ <url-pattern>/admin/Publish</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>tckDriver</servlet-name>
+ <url-pattern>/tck/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AboutPortlet</servlet-name>
+ <url-pattern>/PlutoInvoker/AboutPortlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AdminPortlet</servlet-name>
+ <url-pattern>/PlutoInvoker/AdminPortlet</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>PlutoPageAdmin</servlet-name>
<url-pattern>/PlutoInvoker/PlutoPageAdmin</url-pattern>
</servlet-mapping>
- <taglib>
- <taglib-uri>http://portals.apache.org/pluto</taglib-uri>
- <taglib-location>/WEB-INF/tld/pluto.tld</taglib-location>
- </taglib>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>portal</web-resource-name>
- <url-pattern>/portal</url-pattern>
- <url-pattern>/portal/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>pluto</role-name>
- </auth-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>FORM</auth-method>
- <form-login-config>
- <form-login-page>/login.jsp</form-login-page>
- <form-error-page>/login.jsp?error=1</form-error-page>
- </form-login-config>
- </login-config>
-
- <security-role>
- <role-name>pluto</role-name>
- </security-role>
+ <taglib>
+ <taglib-uri>http://portals.apache.org/pluto</taglib-uri>
+ <taglib-location>/WEB-INF/tld/pluto.tld</taglib-location>
+ </taglib>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>portal</web-resource-name>
+ <url-pattern>/portal</url-pattern>
+ <url-pattern>/portal/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>pluto</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <form-login-config>
+ <form-login-page>/login.jsp</form-login-page>
+ <form-error-page>/login.jsp?error=1</form-error-page>
+ </form-login-config>
+ </login-config>
+
+ <security-role>
+ <role-name>pluto</role-name>
+ </security-role>
</web-app>