shuber 2005/01/03 11:45:58 CET
Modified files:
core/src/webapp/WEB-INF/etc/config log4j.xml
core/src/webapp/WEB-INF/etc/services/usermanager
group-router-config.xml
router-config.xml
core/src/webapp/WEB-INF web.xml
Log:
- Corrected startup problems on WebDAV servlet, but still some strange
transaction failures are occuring
- Reorganized web.xml to order servlets by load-on-startup order
- Deactivated LDAP providers by default
- Changed default log level for Spring framework to INFO.
Revision Changes Path
1.2 +4 -0 jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml.diff?r1=1.1&r2=1.2&f=h
1.3 +4 -2
jahia/core/src/webapp/WEB-INF/etc/services/usermanager/group-router-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/services/usermanager/group-router-config.xml.diff?r1=1.2&r2=1.3&f=h
1.3 +4 -0
jahia/core/src/webapp/WEB-INF/etc/services/usermanager/router-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/services/usermanager/router-config.xml.diff?r1=1.2&r2=1.3&f=h
1.8 +128 -125 jahia/core/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/web.xml.diff?r1=1.7&r2=1.8&f=h
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.xml 30 Mar 2004 14:13:17 -0000 1.1
+++ log4j.xml 3 Jan 2005 10:45:57 -0000 1.2
@@ -94,6 +94,10 @@
<priority value="error"/>
</category>
+ <category name="org.springframework">
+ <priority value="error"/>
+ </category>
+
<root>
<priority value="debug"/>
<appender-ref ref="STDOUT"/>
Index: group-router-config.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/services/usermanager/group-router-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- group-router-config.xml 28 Jul 2004 11:54:50 -0000 1.2
+++ group-router-config.xml 3 Jan 2005 10:45:58 -0000 1.3
@@ -17,7 +17,7 @@
<!-- are operations like update, delete allowed or not -->
<is-readonly>false</is-readonly>
</provider>
-
+ <!--
<provider>
<key>ldap</key>
<class>org.jahia.services.usermanager.JahiaGroupManagerLDAPProvider</class>
@@ -33,7 +33,7 @@
<is-default>false</is-default>
<is-readonly>true</is-readonly>
</provider>
-
+ -->
<!-- now we may define criteria for mapping to providers, these rules are
executed in order of declaration. There may be multiple conditions
per criteria, but this isn't used here for the moment. -->
@@ -48,6 +48,7 @@
<provider-destination>jahia_db</provider-destination>
</criteria>
+ <!--
<criteria>
<key>ldap_criteria</key>
<description>
@@ -57,6 +58,7 @@
<condition propertyName="group.key" propertyValue="{ldap}*" />
<provider-destination>ldap</provider-destination>
</criteria>
+ -->
</router-config>
Index: router-config.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/services/usermanager/router-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- router-config.xml 28 Jul 2004 11:54:50 -0000 1.2
+++ router-config.xml 3 Jan 2005 10:45:58 -0000 1.3
@@ -17,6 +17,7 @@
<!-- are operations like update, delete allowed or not -->
<is-readonly>false</is-readonly>
</provider>
+ <!--
<provider>
<key>ldap</key>
<class>org.jahia.services.usermanager.JahiaUserManagerLDAPProvider</class>
@@ -32,6 +33,7 @@
<is-default>false</is-default>
<is-readonly>true</is-readonly>
</provider>
+ -->
<!-- now we may define criteria for mapping to providers, these rules are
executed in order of declaration. There may be multiple conditions
per criteria, but this isn't used here for the moment. -->
@@ -45,6 +47,7 @@
<condition propertyName="user.key" propertyValue="{db}*" />
<provider-destination>jahia_db</provider-destination>
</criteria>
+ <!--
<criteria>
<key>ldap_criteria</key>
<description>
@@ -54,4 +57,5 @@
<condition propertyName="user.key" propertyValue="{ldap}*" />
<provider-destination>ldap</provider-destination>
</criteria>
+ -->
</router-config>
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- web.xml 23 Dec 2004 16:19:50 -0000 1.7
+++ web.xml 3 Jan 2005 10:45:58 -0000 1.8
@@ -16,38 +16,9 @@
<param-value>server</param-value>
</context-param>
-->
-
- <!-- JavaServer Faces Servlet Configuration -->
- <servlet>
- <servlet-name>faces</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>TilesServet</servlet-name>
- <servlet-class>org.apache.struts.tiles.TilesServlet</servlet-class>
- <init-param>
- <param-name>definitions-config</param-name>
- <param-value>/WEB-INF/etc/struts/jahia-tiles-defs.xml</param-value>
- </init-param>
- <init-param>
- <param-name>definitions-parser-validate</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>log4j-init</servlet-name>
- <servlet-class>org.jahia.bin.Log4jInitServlet</servlet-class>
-
- <init-param>
- <param-name>log4j-xml-init-file</param-name>
- <param-value>/WEB-INF/etc/config/log4j.xml</param-value>
- </init-param>
-
- <load-on-startup>3</load-on-startup>
- </servlet>
+
+ <!-- Let's try to keep this list ordered by loading mode, so that it's
+ easier to maintain, thank you -->
<servlet>
<servlet-name>hsqlLauncher</servlet-name>
@@ -81,6 +52,71 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>jetspeed</servlet-name>
+ <servlet-class>org.apache.jetspeed.engine.JetspeedServlet</servlet-class>
+ <init-param>
+ <param-name>properties</param-name>
+
<param-value>/WEB-INF/etc/jetspeed/conf/jetspeed.properties</param-value>
+ </init-param>
+ <init-param>
+ <param-name>configuration</param-name>
+
<param-value>/WEB-INF/etc/jetspeed/conf/jetspeed-configuration.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>applicationRoot</param-name>
+ <param-value>webContext</param-value>
+ </init-param>
+ <!-- To enable SpringEngine, uncomment this param and comment out the
+ PicoEngine one. -->
+ <init-param>
+ <param-name>engine</param-name>
+ <param-value>org.apache.jetspeed.engine.SpringEngine</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <display-name>Jetspeed Container</display-name>
+ <description>MVC Servlet for Jetspeed Portlet Applications</description>
+
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>log4j-init</servlet-name>
+ <servlet-class>org.jahia.bin.Log4jInitServlet</servlet-class>
+
+ <init-param>
+ <param-name>log4j-xml-init-file</param-name>
+ <param-value>/WEB-INF/etc/config/log4j.xml</param-value>
+ </init-param>
+
+ <load-on-startup>4</load-on-startup>
+ </servlet>
+
+ <!-- JavaServer Faces Servlet Configuration -->
+ <servlet>
+ <servlet-name>faces</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TilesServet</servlet-name>
+ <servlet-class>org.apache.struts.tiles.TilesServlet</servlet-class>
+ <init-param>
+ <param-name>definitions-config</param-name>
+ <param-value>/WEB-INF/etc/struts/jahia-tiles-defs.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>definitions-parser-validate</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>6</load-on-startup>
+ </servlet>
+
<servlet>
<servlet-name>
Jahia
@@ -145,71 +181,9 @@
<param-name>application</param-name>
<param-value>ApplicationResources</param-value>
</init-param>
- <load-on-startup>5</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>
- JahiaConfigurationWizard
- </servlet-name>
- <servlet-class>
- org.jahia.bin.JahiaConfigurationWizard
- </servlet-class>
- <init-param>
- <param-name>default_locale</param-name>
- <param-value>en</param-value>
- </init-param>
- <init-param>
- <param-name>content_servlet_path</param-name>
- <param-value>/Jahia/</param-value>
- </init-param>
- <init-param>
- <param-name>methods</param-name>
-
<param-value>/WEB-INF/etc/methods/configurationwizard.properties</param-value>
- </init-param>
- <init-param>
- <param-name>skeleton</param-name>
- <param-value>/WEB-INF/etc/config/jahia.skeleton</param-value>
- </init-param>
- <init-param>
- <param-name>dbScriptsPath</param-name>
- <param-value>/WEB-INF/var/db</param-value>
- </init-param>
- <init-param>
- <!-- This option *old_database* is no longer supported and may
- potentially damage your installation, depending on your
- custom configuration. Any use is at your own risk. -->
- <param-name>old_database</param-name>
- <param-value>false</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>
- JahiaAdministration
- </servlet-name>
- <servlet-class>
- org.jahia.bin.JahiaAdministration
- </servlet-class>
- <init-param>
- <param-name>config_path</param-name>
- <param-value>/WEB-INF/etc/config/</param-value>
- </init-param>
- <init-param>
- <param-name>content_servlet_path</param-name>
- <param-value>/Jahia/</param-value>
- </init-param>
+ <load-on-startup>7</load-on-startup>
</servlet>
- <!-- Axis (SOAP) Servlets -->
- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
- </servlet-class>
- </servlet>
-
<servlet>
<servlet-name>AdminServlet</servlet-name>
<display-name>Axis Admin Servlet</display-name>
@@ -293,7 +267,7 @@
<param-name>debug</param-name>
<param-value>999</param-value>
</init-param>
- <load-on-startup>1</load-on-startup>
+ <load-on-startup>100</load-on-startup>
</servlet>
<servlet>
@@ -365,40 +339,69 @@
<param-name>lockdiscoveryIncludesPrincipalURL</param-name>
<param-value>false</param-value>
</init-param>
- <load-on-startup>1</load-on-startup>
+ <load-on-startup>100</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>
+ JahiaConfigurationWizard
+ </servlet-name>
+ <servlet-class>
+ org.jahia.bin.JahiaConfigurationWizard
+ </servlet-class>
+ <init-param>
+ <param-name>default_locale</param-name>
+ <param-value>en</param-value>
+ </init-param>
+ <init-param>
+ <param-name>content_servlet_path</param-name>
+ <param-value>/Jahia/</param-value>
+ </init-param>
+ <init-param>
+ <param-name>methods</param-name>
+
<param-value>/WEB-INF/etc/methods/configurationwizard.properties</param-value>
+ </init-param>
+ <init-param>
+ <param-name>skeleton</param-name>
+ <param-value>/WEB-INF/etc/config/jahia.skeleton</param-value>
+ </init-param>
+ <init-param>
+ <param-name>dbScriptsPath</param-name>
+ <param-value>/WEB-INF/var/db</param-value>
+ </init-param>
+ <init-param>
+ <!-- This option *old_database* is no longer supported and may
+ potentially damage your installation, depending on your
+ custom configuration. Any use is at your own risk. -->
+ <param-name>old_database</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </servlet>
- <servlet>
- <servlet-name>jetspeed</servlet-name>
- <servlet-class>org.apache.jetspeed.engine.JetspeedServlet</servlet-class>
- <init-param>
- <param-name>properties</param-name>
-
<param-value>/WEB-INF/etc/jetspeed/conf/jetspeed.properties</param-value>
- </init-param>
- <init-param>
- <param-name>configuration</param-name>
-
<param-value>/WEB-INF/etc/jetspeed/conf/jetspeed-configuration.xml</param-value>
- </init-param>
- <init-param>
- <param-name>applicationRoot</param-name>
- <param-value>webContext</param-value>
- </init-param>
- <!-- To enable SpringEngine, uncomment this param and comment out the
- PicoEngine one. -->
- <init-param>
- <param-name>engine</param-name>
- <param-value>org.apache.jetspeed.engine.SpringEngine</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>
+ JahiaAdministration
+ </servlet-name>
+ <servlet-class>
+ org.jahia.bin.JahiaAdministration
+ </servlet-class>
+ <init-param>
+ <param-name>config_path</param-name>
+ <param-value>/WEB-INF/etc/config/</param-value>
+ </init-param>
+ <init-param>
+ <param-name>content_servlet_path</param-name>
+ <param-value>/Jahia/</param-value>
+ </init-param>
+ </servlet>
+ <!-- Axis (SOAP) Servlets -->
<servlet>
- <servlet-name>JetspeedContainer</servlet-name>
- <display-name>Jetspeed Container</display-name>
- <description>MVC Servlet for Jetspeed Portlet Applications</description>
-
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
- <load-on-startup>2</load-on-startup>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AxisServlet
+ </servlet-class>
</servlet>
<!-- [INSERT FRAGMENT HERE] -->
