knguyen 2005/10/24 14:42:51 CEST
Modified files:
core/src/java/org/jahia/services/timebasedpublishing
RetentionRuleJob.java
core/src/java/org/jahia/services/webdav/listeners
CMSSlideContentListener.java
core/src/webapp/WEB-INF/etc/config listeners.registry
quartz.properties
core/src/webapp/WEB-INF/etc/spring
applicationcontext-basejahiaconfig.xml
applicationcontext-dao.xml
applicationcontext-hibernate.xml
applicationcontext-manager.xml
applicationcontext-services.xml
core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic
quartz-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/mssql
quartz-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/mysql
quartz-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/oracle
quartz-schema.sql
core/src/webapp/WEB-INF/var/db/sql/schema/postgresql
quartz-schema.sql
Log:
- syncr
Revision Changes Path
1.2 +0 -1
jahia/core/src/java/org/jahia/services/timebasedpublishing/RetentionRuleJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/timebasedpublishing/RetentionRuleJob.java.diff?r1=1.1&r2=1.2&f=h
1.25 +2 -2
jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java.diff?r1=1.24&r2=1.25&f=h
1.13 +2 -0
jahia/core/src/webapp/WEB-INF/etc/config/listeners.registry
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/listeners.registry.diff?r1=1.12&r2=1.13&f=h
1.7 +1 -1
jahia/core/src/webapp/WEB-INF/etc/config/quartz.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/quartz.properties.diff?r1=1.6&r2=1.7&f=h
1.6 +3 -2
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-basejahiaconfig.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-basejahiaconfig.xml.diff?r1=1.5&r2=1.6&f=h
1.3 +11 -0
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml.diff?r1=1.2&r2=1.3&f=h
1.9 +3 -0
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.8&r2=1.9&f=h
1.5 +19 -1
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml.diff?r1=1.4&r2=1.5&f=h
1.15 +14 -0
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.14&r2=1.15&f=h
1.2 +1 -0
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/quartz-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/quartz-schema.sql.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -1
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/quartz-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/quartz-schema.sql.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -0
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/quartz-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/quartz-schema.sql.diff?r1=1.1&r2=1.2&f=h
1.4 +1 -0
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/quartz-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/quartz-schema.sql.diff?r1=1.3&r2=1.4&f=h
1.4 +1 -0
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/quartz-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/quartz-schema.sql.diff?r1=1.3&r2=1.4&f=h
Index: RetentionRuleJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/timebasedpublishing/RetentionRuleJob.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RetentionRuleJob.java 10 Aug 2005 08:27:05 -0000 1.1
+++ RetentionRuleJob.java 24 Oct 2005 12:42:48 -0000 1.2
@@ -24,7 +24,6 @@
org.apache.log4j.Logger.getLogger(RetentionRuleJob.class);
public RetentionRuleJob () {
- String debugPoint = "o";
}
public void execute (JobExecutionContext context)
Index: CMSSlideContentListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CMSSlideContentListener.java 30 Sep 2005 15:34:07 -0000 1.24
+++ CMSSlideContentListener.java 24 Oct 2005 12:42:48 -0000 1.25
@@ -599,7 +599,7 @@
if (curPage.getTitle().equals(oldPageTitle)) {
logger.debug("URI is a collection, let's create a page for
it");
curPage.setTitle(newPageTitle);
- curPage.commitChanges(true);
+ curPage.commitChanges(true, jParams.getUser());
} else {
// we are renaming a file.
}
@@ -826,7 +826,7 @@
logger.debug("File is now valid, let's re-index
it...");
Jahia.setThreadParamBean(processingContext);
ServicesRegistry.getInstance().getJahiaSearchService().
- indexField(fieldID, false, processingContext);
+ indexField(fieldID, processingContext.getUser());
Jahia.setThreadParamBean(null);
} else {
logger.debug("Stream for file " + fileName +
Index: listeners.registry
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/listeners.registry,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- listeners.registry 18 Aug 2005 16:33:41 -0000 1.12
+++ listeners.registry 24 Oct 2005 12:42:49 -0000 1.13
@@ -30,3 +30,5 @@
# CMS objects.
#
CMSSlideContentListener=org.jahia.services.webdav.listeners.CMSSlideContentListener
+
+JahiaSearchListener=org.jahia.services.search.JahiaSearchListener
Index: quartz.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/quartz.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- quartz.properties 13 Oct 2005 13:12:46 -0000 1.6
+++ quartz.properties 24 Oct 2005 12:42:49 -0000 1.7
@@ -98,7 +98,7 @@
# 'export' and 'proxy' properties is of course valid.
#
org.quartz.scheduler.instanceName = JahiaQuartzScheduler
-#org.quartz.scheduler.instanceId = 1
+org.quartz.scheduler.instanceId = AUTO
#org.quartz.scheduler.rmi.export = false
#org.quartz.scheduler.rmi.proxy = false
Index: applicationcontext-basejahiaconfig.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-basejahiaconfig.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- applicationcontext-basejahiaconfig.xml 4 Oct 2005 07:52:26 -0000
1.5
+++ applicationcontext-basejahiaconfig.xml 24 Oct 2005 12:42:49 -0000
1.6
@@ -104,12 +104,13 @@
lockDir
org.apache.lucene.lockDir the value of
java.io.tmpdir system property
-->
<prop
key="org.jahia.engines.search.searchViewHandler.default">org.jahia.engines.search.SearchViewHandlerImpl</prop>
- <prop
key="org.apache.lucene.mergeFactor">10</prop>
- <prop
key="org.apache.lucene.minMergeDocs">50</prop>
+ <prop
key="org.apache.lucene.mergeFactor">50</prop>
+ <prop
key="org.apache.lucene.minMergeDocs">1000</prop>
<prop
key="org.apache.lucene.commitLockTimeout">60000</prop>
<prop
key="org.apache.lucene.writeLockTimeout">6000</prop>
<prop
key="org.apache.lucene.maxClauseCount">10000</prop>
<prop
key="org.jahia.services.search.searchIndexRootDir">/WEB-INF/var/search_indexes</prop>
+ <prop
key="org.jahia.services.search.localIndexing">1</prop><!-- 1: index, 0: do not
index ,just read ( I.E when sharing a same index directory in a clustered
environment )-->
<prop
key="defaultSearchHandlerClass">org.jahia.services.search.lucene.fs.LuceneSearchHandlerImpl</prop>
<!--
Index: applicationcontext-dao.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- applicationcontext-dao.xml 8 Sep 2005 07:54:54 -0000 1.2
+++ applicationcontext-dao.xml 24 Oct 2005 12:42:49 -0000 1.3
@@ -199,6 +199,17 @@
<ref bean="sessionFactory"/>
</property>
</bean>
+ <bean id="jahiaIndexingJobDAO"
class="org.jahia.hibernate.dao.JahiaIndexingJobDAO">
+ <property name="sessionFactory">
+ <ref bean="sessionFactory"/>
+ </property>
+ </bean>
+ <bean id="jahiaServerPropertiesDAO"
class="org.jahia.hibernate.dao.JahiaServerPropertiesDAO">
+ <property name="sessionFactory">
+ <ref bean="sessionFactory"/>
+ </property>
+ </bean>
+
<!-- HTML Default configuration manager-->
<bean id="htmlClipperDefaultConfigurationDAO"
class="org.jahia.clipbuilder.html.database.hibernate.dao.DefaultConfigurationDAO">
<property name="sessionFactory">
Index: applicationcontext-hibernate.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- applicationcontext-hibernate.xml 10 Oct 2005 18:23:09 -0000 1.8
+++ applicationcontext-hibernate.xml 24 Oct 2005 12:42:49 -0000 1.9
@@ -107,6 +107,9 @@
<value>org/jahia/workflow/nstep/model/WorkflowStep.hbm.xml</value>
<value>org/jahia/workflow/nstep/model/WorkflowInstance.hbm.xml</value>
<value>org/jahia/workflow/nstep/model/WorkflowHistoryEntry.hbm.xml</value>
+
<value>org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.hbm.xml</value>
+
<value>org/jahia/hibernate/model/jahiaserver/JahiaServerProp.hbm.xml</value>
+
<!-- clipbuilder-->
<value>org/jahia/clipbuilder/html/database/hibernate/model/clipper.hbm.xml</value>
<value>org/jahia/clipbuilder/sql/database/hibernate/model/databaseConfiguration.hbm.xml</value>
Index: applicationcontext-manager.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- applicationcontext-manager.xml 5 Oct 2005 13:49:12 -0000 1.4
+++ applicationcontext-manager.xml 24 Oct 2005 12:42:49 -0000 1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
@@ -503,4 +503,22 @@
</bean>
</property>
</bean>
+ <bean id="org.jahia.hibernate.manager.JahiaIndexingJobManager"
parent="txProxyTemplate">
+ <property name="target">
+ <bean
class="org.jahia.hibernate.manager.JahiaIndexingJobManager">
+ <property name="jahiaIndexingJobDAO">
+ <ref bean="jahiaIndexingJobDAO"/>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ <bean id="org.jahia.hibernate.manager.JahiaServerPropertiesManager"
parent="txProxyTemplate">
+ <property name="target">
+ <bean
class="org.jahia.hibernate.manager.JahiaServerPropertiesManager">
+ <property name="jahiaServerPropertiesDAO">
+ <ref bean="jahiaServerPropertiesDAO"/>
+ </property>
+ </bean>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
Index: applicationcontext-services.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- applicationcontext-services.xml 12 Oct 2005 11:23:35 -0000 1.14
+++ applicationcontext-services.xml 24 Oct 2005 12:42:49 -0000 1.15
@@ -15,6 +15,14 @@
caches. For DB caches, this is now managed by the Hibernate
implementation, and is configured in the
applicationContext-hibernate.xml file.
-->
+ <bean id="ClusterNodeSettings"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="serverId">jahiaServer1</prop>
+ </props>
+ </property>
+ </bean>
+
<bean id="ClusterService" parent="txProxyTemplate">
<property name="target">
<bean class="org.jahia.services.cluster.JGroupsClusterService"
parent="jahiaServiceTemplate">
@@ -412,6 +420,12 @@
<property name="schedulerService">
<ref bean="SchedulerService"/>
</property>
+ <property name="indJobMgr">
+ <ref
bean="org.jahia.hibernate.manager.JahiaIndexingJobManager"/>
+ </property>
+ <property name="serverPropMgr">
+ <ref
bean="org.jahia.hibernate.manager.JahiaServerPropertiesManager"/>
+ </property>
<property name="compass">
<ref bean="compass"/>
</property>
Index: quartz-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/quartz-schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quartz-schema.sql 23 Aug 2005 15:54:56 -0000 1.1
+++ quartz-schema.sql 24 Oct 2005 12:42:50 -0000 1.2
@@ -61,6 +61,7 @@
END_TIME NUMERIC(13) NULL,
CALENDAR_NAME VARCHAR(80) NULL,
MISFIRE_INSTR NUMERIC(2) NULL,
+JOB_DATA BINARY NULL,
PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
FOREIGN KEY (JOB_NAME,JOB_GROUP)
REFERENCES JAHIA_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)
Index: quartz-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/quartz-schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quartz-schema.sql 23 Aug 2005 15:54:56 -0000 1.1
+++ quartz-schema.sql 24 Oct 2005 12:42:50 -0000 1.2
@@ -173,7 +173,8 @@
[START_TIME] [BIGINT] NOT NULL ,
[END_TIME] [BIGINT] NULL ,
[CALENDAR_NAME] [VARCHAR] (80) NULL ,
- [MISFIRE_INSTR] [SMALLINT] NULL
+ [MISFIRE_INSTR] [SMALLINT] NULL ,
+ [JOB_DATA] [IMAGE] NULL
) ON [PRIMARY]
GO
Index: quartz-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/quartz-schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quartz-schema.sql 23 Aug 2005 15:54:57 -0000 1.1
+++ quartz-schema.sql 24 Oct 2005 12:42:50 -0000 1.2
@@ -48,6 +48,7 @@
END_TIME BIGINT(13) NULL,
CALENDAR_NAME VARCHAR(80) NULL,
MISFIRE_INSTR SMALLINT(2) NULL,
+JOB_DATA BLOB NULL,
PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
INDEX (JOB_NAME, JOB_GROUP),
FOREIGN KEY (JOB_NAME,JOB_GROUP)
Index: quartz-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/quartz-schema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quartz-schema.sql 29 Aug 2005 13:28:24 -0000 1.3
+++ quartz-schema.sql 24 Oct 2005 12:42:50 -0000 1.4
@@ -50,6 +50,7 @@
END_TIME NUMBER(13) NULL,
CALENDAR_NAME VARCHAR2(80) NULL,
MISFIRE_INSTR NUMBER(2) NULL,
+ JOB_DATA BLOB NULL,
PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
FOREIGN KEY (JOB_NAME,JOB_GROUP)
REFERENCES jahia_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)
Index: quartz-schema.sql
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/quartz-schema.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quartz-schema.sql 29 Aug 2005 16:19:35 -0000 1.3
+++ quartz-schema.sql 24 Oct 2005 12:42:51 -0000 1.4
@@ -51,6 +51,7 @@
END_TIME BIGINT NULL,
CALENDAR_NAME VARCHAR(80) NULL,
MISFIRE_INSTR SMALLINT NULL,
+ JOB_DATA BYTEA NULL,
PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
FOREIGN KEY (JOB_NAME,JOB_GROUP)
REFERENCES jahia_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)
