cmailleux 2005/10/12 16:49:28 CEST
Modified files:
core/src/java/org/jahia/hibernate/model JahiaAppDef.java
JahiaAppsSharePK.java
JahiaContainer.java
JahiaCtnDef.java
JahiaFieldsData.java
JahiaFieldsDef.java
JahiaGrp.java
JahiaHomepage.java
JahiaMarkupSetSitePK.java
JahiaObject.java
JahiaPagesData.java
JahiaPagesDef.java
JahiaSiteLangList.java
JahiaSiteLangMap.java
JahiaSitePropPK.java
JahiaSitesGrpPK.java
JahiaSitesUserPK.java
JahiaTemplatesSet.java
JahiaUser.java
Log:
Remove delete on cascade
Revision Changes Path
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaAppDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppDef.java.diff?r1=1.6&r2=1.7&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaAppsSharePK.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppsSharePK.java.diff?r1=1.6&r2=1.7&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaContainer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaContainer.java.diff?r1=1.6&r2=1.7&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaCtnDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaCtnDef.java.diff?r1=1.6&r2=1.7&f=h
1.5 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java.diff?r1=1.4&r2=1.5&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java.diff?r1=1.5&r2=1.6&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaGrp.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaGrp.java.diff?r1=1.5&r2=1.6&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaHomepage.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaHomepage.java.diff?r1=1.6&r2=1.7&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaMarkupSetSitePK.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaMarkupSetSitePK.java.diff?r1=1.6&r2=1.7&f=h
1.3 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaObject.java.diff?r1=1.2&r2=1.3&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java.diff?r1=1.5&r2=1.6&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesDef.java.diff?r1=1.5&r2=1.6&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteLangList.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteLangList.java.diff?r1=1.5&r2=1.6&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteLangMap.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteLangMap.java.diff?r1=1.5&r2=1.6&f=h
1.7 +0 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaSitePropPK.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSitePropPK.java.diff?r1=1.6&r2=1.7&f=h
1.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaSitesGrpPK.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSitesGrpPK.java.diff?r1=1.6&r2=1.7&f=h
1.8 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaSitesUserPK.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSitesUserPK.java.diff?r1=1.7&r2=1.8&f=h
1.5 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaTemplatesSet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaTemplatesSet.java.diff?r1=1.4&r2=1.5&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/model/JahiaUser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaUser.java.diff?r1=1.5&r2=1.6&f=h
Index: JahiaAppDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppDef.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaAppDef.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaAppDef.java 12 Oct 2005 14:49:26 -0000 1.7
@@ -118,7 +118,7 @@
}
/**
- * @hibernate.many-to-one not-null="true" cascade="delete"
+ * @hibernate.many-to-one not-null="true"
* @hibernate.column name="jahiaid_jahia_app_def"
*/
public JahiaSite getSite() {
Index: JahiaAppsSharePK.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppsSharePK.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaAppsSharePK.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaAppsSharePK.java 12 Oct 2005 14:49:26 -0000 1.7
@@ -47,7 +47,7 @@
}
/**
- * @hibernate.many-to-one not-null="true" cascade="delete"
+ * @hibernate.many-to-one not-null="true"
* @hibernate.column name="id_aps_siteid"
*/
public JahiaSite getSite() {
Index: JahiaContainer.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaContainer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaContainer.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaContainer.java 12 Oct 2005 14:49:26 -0000 1.7
@@ -160,7 +160,7 @@
}
/**
- * @hibernate.many-to-one not-null="true" cascade="delete"
+ * @hibernate.many-to-one not-null="true"
* @hibernate.column name="jahiaid_jahia_ctn_entries"
*/
public JahiaSite getSite() {
Index: JahiaCtnDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaCtnDef.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaCtnDef.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaCtnDef.java 12 Oct 2005 14:49:26 -0000 1.7
@@ -64,7 +64,7 @@
/**
* @hibernate.many-to-one update="true"
- * insert="true" cascade="delete"
+ * insert="true"
* @hibernate.column name="jahiaid_jahia_ctn_def"
*/
public org.jahia.hibernate.model.JahiaSite getJahiaSite() {
Index: JahiaFieldsData.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaFieldsData.java 12 Oct 2005 14:28:37 -0000 1.4
+++ JahiaFieldsData.java 12 Oct 2005 14:49:26 -0000 1.5
@@ -165,7 +165,7 @@
}
/**
- * @hibernate.many-to-one not-null="true" cascade="delete"
+ * @hibernate.many-to-one not-null="true"
* @hibernate.column name="jahiaid_jahia_fields_data"
*/
public JahiaSite getSite() {
Index: JahiaFieldsDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaFieldsDef.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaFieldsDef.java 12 Oct 2005 14:49:26 -0000 1.6
@@ -56,7 +56,7 @@
}
/**
- * @hibernate.many-to-one not-null="false" cascade="delete"
+ * @hibernate.many-to-one not-null="false"
* @hibernate.column name="jahiaid_jahia_fields_def"
*/
public org.jahia.hibernate.model.JahiaSite getJahiaSite() {
Index: JahiaGrp.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaGrp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaGrp.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaGrp.java 12 Oct 2005 14:49:26 -0000 1.6
@@ -94,7 +94,7 @@
}
/**
- * @hibernate.many-to-one cascade="delete"
+ * @hibernate.many-to-one
* @hibernate.column name="siteid_jahia_grps"
*/
public JahiaSite getSite() {
Index: JahiaHomepage.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaHomepage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaHomepage.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaHomepage.java 12 Oct 2005 14:49:26 -0000 1.7
@@ -116,7 +116,7 @@
}
/**
- * @hibernate.many-to-one class="org.jahia.hibernate.model.JahiaSite"
property-ref="key" cascade="delete"
+ * @hibernate.many-to-one class="org.jahia.hibernate.model.JahiaSite"
property-ref="key"
* column="sitekey_jahia_homepages"
* @return
*/
Index: JahiaMarkupSetSitePK.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaMarkupSetSitePK.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaMarkupSetSitePK.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaMarkupSetSitePK.java 12 Oct 2005 14:49:26 -0000 1.7
@@ -36,7 +36,7 @@
}
/**
- * @hibernate.many-to-one update="true" insert="true" column="site_id"
cascade="delete"
+ * @hibernate.many-to-one update="true" insert="true" column="site_id"
*/
public org.jahia.hibernate.model.JahiaSite getSite() {
return this.site;
Index: JahiaObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaObject.java 12 Oct 2005 14:28:37 -0000 1.2
+++ JahiaObject.java 12 Oct 2005 14:49:26 -0000 1.3
@@ -46,7 +46,7 @@
}
/**
- * @hibernate.many-to-one not-null="false" cascade="delete"
+ * @hibernate.many-to-one not-null="false"
* @hibernate.column name="jahiaid_jahia_obj"
*/
public JahiaSite getSite() {
Index: JahiaPagesData.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaPagesData.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaPagesData.java 12 Oct 2005 14:49:26 -0000 1.6
@@ -213,7 +213,7 @@
}
/**
- * @hibernate.many-to-one not-null="true" cascade="delete"
+ * @hibernate.many-to-one not-null="true"
* @hibernate.column name="jahiaid_jahia_pages_data"
*/
public JahiaSite getSite() {
Index: JahiaPagesDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesDef.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaPagesDef.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaPagesDef.java 12 Oct 2005 14:49:27 -0000 1.6
@@ -105,7 +105,7 @@
}
/**
- * @hibernate.many-to-one cascade="none" cascade="delete"
+ * @hibernate.many-to-one cascade="none"
* @hibernate.column name="jahiaid_jahia_pages_def"
*/
public JahiaSite getSite() {
Index: JahiaSiteLangList.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteLangList.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaSiteLangList.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaSiteLangList.java 12 Oct 2005 14:49:27 -0000 1.6
@@ -83,7 +83,7 @@
}
/**
- * @hibernate.many-to-one update="true" insert="true" column="site_id"
cascade="delete"
+ * @hibernate.many-to-one update="true" insert="true" column="site_id"
*/
public org.jahia.hibernate.model.JahiaSite getSite() {
return this.site;
Index: JahiaSiteLangMap.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteLangMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaSiteLangMap.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaSiteLangMap.java 12 Oct 2005 14:49:27 -0000 1.6
@@ -70,7 +70,7 @@
}
/**
- * @hibernate.many-to-one update="true" insert="true" column="site_id"
cascade="delete"
+ * @hibernate.many-to-one update="true" insert="true" column="site_id"
*/
public org.jahia.hibernate.model.JahiaSite getSite() {
return this.site;
Index: JahiaSitePropPK.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSitePropPK.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaSitePropPK.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaSitePropPK.java 12 Oct 2005 14:49:27 -0000 1.7
@@ -37,7 +37,6 @@
/**
* @hibernate.many-to-one column="id_jahia_site"
* class="org.jahia.hibernate.model.JahiaSite"
- * cascade="delete"
*/
public JahiaSite getId() {
return this.id;
Index: JahiaSitesGrpPK.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSitesGrpPK.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaSitesGrpPK.java 12 Oct 2005 14:28:37 -0000 1.6
+++ JahiaSitesGrpPK.java 12 Oct 2005 14:49:27 -0000 1.7
@@ -50,7 +50,7 @@
/**
* @hibernate.many-to-one update="false"
- * insert="false" cascade="delete" column="siteid_sites_grps"
+ * insert="false" column="siteid_sites_grps"
*/
public JahiaSite getSite() {
return this.site;
Index: JahiaSitesUserPK.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSitesUserPK.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JahiaSitesUserPK.java 12 Oct 2005 14:28:37 -0000 1.7
+++ JahiaSitesUserPK.java 12 Oct 2005 14:49:27 -0000 1.8
@@ -50,7 +50,7 @@
/**
* @hibernate.many-to-one update="true"
- * insert="true" cascade="delete" column="siteid_sites_users"
+ * insert="true" column="siteid_sites_users"
*/
public JahiaSite getSite() {
return this.site;
Index: JahiaTemplatesSet.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaTemplatesSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaTemplatesSet.java 12 Oct 2005 14:28:37 -0000 1.4
+++ JahiaTemplatesSet.java 12 Oct 2005 14:49:27 -0000 1.5
@@ -112,7 +112,7 @@
}
/**
- * @hibernate.one-to-one class="org.jahia.hibernate.model.JahiaSite"
cascade="delete"
+ * @hibernate.one-to-one class="org.jahia.hibernate.model.JahiaSite"
* outer-join="auto"
* constrained="true"
*/
Index: JahiaUser.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaUser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaUser.java 12 Oct 2005 14:28:37 -0000 1.5
+++ JahiaUser.java 12 Oct 2005 14:49:27 -0000 1.6
@@ -116,7 +116,7 @@
}
/**
- * @hibernate.many-to-one cascade="delete"
+ * @hibernate.many-to-one
* @hibernate.column name="siteid_jahia_users"
*/
public JahiaSite getSite() {
