Author: vmassol Date: 2007-10-26 13:33:03 +0200 (Fri, 26 Oct 2007) New Revision: 5508
Added: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirectServlet.java Removed: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirect.java xwiki-platform/web/trunk/standard/src/main/webapp/index.html xwiki-platform/web/trunk/standard/src/main/webapp/install.txt Modified: xwiki-platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml xwiki-platform/xwiki-tools/trunk/xwiki-jetty-resources/src/main/resources/etc/jetty.xml xwiki-products/curriki/trunk/web/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 Deleted: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirect.java =================================================================== --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirect.java 2007-10-26 10:57:48 UTC (rev 5507) +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirect.java 2007-10-26 11:33:03 UTC (rev 5508) @@ -1,38 +0,0 @@ -/* - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - */ -package com.xpn.xwiki.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * A simple action that redirects to the main page of the wiki - */ -public class HomePageRedirect extends HttpServlet { - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO: configure the main page? - response.sendRedirect("bin/view/Main/"); - } -} Copied: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirectServlet.java (from rev 5499, xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirect.java) =================================================================== --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirectServlet.java (rev 0) +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/HomePageRedirectServlet.java 2007-10-26 11:33:03 UTC (rev 5508) @@ -0,0 +1,41 @@ +/* + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * + */ +package com.xpn.xwiki.web; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * A simple action that redirects to the main page of the wiki. This is to allow users to enter + * a URL like <code>http://localhost:8080/xwiki</code> and be redirected automatically to + * <code>http://localhost:8080/xwiki/bin/view/Main/</code>. + */ +public class HomePageRedirectServlet extends HttpServlet +{ + public void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException + { + response.sendRedirect("bin/view/Main/WebHome"); + } +} Modified: xwiki-platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml =================================================================== --- xwiki-platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml 2007-10-26 10:57:48 UTC (rev 5507) +++ xwiki-platform/web/trunk/standard/src/main/webapp/WEB-INF/web.xml 2007-10-26 11:33:03 UTC (rev 5508) @@ -83,8 +83,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> @@ -131,8 +131,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> @@ -153,10 +153,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> <error-page> Deleted: xwiki-platform/web/trunk/standard/src/main/webapp/index.html =================================================================== --- xwiki-platform/web/trunk/standard/src/main/webapp/index.html 2007-10-26 10:57:48 UTC (rev 5507) +++ xwiki-platform/web/trunk/standard/src/main/webapp/index.html 2007-10-26 11:33:03 UTC (rev 5508) @@ -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/trunk/standard/src/main/webapp/install.txt =================================================================== --- xwiki-platform/web/trunk/standard/src/main/webapp/install.txt 2007-10-26 10:57:48 UTC (rev 5507) +++ xwiki-platform/web/trunk/standard/src/main/webapp/install.txt 2007-10-26 11:33:03 UTC (rev 5508) @@ -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 Modified: xwiki-platform/xwiki-tools/trunk/xwiki-jetty-resources/src/main/resources/etc/jetty.xml =================================================================== --- xwiki-platform/xwiki-tools/trunk/xwiki-jetty-resources/src/main/resources/etc/jetty.xml 2007-10-26 10:57:48 UTC (rev 5507) +++ xwiki-platform/xwiki-tools/trunk/xwiki-jetty-resources/src/main/resources/etc/jetty.xml 2007-10-26 11:33:03 UTC (rev 5508) @@ -20,7 +20,7 @@ <Arg> <New class="org.mortbay.http.SocketListener"> <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set> - <Set name="PoolName">P1</Set> + <Set name="PoolName">P1</Set> <Set name="MinThreads">20</Set> <Set name="MaxThreads">200</Set> <Set name="lowResources">50</Set> @@ -42,13 +42,13 @@ <Arg> <New class="org.mortbay.http.SslListener"> <Set name="Port">8443</Set> - <Set name="PoolName">P1</Set> + <Set name="PoolName">P1</Set> <Set name="MaxIdleTimeMs">30000</Set> <Set name="lowResources">30</Set> <Set name="LowResourcePersistTimeMs">2000</Set> <Set name="Keystore"><SystemProperty name="jetty.home" default="."/>/etc/demokeystore</Set> - <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set> - <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set> + <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set> + <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set> <Set name="HttpHandler"> <New class="org.mortbay.http.handler.MsieSslHandler"> Modified: xwiki-products/curriki/trunk/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- xwiki-products/curriki/trunk/web/src/main/webapp/WEB-INF/web.xml 2007-10-26 10:57:48 UTC (rev 5507) +++ xwiki-products/curriki/trunk/web/src/main/webapp/WEB-INF/web.xml 2007-10-26 11:33:03 UTC (rev 5508) @@ -1,201 +1,205 @@ <?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";> + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> - <display-name>xwiki</display-name> + <display-name>xwiki</display-name> - <description>This application is a servlet and a portlet</description> + <description>This application is a servlet and a portlet</description> - <!-- Define context level parameters for XWiki's initialization --> - <context-param> - <param-name>org.apache.velocity.properties</param-name> - <param-value>/WEB-INF/velocity.properties</param-value> - <description>Velocity's configuration</description> - </context-param> + <!-- Define context level parameters for XWiki's initialization --> + <context-param> + <param-name>org.apache.velocity.properties</param-name> + <param-value>/WEB-INF/velocity.properties</param-value> + <description>Velocity's configuration</description> + </context-param> - <filter> - <filter-name>Set Character Encoding</filter-name> - <filter-class>com.xpn.xwiki.web.SetCharacterEncodingFilter</filter-class> - <init-param> - <param-name>encoding</param-name> - <param-value>UTF-8</param-value> - </init-param> - </filter> + <filter> + <filter-name>Set Character Encoding</filter-name> + <filter-class>com.xpn.xwiki.web.SetCharacterEncodingFilter</filter-class> + <init-param> + <param-name>encoding</param-name> + <param-value>UTF-8</param-value> + </init-param> + </filter> - <filter-mapping> - <filter-name>Set Character Encoding</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <filter-mapping> + <filter-name>Set Character Encoding</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> - <!-- XWiki's initialization is done in a Servlet Context Listener. This is where we set up + <!-- XWiki's initialization is done in a Servlet Context Listener. This is where we set up everything that should be initialized prior to XWiki servicing requests. For example this is where we initialize Velocity. --> - <listener> - <listener-class>com.xpn.xwiki.web.InitializationServletContextListener</listener-class> - </listener> + <listener> + <listener-class>com.xpn.xwiki.web.InitializationServletContextListener</listener-class> + </listener> - <servlet> - <servlet-name>action</servlet-name> - <servlet-class>org.apache.struts.action.ActionServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>ApplicationResources</param-value> - </init-param> - <init-param> - <param-name>xwiki</param-name> - <param-value>com.xpn.xwiki.XWiki</param-value> - </init-param> - <init-param> - <param-name>config</param-name> - <param-value>/WEB-INF/struts-config.xml</param-value> - </init-param> - <init-param> - <param-name>debug</param-name> - <param-value>2</param-value> - </init-param> - <init-param> - <param-name>detail</param-name> - <param-value>2</param-value> - </init-param> - <init-param> - <param-name>validate</param-name> - <param-value>true</param-value> - </init-param> - <load-on-startup>2</load-on-startup> - </servlet> + <servlet> + <servlet-name>action</servlet-name> + <servlet-class>org.apache.struts.action.ActionServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>ApplicationResources</param-value> + </init-param> + <init-param> + <param-name>xwiki</param-name> + <param-value>com.xpn.xwiki.XWiki</param-value> + </init-param> + <init-param> + <param-name>config</param-name> + <param-value>/WEB-INF/struts-config.xml</param-value> + </init-param> + <init-param> + <param-name>debug</param-name> + <param-value>2</param-value> + </init-param> + <init-param> + <param-name>detail</param-name> + <param-value>2</param-value> + </init-param> + <init-param> + <param-name>validate</param-name> + <param-value>true</param-value> + </init-param> + <load-on-startup>2</load-on-startup> + </servlet> - <servlet> - <servlet-name>redirectHome</servlet-name> - <servlet-class>com.xpn.xwiki.web.HomePageRedirect</servlet-class> - </servlet> - - <servlet> - <servlet-name>xmlrpc</servlet-name> - <servlet-class>com.xpn.xwiki.xmlrpc.XWikiXmlRpcServlet</servlet-class> - <init-param> - <param-name>enabledForExtensions</param-name> - <param-value>false</param-value> - <description>Sets, whether the servlet supports vendor extensions for XML-RPC.</description> - </init-param> - </servlet> + <servlet> + <servlet-name>redirectHomeServlet</servlet-name> + <servlet-class>com.xpn.xwiki.web.HomePageRedirectServlet</servlet-class> + </servlet> - <servlet> - <servlet-name>CurrikiService</servlet-name> - <servlet-class>org.curriki.gwt.server.CurrikiServiceImpl</servlet-class> - </servlet> + <servlet> + <servlet-name>xmlrpc</servlet-name> + <servlet-class>com.xpn.xwiki.xmlrpc.XWikiXmlRpcServlet</servlet-class> + <init-param> + <param-name>enabledForExtensions</param-name> + <param-value>false</param-value> + <description>Sets, whether the servlet supports vendor extensions for XML-RPC.</description> + </init-param> + </servlet> - <servlet-mapping> - <servlet-name>action</servlet-name> - <url-pattern>/bin/*</url-pattern> - </servlet-mapping> + <servlet> + <servlet-name>CurrikiService</servlet-name> + <servlet-class>org.curriki.gwt.server.CurrikiServiceImpl</servlet-class> + </servlet> - <servlet-mapping> - <servlet-name>action</servlet-name> - <url-pattern>/testbin/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>action</servlet-name> + <url-pattern>/bin/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>action</servlet-name> - <url-pattern>/xwiki/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>action</servlet-name> + <url-pattern>/testbin/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>xmlrpc</servlet-name> - <url-pattern>/xmlrpc/*</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>action</servlet-name> + <url-pattern>/xwiki/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>redirectHome</servlet-name> - <url-pattern>/index.redirect</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>xmlrpc</servlet-name> + <url-pattern>/xmlrpc/*</url-pattern> + </servlet-mapping> - <servlet-mapping> - <servlet-name>CurrikiService</servlet-name> - <url-pattern>/bin/download/XWiki/GWT/GWT.zip/org.curriki.gwt.Main/CurrikiService</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>CurrikiService</servlet-name> - <url-pattern>/org.curriki.gwt.Main/CurrikiService</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>CurrikiService</servlet-name> - <url-pattern>/gwt/CurrikiService</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>redirectHomeServlet</servlet-name> + <url-pattern>/redirect</url-pattern> + </servlet-mapping> - <!-- Content-type mappings --> - <mime-mapping> - <extension>css</extension> - <mime-type>text/css</mime-type> - </mime-mapping> + <servlet-mapping> + <servlet-name>CurrikiService</servlet-name> + <url-pattern>/bin/download/XWiki/GWT/GWT.zip/org.curriki.gwt.Main/CurrikiService</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>CurrikiService</servlet-name> + <url-pattern>/org.curriki.gwt.Main/CurrikiService</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>CurrikiService</servlet-name> + <url-pattern>/gwt/CurrikiService</url-pattern> + </servlet-mapping> - <mime-mapping> - <extension>html</extension> - <mime-type>text/html</mime-type> - </mime-mapping> + <!-- Content-type mappings --> + <mime-mapping> + <extension>css</extension> + <mime-type>text/css</mime-type> + </mime-mapping> - <mime-mapping> - <extension>xml</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> + <mime-mapping> + <extension>html</extension> + <mime-type>text/html</mime-type> + </mime-mapping> - <mime-mapping> - <extension>js</extension> - <mime-type>text/javascript</mime-type> - </mime-mapping> + <mime-mapping> + <extension>xml</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> - <!-- The Usual Welcome File List --> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - <welcome-file>index.redirect</welcome-file> - </welcome-file-list> + <mime-mapping> + <extension>js</extension> + <mime-type>text/javascript</mime-type> + </mime-mapping> - <!-- - <error-page> - <error-code>500</error-code> - <location>/error.jsp</location> - </error-page> - --> - <error-page> - <error-code>404</error-code> - <location>/xwiki/bin/view/Main/DocumentDoesNotExist</location> - </error-page> + <!-- 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>redirect</welcome-file> + </welcome-file-list> - <!-- Example Application Tag Library Descriptor + <!-- + <error-page> + <error-code>500</error-code> + <location>/error.jsp</location> + </error-page> + --> + <error-page> + <error-code>404</error-code> + <location>/xwiki/bin/view/Main/DocumentDoesNotExist</location> + </error-page> + + <!-- Example Application Tag Library Descriptor <taglib> <taglib-uri>/WEB-INF/app.tld</taglib-uri> <taglib-location>/WEB-INF/app.tld</taglib-location> </taglib> --> - <!-- Struts Tag Library Descriptors --> - <taglib> - <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> - </taglib> + <!-- Struts Tag Library Descriptors --> + <taglib> + <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri> + <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> + </taglib> - <taglib> - <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-html.tld</taglib-location> - </taglib> + <taglib> + <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri> + <taglib-location>/WEB-INF/struts-html.tld</taglib-location> + </taglib> - <taglib> - <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> - </taglib> + <taglib> + <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri> + <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> + </taglib> - <resource-ref> - <description>DB Connection</description> - <res-ref-name>jdbc/XWikiDS</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - </resource-ref> - - <env-entry> - <env-entry-name>XWikiConfig</env-entry-name> - <env-entry-value>/WEB-INF/xwiki.cfg</env-entry-value> - <env-entry-type>java.lang.String</env-entry-type> - </env-entry> + <resource-ref> + <description>DB Connection</description> + <res-ref-name>jdbc/XWikiDS</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + </resource-ref> + + <env-entry> + <env-entry-name>XWikiConfig</env-entry-name> + <env-entry-value>/WEB-INF/xwiki.cfg</env-entry-value> + <env-entry-type>java.lang.String</env-entry-type> + </env-entry> </web-app> _______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
