knguyen 2005/07/25 16:37:44 CEST
Modified files:
core/src/java/org/jahia/hibernate/model JahiaSite.java
JahiaSiteProp.java
Log:
- complete JahiaSite/JahiaSiteProp mapping
Revision Changes Path
1.4 +22 -0
jahia/core/src/java/org/jahia/hibernate/model/JahiaSite.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSite.java.diff?r1=1.3&r2=1.4&f=h
1.4 +31 -0
jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteProp.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteProp.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaSite.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSite.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaSite.java 11 Jul 2005 15:01:22 -0000 1.3
+++ JahiaSite.java 25 Jul 2005 14:37:44 -0000 1.4
@@ -3,9 +3,12 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Map;
import java.io.Serializable;
import java.util.Set;
+import java.util.List;
/**
* @hibernate.class table="jahia_sites"
@@ -89,6 +92,11 @@
private Set jahiaCtnDefs;
/**
+ * persistent field
+ */
+ private Set settings;
+
+ /**
* full constructor
*/
public JahiaSite(Integer id, String title, String servername, String
key, Integer active, Integer defaultpageid,
@@ -260,6 +268,20 @@
public void setDescr(String descr) {
this.descr = descr;
}
+
+ /**
+ * @hibernate.set inverse="true" cascade="none"
+ * @hibernate.collection-key column="id_jahia_site"
+ * @hibernate.collection-one-to-many
class="org.jahia.hibernate.model.JahiaSiteProp"
+ */
+ public Set getSettings() {
+ return settings;
+ }
+
+ public void setSettings(Set settings) {
+ this.settings = settings;
+ }
+
//
// /**
// * @hibernate.one-to-one outer-join="auto"
Index: JahiaSiteProp.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaSiteProp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaSiteProp.java 11 Jul 2005 15:01:22 -0000 1.3
+++ JahiaSiteProp.java 25 Jul 2005 14:37:44 -0000 1.4
@@ -18,6 +18,10 @@
*/
private org.jahia.hibernate.model.JahiaSitePropPK comp_id;
+ private Integer siteId;
+
+ private String name;
+
/**
* nullable persistent field
*/
@@ -56,6 +60,33 @@
}
/**
+ * @hibernate.property column="id_jahia_site"
+ * unique="false"
+ * update="false" insert="false"
+ * @return
+ */
+ public Integer getSiteId() {
+ return siteId;
+ }
+
+ public void setSiteId(Integer siteId) {
+ this.siteId = siteId;
+ }
+
+ /**
+ * @hibernate.property column="name_jahia_site_prop"
+ * unique="false"
+ * update="false" insert="false"
+ */
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
* @hibernate.property column="value_jahia_site_prop"
* length="255"
*/