shuber 2005/06/22 16:39:25 CEST
Modified files:
core/src/webapp/WEB-INF/etc/config log4j.xml
core/src/webapp/WEB-INF/etc/spring
applicationContext-hibernate.xml
core/src/webapp/WEB-INF/var/db mysql.script
Log:
- Added logging category for EHcache, much too verbose by default
- Modified Spring configuration to use default username and password of
jahia/jahia as it is in the config wizard. Later on we should configure this
through the wizard though.
- MySQL script now uses the datasource in the context resource, so make sure
you properly install the context descriptor by setting the Tomcat version in
your build.properties file.
Revision Changes Path
1.8 +5 -1 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.7&r2=1.8&f=h
1.4 +2 -2
jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-hibernate.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-hibernate.xml.diff?r1=1.3&r2=1.4&f=h
1.6 +2 -2 jahia/core/src/webapp/WEB-INF/var/db/mysql.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/mysql.script.diff?r1=1.5&r2=1.6&f=h
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- log4j.xml 22 Jun 2005 12:43:19 -0000 1.7
+++ log4j.xml 22 Jun 2005 14:39:25 -0000 1.8
@@ -117,8 +117,12 @@
<priority value="warn"/>
</category>
+ <category name="net.sf.ehcache">
+ <priority value="warn"/>
+ </category>
+
<root>
- <level value ="error"></level>
+ <level value ="debug"></level>
<appender-ref ref="ROLL"></appender-ref>
<appender-ref ref="Console"></appender-ref>
</root>
Index: applicationContext-hibernate.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-hibernate.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- applicationContext-hibernate.xml 22 Jun 2005 12:43:20 -0000 1.3
+++ applicationContext-hibernate.xml 22 Jun 2005 14:39:25 -0000 1.4
@@ -11,10 +11,10 @@
<value>jdbc:mysql://localhost:3306/jahia</value>
</property>
<property name="username">
- <value>root</value>
+ <value>jahia</value>
</property>
<property name="password">
- <value></value>
+ <value>jahia</value>
</property>
<property name="maxActive"><value>50</value></property>
<property name="maxIdle"><value>20</value></property>
Index: mysql.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/mysql.script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql.script 22 Jun 2005 12:43:21 -0000 1.5
+++ mysql.script 22 Jun 2005 14:39:25 -0000 1.6
@@ -10,6 +10,6 @@
jahia.database.schemascriptdir = sql/schema/mysql
jahia.database.popuplationscriptdir = sql/population
jahia.database.starthsqlserver = false
-#jahia.database.datasource = java:comp/env/jdbc/jetspeed
-jahia.database.datasource =
+jahia.database.datasource = java:comp/env/jdbc/jetspeed
+#jahia.database.datasource =
jahia.database.ojbplatform = MySQL
