knguyen 2005/11/30 17:23:56 CET
Modified files:
core/src/java/org/jahia/hibernate/dao JahiaIndexingJobDAO.java
core/src/java/org/jahia/hibernate/manager
JahiaIndexingJobManager.java
core/src/java/org/jahia/hibernate/model/indexingjob
JahiaContainerIndexingJob.java
JahiaIndexingJob.java
Log:
- use uuid for indexing job
Revision Changes Path
1.3 +2 -8
jahia/core/src/java/org/jahia/hibernate/dao/JahiaIndexingJobDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaIndexingJobDAO.java.diff?r1=1.2&r2=1.3&f=h
1.2 +2 -2
jahia/core/src/java/org/jahia/hibernate/manager/JahiaIndexingJobManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaIndexingJobManager.java.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIndexingJob.java.diff?r1=1.1&r2=1.2&f=h
1.4 +6 -6
jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaIndexingJobDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaIndexingJobDAO.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaIndexingJobDAO.java 23 Nov 2005 17:44:10 -0000 1.2
+++ JahiaIndexingJobDAO.java 30 Nov 2005 16:23:56 -0000 1.3
@@ -48,7 +48,7 @@
return template.find(query.toString(), new Long(time));
}
- public JahiaIndexingJob findByPK(Integer id) {
+ public JahiaIndexingJob findByPK(String id) {
HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
return (JahiaIndexingJob) template.load(JahiaIndexingJob.class, id);
@@ -60,19 +60,13 @@
template.deleteAll(getIndexingJobsBefore(time,includeOfSameTime));
}
- public synchronized void delete(Integer id) {
+ public synchronized void delete(String id) {
HibernateTemplate template = getHibernateTemplate();
template.deleteAll(template.find("from JahiaIndexingJob h where
h.id=?", id));
}
public synchronized void save(JahiaIndexingJob job) {
HibernateTemplate template = getHibernateTemplate();
- if ( job.getId() == null || job.getId().intValue() == -1
- || job.getId().intValue() == 0){
- // job.setId(null);
- job.setId(getNextIntegerByClass(JahiaIndexingJob.class));
- }
-
template.merge(job);
}
}
Index: JahiaIndexingJobManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaIndexingJobManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JahiaIndexingJobManager.java 24 Oct 2005 12:42:23 -0000 1.1
+++ JahiaIndexingJobManager.java 30 Nov 2005 16:23:56 -0000 1.2
@@ -58,7 +58,7 @@
return jobsList;
}
- public IndexingJob getIndexingJobById(Integer id) {
+ public IndexingJob getIndexingJobById(String id) {
if (id == null ) {
return null;
}
@@ -78,7 +78,7 @@
dao.deleteIndexingJobsBefore(time,includeOfSameTime);
}
- public void delete(Integer id) {
+ public void delete(String id) {
dao.delete(id);
}
Index: JahiaContainerIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIndexingJob.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JahiaContainerIndexingJob.java 24 Oct 2005 12:42:23 -0000 1.1
+++ JahiaContainerIndexingJob.java 30 Nov 2005 16:23:56 -0000 1.2
@@ -4,7 +4,7 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.jahia.services.search.indexingscheduler.IndexingJob;
import org.jahia.services.search.indexingscheduler.impl.ContainerIndexingJob;
-
+
/**
* Created by IntelliJ IDEA.
* User: hollis
Index: JahiaIndexingJob.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaIndexingJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaIndexingJob.java 23 Nov 2005 17:44:14 -0000 1.3
+++ JahiaIndexingJob.java 30 Nov 2005 16:23:56 -0000 1.4
@@ -17,7 +17,7 @@
*/
public abstract class JahiaIndexingJob implements Serializable, Cloneable{
- private Integer id = new Integer(-1);
+ private String id = null;
private Long date = new Long(0);
private String userKey;
@@ -25,16 +25,16 @@
}
/**
- * @hibernate.id generator-class="assigned"
- * type="java.lang.Integer"
+ * @hibernate.id generator-class="uuid.hex"
+ * type="java.lang.String"
+ * length="250"
* column="id_indexingjob"
- * @hibernate.generator-param name="max_lo" value="1"
*/
- public Integer getId() {
+ public String getId() {
return id;
}
- public void setId(Integer id) {
+ public void setId(String id) {
this.id = id;
}
