Author: tdraier
Date: Mon Sep 10 17:51:12 2007
New Revision: 18412
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18412&repname=
=3Djahia
Log:
simplified mapping to avoid crash
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDefinitionDAO.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerDefinitionManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerListManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaCtnDef.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaContainerDefinitionDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaContainerDefinitionDAO.j=
ava&rev=3D18412&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDefinitionDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDefinitionDAO.java Mon Sep 10 17:51:12 2007
@@ -73,7 +73,7 @@
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
JahiaCtnDef ctnDef =3D null;
- String hql =3D "from JahiaCtnDef def where def.jahiaSite.id=3D? an=
d def.name=3D?";
+ String hql =3D "from JahiaCtnDef def where def.jahiaSiteId=3D? and=
def.name=3D?";
if (siteId !=3D null && definitionName !=3D null) {
List list =3D template.find(hql.toString(), new Object[]{siteI=
d, definitionName});
if (list.size() > 0) {
@@ -108,7 +108,7 @@
} catch (RuntimeException e) {
hibernateTemplate.clear();
// Maybe the definition has already been added by another node=
? lets try to find it
- JahiaCtnDef ctnDef2 =3D fullyLoadContainerDefinition(ctnDef.ge=
tJahiaSite().getId(), ctnDef.getName());
+ JahiaCtnDef ctnDef2 =3D fullyLoadContainerDefinition(ctnDef.ge=
tJahiaSiteId(), ctnDef.getName());
if (ctnDef2 !=3D null) return ctnDef2;
else throw e;
}
@@ -242,7 +242,7 @@
public List deleteAllDefinitionsFromSite(Integer siteID) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setFlushMode(HibernateTemplate.FLUSH_AUTO);
- String hql =3D "select def.id from JahiaCtnDef def where def.jahia=
Site.id=3D?";
+ String hql =3D "select def.id from JahiaCtnDef def where def.jahia=
SiteId=3D?";
List list =3D template.find(hql.toString(), siteID);
List retList =3D new ArrayList(list.size());
for (int i =3D 0; i < list.size(); i++) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaContainerDefinitionManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaContainerDefinitionM=
anager.java&rev=3D18412&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerDefinitionManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerDefinitionManager.java Mon Sep 10 17:51:12 2007
@@ -86,7 +86,7 @@
} catch (ObjectRetrievalFailureException e) {
log.warn("JahiaSite not found " + theDefinition.getJahiaID(), =
e);
}
- ctnDef.setJahiaSite(site);
+ ctnDef.setJahiaSiteId(site.getId());
ctnDef.setName(theDefinition.getName());
ctnDef.setSubDefinitions(properties);
ctnDef.setProperties(theDefinition.getProperties());
@@ -234,7 +234,7 @@
log.warn("JahiaSite not found " + theDefinition.getJahiaID(), =
e);
}
Set properties =3D convertToJahiaCtnDef(theDefinition, ctnDef);
- ctnDef.setJahiaSite(site);
+ ctnDef.setJahiaSiteId(site.getId());
ctnDef.setName(theDefinition.getName());
if (!properties.equals(ctnDef.getSubDefinitions())) {
ctnDef.setSubDefinitions(properties);
@@ -295,7 +295,7 @@
}
=
containerDefinition =3D new JahiaContainerDefinition(ctnDe=
f.getId().intValue(),
- ctnDef.=
getJahiaSite().getId().intValue(),
+ ctnDef.=
getJahiaSiteId().intValue(),
ctnDef.=
getName(), subDefinition);
Properties properties =3D new Properties();
if (ctnDef.getProperties() !=3D null) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaContainerListManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager=
.java&rev=3D18412&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerListManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerListManager.java Mon Sep 10 17:51:12 2007
@@ -111,7 +111,7 @@
jahiaContainerListClone.getComp_id().setVersionId(new Long(toE=
.getVersionID()));
jahiaContainerListClone.getComp_id().setWorkflowState(new Inte=
ger(toE.getWorkflowState()));
dao.save(jahiaContainerListClone);
- flushCache(id, jahiaContainerListClone.getContainerDefinition(=
).getJahiaSite().getId().intValue(),
+ flushCache(id, jahiaContainerListClone.getContainerDefinition(=
).getJahiaSiteId().intValue(),
jahiaContainerListClone.getContainerDefinition().ge=
tName());
} catch (CloneNotSupportedException e) {
log.error("Clone not supported for object JahiaContainerList",=
e);
@@ -228,7 +228,7 @@
} else {
dao.deleteContainerList(dao.loadPublishedContainerList(new Int=
eger(containerId)));
}
- flushCache(containerId, container!=3Dnull?container.getContainerDe=
finition().getJahiaSite().getId().intValue():0,
+ flushCache(containerId, container!=3Dnull?container.getContainerDe=
finition().getJahiaSiteId().intValue():0,
container!=3Dnull?container.getContainerDefinition().ge=
tName():null);
// remove all links for page if no pages exist at all with this id
if(dao.getNBContainerList(containerId)=3D=3D0){
@@ -552,7 +552,7 @@
=
dao.save(jahiaContainerList);
containerList.setID(jahiaContainerList.getComp_id().getId().intVal=
ue());
- flushCache(containerList.getID(), jahiaContainerList.getContainerD=
efinition().getJahiaSite().getId().intValue(),
+ flushCache(containerList.getID(), jahiaContainerList.getContainerD=
efinition().getJahiaSiteId().intValue(),
jahiaContainerList.getContainerDefinition().getName());
}
=
@@ -620,7 +620,7 @@
=
dao.deleteContainerList(containerList);
=
- flushCache(containerListId, containerList.getContainerDefiniti=
on().getJahiaSite().getId().intValue(),
+ flushCache(containerListId, containerList.getContainerDefiniti=
on().getJahiaSiteId().intValue(),
containerList.getContainerDefinition().getName());
}
}
@@ -729,7 +729,7 @@
fieldsData.setComp_id(pk);
dao.save(fieldsData);
flushCache(contentContainerList.getID(),
- data.getContainerDefinition().getJahiaSite().ge=
tId().intValue(),
+ data.getContainerDefinition().getJahiaSiteId().=
intValue(),
data.getContainerDefinition().getName());
}
} catch (ObjectRetrievalFailureException e) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaCtnDef.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaCtnDef.java&rev=3D1841=
2&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaCtnDef.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaCtnDef.java Mon Sep 10 17:51:12 2007
@@ -42,7 +42,7 @@
/**
* nullable persistent field
*/
- private org.jahia.hibernate.model.JahiaSite jahiaSite;
+ private Integer jahiaSite;
=
/**
* persistent field
@@ -80,15 +80,13 @@
}
=
/**
- * @hibernate.many-to-one update=3D"true"
- * insert=3D"true"
- * @hibernate.column name=3D"jahiaid_jahia_ctn_def"
+ * @hibernate.property column name=3D"jahiaid_jahia_ctn_def"
*/
- public org.jahia.hibernate.model.JahiaSite getJahiaSite() {
+ public Integer getJahiaSiteId() {
return this.jahiaSite;
}
=
- public void setJahiaSite(org.jahia.hibernate.model.JahiaSite jahiaSite=
) {
+ public void setJahiaSiteId(Integer jahiaSite) {
this.jahiaSite =3D jahiaSite;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
