xlawrence 2005/01/22 22:01:15 CET
Modified files:
calClient/webapp/admin/src/webapp/WEB-INF web.xml
Log:
file updated from web-app version 2.3 to 2.4
Revision Changes Path
1.9 +170 -196
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml.diff?r1=1.8&r2=1.9&f=h
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- web.xml 21 Jan 2005 15:40:48 -0000 1.8
+++ web.xml 22 Jan 2005 21:01:15 -0000 1.9
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
BEGIN LICENSE BLOCK
Version: JCSL 1.0
@@ -25,205 +25,179 @@
Author: Xavier Lawrence @ jahia . com
-->
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
-
-<web-app>
- <display-name>UWCal Admin Application</display-name>
-
- <context-param>
- <param-name>rpiappname</param-name>
- <param-value>@APP-NAME@</param-value>
- </context-param>
-
- <filter>
- <filter-name>SvcI Filter</filter-name>
- <filter-class>edu.rpi.cct.uwcal.webcommon.UWCalSvciFilter</filter-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>@RPI-DEBUG@</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>SvcI Filter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>REQUEST</dispatcher>
- </filter-mapping>
-
- <listener>
- <listener-class>edu.rpi.sss.util.jsp.SessionListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>action</servlet-name>
-
<servlet-class>org.apache.portals.bridges.struts.PortletServlet</servlet-class>
- <init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>application</param-name>
- <param-value>client</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>@RPI-DEBUG@</param-value>
- </init-param>
- <init-param>
- <param-name>specialCreator</param-name>
- <param-value>@DB-SPECIAL-CREATOR@</param-value>
- </init-param>
- <init-param>
- <param-name>securityPrefix</param-name>
- <param-value>@SECURITY-PREFIX@</param-value>
- </init-param>
-
- <!-- Security role ref defines a name for use by program logic,
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+ version="2.4">
+ <display-name>UWCal Admin Application</display-name>
+ <context-param>
+ <param-name>rpiappname</param-name>
+ <param-value>@APP-NAME@</param-value>
+ </context-param>
+ <filter>
+ <filter-name>SvcI Filter</filter-name>
+
<filter-class>edu.rpi.cct.uwcal.webcommon.UWCalSvciFilter</filter-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>@RPI-DEBUG@</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>SvcI Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <listener>
+
<listener-class>edu.rpi.sss.util.jsp.SessionListener</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>action</servlet-name>
+
<servlet-class>org.apache.portals.bridges.struts.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>client</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>@RPI-DEBUG@</param-value>
+ </init-param>
+ <init-param>
+ <param-name>specialCreator</param-name>
+ <param-value>@DB-SPECIAL-CREATOR@</param-value>
+ </init-param>
+ <init-param>
+ <param-name>securityPrefix</param-name>
+ <param-value>@SECURITY-PREFIX@</param-value>
+ </init-param>
+ <!-- Security role ref defines a name for use by program logic,
(role-name), which refers to an application specific name
(role-link) -->
-
- <init-param>
- <param-name>debug</param-name>
- <param-value>9</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>9</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
-
- <security-role-ref>
- <description>A user with full administrative privileges</description>
- <role-name>admin</role-name>
- <role-link>@[EMAIL PROTECTED]</role-link>
- </security-role-ref>
-
- <security-role-ref>
- <description>A user with some administrative privileges</description>
- <role-name>contentadmin</role-name>
- <role-link>@[EMAIL PROTECTED]</role-link>
- </security-role-ref>
-
- <security-role-ref>
- <description>Somebody who can add alerts</description>
- <role-name>alerts</role-name>
- <role-link>@[EMAIL PROTECTED]</role-link>
- </security-role-ref>
-
- <security-role-ref>
- <description>Somebody who owns events</description>
- <role-name>owner</role-name>
- <role-link>@[EMAIL PROTECTED]</role-link>
- </security-role-ref>
- </servlet>
-
-<!-- Only 1 UwCalConnectorServlet !!! It is deployed by the client app
- <servlet>
- <servlet-name>uwCal-AdminApp</servlet-name>
- <display-name>uwCal-AdminApp</display-name>
- <description>uwCal-AdminApp</description>
- <servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>9</param-value>
+ </init-param>
+ <init-param>
+ <param-name>detail</param-name>
+ <param-value>9</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <security-role-ref>
+ <description>A user with full administrative
privileges</description>
+ <role-name>admin</role-name>
+ <role-link>@[EMAIL PROTECTED]</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <description>A user with some administrative
privileges</description>
+ <role-name>contentadmin</role-name>
+ <role-link>@[EMAIL PROTECTED]</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <description>Somebody who can add alerts</description>
+ <role-name>alerts</role-name>
+ <role-link>@[EMAIL PROTECTED]</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <description>Somebody who owns events</description>
+ <role-name>owner</role-name>
+ <role-link>@[EMAIL PROTECTED]</role-link>
+ </security-role-ref>
+ </servlet>
+ <!-- Only 1 UwCalConnectorServlet !!! It is deployed by the client app
+ <servlet>
+ <servlet-name>uwCal-AdminApp</servlet-name>
+ <display-name>uwCal-AdminApp</display-name>
+ <description>uwCal-AdminApp</description>
+ <servlet-class>
org.jahia.suite.calendar.calServer.UwCalConnectorServlet
- </servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
--->
-
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>*.do</url-pattern>
- </servlet-mapping>
-
-<!--
- <servlet-mapping>
- <servlet-name>uwCal-AdminApp</servlet-name>
- <url-pattern>/uwCal-AdminApp</url-pattern>
- </servlet-mapping>
--->
-
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
- <welcome-file-list>
- <welcome-file>WEB-INF/jsp/index.jsp</welcome-file>
- </welcome-file-list>
-
- <!--
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ -->
+ <servlet-mapping>
+ <servlet-name>action</servlet-name>
+ <url-pattern>*.do</url-pattern>
+ </servlet-mapping>
+ <!--
+ <servlet-mapping>
+ <servlet-name>uwCal-AdminApp</servlet-name>
+ <url-pattern>/uwCal-AdminApp</url-pattern>
+ </servlet-mapping>
+ -->
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>WEB-INF/jsp/index.jsp</welcome-file>
+ </welcome-file-list>
+ <!--
Reference a taglib in the jsp like this:
<%@ taglib uri="struts-bean" prefix="bean" %>
-->
-
- <taglib>
- <taglib-uri>struts-bean</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-bean.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>struts-html</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-html.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>struts-logic</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-logic.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>struts-template</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-template.tld</taglib-location>
- </taglib>
-
- <!-- JDBC DataSources (java:comp/env/jdbc) -->
- <resource-ref>
- <description>The calendar DS</description>
- <res-ref-name>jdbc/calDB</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
-
-<!--
- Not needed for the portlet
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>CalendarAdmin</web-resource-name>
- <description>Public events Administration</description>
- <url-pattern>/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>@[EMAIL PROTECTED]</role-name>
- <role-name>@[EMAIL PROTECTED]</role-name>
- <role-name>@[EMAIL PROTECTED]</role-name>
- <role-name>@[EMAIL PROTECTED]</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>no description</description>
- <transport-guarantee>@TRANSPORT-GUARANTEE@</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
--->
-
- <security-role>
- <description>A user with full administrative privileges</description>
- <role-name>@[EMAIL PROTECTED]</role-name>
- </security-role>
-
- <security-role>
- <description>A user with some administrative privileges</description>
- <role-name>@[EMAIL PROTECTED]</role-name>
- </security-role>
-
- <security-role>
- <description>Somebody who can add alerts</description>
- <role-name>@[EMAIL PROTECTED]</role-name>
- </security-role>
-
- <security-role>
- <description>Somebody who owns events</description>
- <role-name>@[EMAIL PROTECTED]</role-name>
- </security-role>
-
+ <jsp-config>
+ <taglib>
+ <taglib-uri>struts-bean</taglib-uri>
+
<taglib-location>/WEB-INF/tld/struts-bean.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>struts-html</taglib-uri>
+
<taglib-location>/WEB-INF/tld/struts-html.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>struts-logic</taglib-uri>
+
<taglib-location>/WEB-INF/tld/struts-logic.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>struts-template</taglib-uri>
+
<taglib-location>/WEB-INF/tld/struts-template.tld</taglib-location>
+ </taglib>
+ </jsp-config>
+ <!-- JDBC DataSources (java:comp/env/jdbc) -->
+ <resource-ref>
+ <description>The calendar DS</description>
+ <res-ref-name>jdbc/calDB</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- Not needed by the portlet
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>CalendarAdmin</web-resource-name>
+ <description>Public events Administration</description>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <description>no description</description>
+ <transport-guarantee>@TRANSPORT-GUARANTEE@</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ -->
+ <security-role>
+ <description>A user with full administrative
privileges</description>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ </security-role>
+ <security-role>
+ <description>A user with some administrative
privileges</description>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ </security-role>
+ <security-role>
+ <description>Somebody who can add alerts</description>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ </security-role>
+ <security-role>
+ <description>Somebody who owns events</description>
+ <role-name>@[EMAIL PROTECTED]</role-name>
+ </security-role>
</web-app>
