cmailleux 2005/08/03 13:51:50 CEST
Modified files:
core/src/java/org/jahia/hibernate/manager
JahiaContainerListManager.java
JahiaContainerManager.java
JahiaFieldsDataManager.java
SpringContextSingleton.java
Log:
Check that the staged entry are not already mark as deleted in the
transaction (version ==-1) if not create it otherwise let's go
Revision Changes Path
1.4 +9 -8
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java.diff?r1=1.3&r2=1.4&f=h
1.7 +10 -8
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java.diff?r1=1.6&r2=1.7&f=h
1.7 +9 -7
jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java.diff?r1=1.6&r2=1.7&f=h
1.7 +0 -3
jahia/core/src/java/org/jahia/hibernate/manager/SpringContextSingleton.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/SpringContextSingleton.java.diff?r1=1.6&r2=1.7&f=h
Index: JahiaContainerListManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaContainerListManager.java 12 Jul 2005 13:52:54 -0000 1.3
+++ JahiaContainerListManager.java 3 Aug 2005 11:51:50 -0000 1.4
@@ -17,7 +17,6 @@
import org.jahia.services.version.EntryStateable;
import org.jahia.services.version.JahiaSaveVersion;
import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.orm.hibernate3.HibernateTemplate;
import java.util.*;
@@ -120,13 +119,15 @@
// we update the container
for (int i = 0; i < stagedContainers.size(); i++) {
JahiaContainerList jahiaContainer = (JahiaContainerList)
stagedContainers.get(i);
- dao.deleteContainerList(jahiaContainer);
- try {
- JahiaContainerList jahiaContainer2 =
(JahiaContainerList) jahiaContainer.clone();
- jahiaContainer2.getComp_id().setVersionId(new
Long(-1));
- dao.save(jahiaContainer2);
- } catch (CloneNotSupportedException e) {
- log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
+ if
(jahiaContainer.getComp_id().getVersionId().intValue() != -1) {
+ dao.deleteContainerList(jahiaContainer);
+ try {
+ JahiaContainerList jahiaContainer2 =
(JahiaContainerList) jahiaContainer.clone();
+ jahiaContainer2.getComp_id().setVersionId(new
Long(-1));
+ dao.save(jahiaContainer2);
+ } catch (CloneNotSupportedException e) {
+ log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
+ }
}
}
} else {
Index: JahiaContainerManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaContainerManager.java 3 Aug 2005 10:37:23 -0000 1.6
+++ JahiaContainerManager.java 3 Aug 2005 11:51:50 -0000 1.7
@@ -120,14 +120,16 @@
for (int i = 0; i < stagedContainers.size(); i++) {
org.jahia.hibernate.model.JahiaContainer jahiaContainer =
(org.jahia.hibernate.model.JahiaContainer)
stagedContainers.get(i);
- dao.deleteContainer(jahiaContainer);
- try {
- org.jahia.hibernate.model.JahiaContainer
jahiaContainer2 =
- (org.jahia.hibernate.model.JahiaContainer)
jahiaContainer.clone();
- jahiaContainer2.getComp_id().setVersionId(new
Long(-1));
- dao.save(jahiaContainer2);
- } catch (CloneNotSupportedException e) {
- log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
+ if
(jahiaContainer.getComp_id().getVersionId().intValue() != -1) {
+ dao.deleteContainer(jahiaContainer);
+ try {
+ org.jahia.hibernate.model.JahiaContainer
jahiaContainer2 =
+
(org.jahia.hibernate.model.JahiaContainer) jahiaContainer.clone();
+ jahiaContainer2.getComp_id().setVersionId(new
Long(-1));
+ dao.save(jahiaContainer2);
+ } catch (CloneNotSupportedException e) {
+ log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
+ }
}
}
} else {
Index: JahiaFieldsDataManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaFieldsDataManager.java 3 Aug 2005 10:37:23 -0000 1.6
+++ JahiaFieldsDataManager.java 3 Aug 2005 11:51:50 -0000 1.7
@@ -239,13 +239,15 @@
// we update the container
for (int i = 0; i < stagedContainers.size(); i++) {
JahiaFieldsData jahiaContainer = (JahiaFieldsData)
stagedContainers.get(i);
- dao.deleteJahiaField(jahiaContainer);
- try {
- JahiaFieldsData jahiaContainer2 = (JahiaFieldsData)
jahiaContainer.clone();
- jahiaContainer2.getComp_id().setVersionId(new
Long(-1));
- dao.save(jahiaContainer2);
- } catch (CloneNotSupportedException e) {
- log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
+ if
(jahiaContainer.getComp_id().getVersionId().intValue() != -1) {
+ dao.deleteJahiaField(jahiaContainer);
+ try {
+ JahiaFieldsData jahiaContainer2 =
(JahiaFieldsData) jahiaContainer.clone();
+ jahiaContainer2.getComp_id().setVersionId(new
Long(-1));
+ dao.save(jahiaContainer2);
+ } catch (CloneNotSupportedException e) {
+ log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
+ }
}
}
} else {
Index: SpringContextSingleton.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/SpringContextSingleton.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SpringContextSingleton.java 25 Jul 2005 16:51:55 -0000 1.6
+++ SpringContextSingleton.java 3 Aug 2005 11:51:50 -0000 1.7
@@ -25,9 +25,6 @@
}
private SpringContextSingleton() {
- if (Jahia.getSettings() == null) {
- return;
- }
try {
final String springPath =
Jahia.getSettings().getPathResolver().resolvePath(springRelativePath);
String[] paths = {"file:" + springPath +
"/applicationContext-*.xml"};
