Author: vmassol
Date: 2007-10-26 14:04:05 +0200 (Fri, 26 Oct 2007)
New Revision: 5514
Added:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/redirect
Removed:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/index.html
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/install.txt
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/WEB-INF/web.xml
Log:
XWIKI-1827: Make XWiki products go to the main page by default when entering
the http://<server>:<port>/xwiki URL
Merged from trunk (rev 5508 and 5509)
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/WEB-INF/web.xml
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/WEB-INF/web.xml
2007-10-26 12:03:42 UTC (rev 5513)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/WEB-INF/web.xml
2007-10-26 12:04:05 UTC (rev 5514)
@@ -68,8 +68,8 @@
</servlet>
<servlet>
- <servlet-name>redirectHome</servlet-name>
- <servlet-class>com.xpn.xwiki.web.HomePageRedirect</servlet-class>
+ <servlet-name>redirectHomeServlet</servlet-name>
+ <servlet-class>com.xpn.xwiki.web.HomePageRedirectServlet</servlet-class>
</servlet>
<servlet>
@@ -109,8 +109,8 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>redirectHome</servlet-name>
- <url-pattern>/index.redirect</url-pattern>
+ <servlet-name>redirectHomeServlet</servlet-name>
+ <url-pattern>/redirect</url-pattern>
</servlet-mapping>
<servlet-mapping>
@@ -131,10 +131,14 @@
<mime-type>text/css</mime-type>
</mime-mapping>
- <!-- The Usual Welcome File List -->
+ <!-- Redirects to the Main.WebHome page if the user calls the root of the
webapp, i.e.
+ http://server:port/xwiki/
+ Note 1: for this to work fine the redirect file needs to exist in the
WAR
+ Note 2: with Servlet 2.4 it's possible to have a Servlet directly
specified in the welcome
+ file list but right now we'd like XWiki to work out of the box
with Servlet 2.3
+ -->
<welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.redirect</welcome-file>
+ <welcome-file>redirect</welcome-file>
</welcome-file-list>
<!--
Deleted:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/index.html
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/index.html
2007-10-26 12:03:42 UTC (rev 5513)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/index.html
2007-10-26 12:04:05 UTC (rev 5514)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
-<head>
-<title>
-XWiki Installation
-</title>
-</head>
-<body>
-<h1>XWiki Installation</h1>
-<ul>
-<li><a href="install.txt">Installation Instructions</a></li>
-<li><a href="/xwiki/bin/view/Main/WebHome">XWiki Home Page</a></li>
-</ul>
-</body>
-</html>
\ No newline at end of file
Deleted:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/install.txt
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/install.txt
2007-10-26 12:03:42 UTC (rev 5513)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/install.txt
2007-10-26 12:04:05 UTC (rev 5514)
@@ -1,6 +0,0 @@
-
-XWiki Installation Instructions
-
-Please refer to the online documentation at:
-
-http://www.xwiki.org/xwiki/bin/view/AdminGuide/
\ No newline at end of file
Copied:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/redirect
(from rev 5509, xwiki-platform/web/trunk/standard/src/main/webapp/redirect)
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/redirect
(rev 0)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/redirect
2007-10-26 12:04:05 UTC (rev 5514)
@@ -0,0 +1 @@
+Do not remove this file. It needs to be there so that the <welcome-file-list>
in web.xml works.
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
