xlawrence 2005/01/06 17:38:23 CET
Modified files:
webapp/admin/src/webapp/WEB-INF web.xml
webapp/uiclient/src/webapp/WEB-INF web.xml
Log:
Updated config files for the webAPP
Revision Changes Path
1.2 +5 -23 uwcal_JSR168/webapp/admin/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/admin/src/webapp/WEB-INF/web.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -28 uwcal_JSR168/webapp/uiclient/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/webapp/uiclient/src/webapp/WEB-INF/web.xml.diff?r1=1.1&r2=1.2&f=h
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/webapp/admin/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 5 Jan 2005 14:00:23 -0000 1.1
+++ web.xml 6 Jan 2005 16:38:23 -0000 1.2
@@ -5,31 +5,13 @@
"http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>@DISPLAY-NAME@</display-name>
+ <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>XSLT Filter</filter-name>
- <filter-class>edu.rpi.sss.kiosk.filters.KioskXSLTFilter</filter-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>@RPI-DEBUG@</param-value>
- </init-param>
- </filter>
--->
-
-<!--
- <filter-mapping>
- <filter-name>XSLT Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- -->
-
<listener>
<listener-class>edu.rpi.sss.util.jsp.SessionListener</listener-class>
</listener>
@@ -37,7 +19,7 @@
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>
- org.apache.struts.action.ActionServlet
+ org.apache.portals.bridges.struts.PortletServlet
</servlet-class>
<init-param>
<param-name>application</param-name>
@@ -97,7 +79,7 @@
</session-config>
<welcome-file-list>
- <welcome-file>docs/index.html</welcome-file>
+ <welcome-file>WEB-INF/jsp/index.html</welcome-file>
</welcome-file-list>
<!--
@@ -153,8 +135,8 @@
<auth-method>FORM</auth-method>
<realm-name>@SECURITY-DOMAIN@</realm-name>
<form-login-config>
- <form-login-page>/docs/login/login.html</form-login-page>
- <form-error-page>/docs/login/error.html</form-error-page>
+ <form-login-page>/WEB-INF/jsp/login/login.html</form-login-page>
+ <form-error-page>/WEB-INF/jsp/login/error.html</form-error-page>
</form-login-config>
</login-config>
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/webapp/uiclient/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 5 Jan 2005 14:00:45 -0000 1.1
+++ web.xml 6 Jan 2005 16:38:23 -0000 1.2
@@ -9,7 +9,7 @@
-->
<web-app>
- <display-name>UWCal public client</display-name>
+ <display-name>UWCal Client Application</display-name>
<context-param>
<param-name>rpiappname</param-name>
@@ -29,29 +29,6 @@
</init-param>
</filter>
- <!-- not yet - need to reconfig jboss - see cocoon install for hints
- <filter>
- <filter-name>FOP Filter</filter-name>
- <filter-class>edu.rpi.sss.util.servlets.FOPFilter</filter-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>dump</param-name>
- <param-value>false</param-value>
- </init-param>
- </filter> -->
-
- <!-- XSLT should get the response before the FOPFilter -->
-
-<!--
- <filter-mapping>
- <filter-name>FOP Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- -->
-
<filter-mapping>
<filter-name>XSLT Filter</filter-name>
<url-pattern>/*</url-pattern>
@@ -64,7 +41,7 @@
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>
- org.apache.struts.action.ActionServlet
+ org.apache.portals.bridges.struts.PortletServlet
</servlet-class>
<init-param>
<param-name>application</param-name>
@@ -88,7 +65,7 @@
</session-config>
<welcome-file-list>
- <welcome-file>docs/initial.jsp</welcome-file>
+ <welcome-file>WEB-INF/jsp/initial.jsp</welcome-file>
</welcome-file-list>
<!--
@@ -143,8 +120,8 @@
<auth-method>FORM</auth-method>
<realm-name>rpiLdap</realm-name>
<form-login-config>
- <form-login-page>/docs/login/login.html</form-login-page>
- <form-error-page>/docs/login/error.html</form-error-page>
+ <form-login-page>/WEB-INF/jsp/login/login.html</form-login-page>
+ <form-error-page>/WEB-INF/jsp/login/error.html</form-error-page>
</form-login-config>
</login-config>
