shuber 2005/07/28 16:01:08 CEST
Modified files:
core/src/webapp/WEB-INF/etc/config log4j.xml
core/src/webapp/WEB-INF/etc/spring
applicationContext-services.xml
Log:
Correct order of service initialization to properly start the file watcher
base service.
Revision Changes Path
1.13 +1 -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.12&r2=1.13&f=h
1.7 +9 -6
jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-services.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-services.xml.diff?r1=1.6&r2=1.7&f=h
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- log4j.xml 21 Jul 2005 15:07:36 -0000 1.12
+++ log4j.xml 28 Jul 2005 14:01:07 -0000 1.13
@@ -21,7 +21,7 @@
<appender name="Console" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601}: %p:
%m%n"></param>
+ <param name="ConversionPattern" value="%d{ISO8601}: %p,%c:
%m%n"></param>
</layout>
</appender>
Index: applicationContext-services.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-services.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- applicationContext-services.xml 25 Jul 2005 18:12:41 -0000 1.6
+++ applicationContext-services.xml 28 Jul 2005 14:01:07 -0000 1.7
@@ -214,9 +214,18 @@
</bean>
</property>
</bean>
+ <bean id="SchedulerService" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="org.jahia.services.scheduler.SchedulerServiceImpl"
factory-method="getInstance">
+ </bean>
+ </property>
+ </bean>
<bean id="JahiaFileWatcherService" parent="txProxyTemplate">
<property name="target">
<bean
class="org.jahia.services.deamons.filewatcher.JahiaFileWatcherBaseService"
factory-method="getInstance">
+ <property name="schedulerService">
+ <ref bean="SchedulerService"/>
+ </property>
</bean>
</property>
</bean>
@@ -434,12 +443,6 @@
</list>
</property>
</bean>
- <bean id="SchedulerService" parent="txProxyTemplate">
- <property name="target">
- <bean class="org.jahia.services.scheduler.SchedulerServiceImpl"
factory-method="getInstance">
- </bean>
- </property>
- </bean>
<bean id="JCRStoreService" parent="txProxyTemplate">
<property name="target">
<bean class="org.jahia.services.content.JCRStoreService"
factory-method="getInstance">
