shuber 2005/04/01 17:29:56 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
metadata/jbproject/jahia Jahia Libs.library jahia_4_1.jpx
metadata/war web.xml
Log:
Various small fixes :
- JBuidler project now includes proper servlet.jar (was compiling against 2.4
which was causing big problems with Tomcat 4.x)
- Made later initialization of WebDav servlets, but there is still a NPE when
Jahia hasn't been configured.
Revision Changes Path
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
1.1.2.3 +2 -1 jahia/metadata/jbproject/jahia/jahia_4_1.jpx
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/metadata/jbproject/jahia/jahia_4_1.jpx.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.41.2.3.2.3 +2 -2 jahia/metadata/war/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/metadata/war/web.xml.diff?r1=1.41.2.3.2.2&r2=1.41.2.3.2.3&f=h
Index: jahia_4_1.jpx
===================================================================
RCS file:
/home/cvs/repository/jahia/metadata/jbproject/jahia/Attic/jahia_4_1.jpx,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- jahia_4_1.jpx 15 Feb 2005 16:46:53 -0000 1.1.2.2
+++ jahia_4_1.jpx 1 Apr 2005 15:29:55 -0000 1.1.2.3
@@ -17,6 +17,7 @@
<property category="generalFormatting2" name="tabSize" value="4"/>
<property category="idl" name="ProcessIDL" value="false"/>
<property category="javaFormatting" name="alignMultilineAssign" value="1"/>
+ <property category="javaFormatting" name="alwaysClasses" value="1"/>
<property category="javaFormatting" name="arrayInitDataOnNewLine"
value="0"/>
<property category="javaFormatting" name="catchOnNewLine" value="0"/>
<property category="javaFormatting" name="elseOnNewLine" value="0"/>
@@ -141,7 +142,7 @@
<property category="sys" name="JDK" value="java version 1.4.2_04-b05"/>
<property category="sys" name="JbxEventListener0"
value="javax.jms.ExceptionListener"/>
<property category="sys" name="LastTag" value="0"/>
- <property category="sys" name="Libraries" value="Jahia
Libs;JUnit;Servlet"/>
+ <property category="sys" name="Libraries" value="Jahia Libs;JUnit"/>
<property category="sys" name="MakeStable" value="0"/>
<property category="sys" name="OutPath" value="../../../build/classes"/>
<property category="sys" name="SourcePath"
value="../../../src/java;../../../test/src/java"/>
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/jahia/metadata/war/Attic/web.xml,v
retrieving revision 1.41.2.3.2.2
retrieving revision 1.41.2.3.2.3
diff -u -r1.41.2.3.2.2 -r1.41.2.3.2.3
--- web.xml 3 Mar 2005 14:55:07 -0000 1.41.2.3.2.2
+++ web.xml 1 Apr 2005 15:29:55 -0000 1.41.2.3.2.3
@@ -283,7 +283,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>
@@ -351,7 +351,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>
