r1505 - in xwiki/trunk: . src/main web/exo/src/main/webapp web/exo/src/main/webapp/WEB-INF web/standard/src/main/webapp/WEB-INF
Vincent Massol
vmassol at users.forge.objectweb.org
Fri Nov 3 15:04:54 CET 2006
Author: vmassol
Date: 2006-11-03 15:04:53 +0100 (Fri, 03 Nov 2006)
New Revision: 1505
Added:
xwiki/trunk/web/exo/src/main/webapp/WEB-INF/
xwiki/trunk/web/exo/src/main/webapp/WEB-INF/web-exo.xml
xwiki/trunk/web/standard/src/main/webapp/WEB-INF/web.xml
Removed:
xwiki/trunk/src/main/web-exo.xml
xwiki/trunk/src/main/web.xml
Modified:
xwiki/trunk/build.xml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build
* Moved web.xml files to their new locations
Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml 2006-11-03 13:59:12 UTC (rev 1504)
+++ xwiki/trunk/build.xml 2006-11-03 14:04:53 UTC (rev 1505)
@@ -469,26 +469,26 @@
<target name="webapp" depends="jar">
<mkdir dir="${release.dir}/web" />
<copy todir="${release.dir}/web">
- <fileset dir="${build.dir}/web">
- <exclude name="**/web-*.xml" />
- <exclude name="**/xwiki-*.cfg" />
- <exclude name="**/hibernate-test.cfg.xml" />
- <exclude name="**/hibernate.cfg.*.xml" />
- </fileset>
+ <fileset dir="${build.dir}/web">
+ <exclude name="**/web-*.xml" />
+ <exclude name="**/xwiki-*.cfg" />
+ <exclude name="**/hibernate-test.cfg.xml" />
+ <exclude name="**/hibernate.cfg.*.xml" />
+ </fileset>
</copy>
<copy todir="${release.dir}/web/WEB-INF/lib">
<fileset refid="libs.main.fileset" />
<fileset refid="libs.hib.fileset" />
<fileset refid="libs.exo.fileset" />
<fileset refid="libs.xwiki.fileset" />
- </copy>
+ </copy>
<copy tofile="${release.dir}/web/WEB-INF/web.xml" overwrite="true"
- file="${main.src.dir}/web.xml" />
+ file="${web.standard.webapp.main.src.dir}/WEB-INF/web.xml" />
</target>
<target name="release" depends="jar">
<mkdir dir="${release.dir}" />
- <war warfile="${release.warfile}" basedir="${build.dir}/web" webxml="${main.src.dir}/web.xml" >
+ <war warfile="${release.warfile}" basedir="${build.dir}/web" webxml="${web.standard.webapp.main.src.dir}/WEB-INF/web.xml" >
<exclude name="**/web*.xml" />
<exclude name="**/xwiki-*.cfg" />
<lib refid="libs.main.fileset" />
@@ -498,7 +498,7 @@
</war>
<copy file="${build.dir}/web/WEB-INF/xwiki.cfg" tofile="${build.dir}/web/WEB-INF/xwiki-normal.cfg" overwrite="true" />
<copy file="${build.dir}/web/WEB-INF/xwiki-exo.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
- <war warfile="${exo.warfile}" basedir="${build.dir}/web" webxml="${main.src.dir}/web-exo.xml" >
+ <war warfile="${exo.warfile}" basedir="${build.dir}/web" webxml="${web.exo.webapp.main.src.dir}/WEB-INF/web-exo.xml" >
<exclude name="**/web*.xml" />
<exclude name="**/xwiki-*.cfg" />
<lib refid="libs.main.fileset" />
Deleted: xwiki/trunk/src/main/web-exo.xml
===================================================================
--- xwiki/trunk/src/main/web-exo.xml 2006-11-03 13:59:12 UTC (rev 1504)
+++ xwiki/trunk/src/main/web-exo.xml 2006-11-03 14:04:53 UTC (rev 1505)
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!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>xwiki</display-name>
- <description>This application is a servlet and a portlet</description>
-
- <filter>
- <filter-name>ExoFilter</filter-name>
- <filter-class>com.xpn.xwiki.user.impl.exo.ExoFilter</filter-class>
- </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>ISO-8859-1</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>Set Character Encoding</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
- <filter-mapping>
- <filter-name>ExoFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <listener>
- <listener-class>org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>PortletWrapper</servlet-name>
- <servlet-class>org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper</servlet-class>
- </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>velocity</servlet-name>
- <servlet-class>org.apache.velocity.tools.view.servlet.VelocityViewServlet</servlet-class>
-
- <init-param>
- <param-name>org.apache.velocity.toolbox</param-name>
- <param-value>/WEB-INF/toolbox.xml</param-value>
- </init-param>
-
- <init-param>
- <param-name>org.apache.velocity.properties</param-name>
- <param-value>/WEB-INF/velocity.properties</param-value>
- </init-param>
-
- <load-on-startup>10</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>/bin/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>/testbin/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>PortletWrapper</servlet-name>
- <url-pattern>/PortletWrapper</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>/xwiki/*</url-pattern>
- </servlet-mapping>
-
- <!--
- <error-page>
- <error-code>500</error-code>
- <location>/error.jsp</location>
- </error-page>
- <error-page>
- <error-code>404</error-code>
- <location>/error.jsp</location>
- </error-page>
- -->
-
- <!-- The Usual Welcome File List -->
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
- <!-- 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>
-
- <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>
- <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>
Deleted: xwiki/trunk/src/main/web.xml
===================================================================
--- xwiki/trunk/src/main/web.xml 2006-11-03 13:59:12 UTC (rev 1504)
+++ xwiki/trunk/src/main/web.xml 2006-11-03 14:04:53 UTC (rev 1505)
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!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>xwiki</display-name>
-
- <description>This application is a servlet and a portlet</description>
-
- <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>ISO-8859-1</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>Set Character Encoding</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <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>velocity</servlet-name>
- <servlet-class>org.apache.velocity.tools.view.servlet.VelocityViewServlet</servlet-class>
-
- <init-param>
- <param-name>org.apache.velocity.toolbox</param-name>
- <param-value>/WEB-INF/toolbox.xml</param-value>
- </init-param>
-
- <init-param>
- <param-name>org.apache.velocity.properties</param-name>
- <param-value>/WEB-INF/velocity.properties</param-value>
- </init-param>
-
- <load-on-startup>10</load-on-startup>
- </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-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>/testbin/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>/xwiki/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>xmlrpc</servlet-name>
- <url-pattern>/xmlrpc/*</url-pattern>
- </servlet-mapping>
-
- <!-- The Usual Welcome File List -->
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
- <!--
- <error-page>
- <error-code>500</error-code>
- <location>/error.jsp</location>
- </error-page>
- <error-page>
- <error-code>404</error-code>
- <location>/error.jsp</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>
-
- <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>
-
- <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>
Copied: xwiki/trunk/web/exo/src/main/webapp/WEB-INF/web-exo.xml (from rev 1502, xwiki/trunk/src/main/web-exo.xml)
Copied: xwiki/trunk/web/standard/src/main/webapp/WEB-INF/web.xml (from rev 1502, xwiki/trunk/src/main/web.xml)
More information about the Xwiki-notifications
mailing list