Author: tdraier
Date: Mon Jul 16 17:50:12 2007
New Revision: 18015
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18015&repname=
=3Djahia
Log:
-optimized container list creation by getting siteId as parameter
-removed unused relationship to JahiaSite from JahiaPagesData, JahiaFieldsD=
ata and JahiaObject
-clenup some comments
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDAO.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerListDAO.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerStructureDAO.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aFieldsDataDAO.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aObjectDAO.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aPagesDAO.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/manager/=
JahiaContainerManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaObjectManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaPagesManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaContainer.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaObject.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesData.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/JahiaContainersBaseService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/test/src/java/org/jahia/hibernate=
/dao/JahiaContainerDAOTest.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaContainerDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java&rev=3D=
18015&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=
aContainerDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerDAO.java Mon Jul 16 17:50:12 2007
@@ -295,7 +295,7 @@
=
public List getAllContainerAclIdsFromSite(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct c.jahiaAclId from JahiaContainer c=
where c.site.id=3D? order by c.jahiaAclId";
+ String hql =3D "select distinct c.jahiaAclId from JahiaContainer c=
where c.siteId=3D? order by c.jahiaAclId";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -351,7 +351,7 @@
=
public List getAllContainerIdsFromSite(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct c.comp_id.id from JahiaContainer c=
where c.site.id=3D? order by c.comp_id.id";
+ String hql =3D "select distinct c.comp_id.id from JahiaContainer c=
where c.siteId=3D? order by c.comp_id.id";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -370,10 +370,10 @@
public Object doInHibernate(Session session) throws
HibernateExceptio=
n {
Criteria crit =3D session.createCriteria(JahiaContainer.cl=
ass);
- crit.createAlias("site", "site");
+ crit.createAlias("siteId", "siteId");
crit.createAlias("ctndef", "ctndef");
if (siteId !=3D null && siteId.intValue() !=3D -1) {
- crit.add(Expression.eq("site.id", siteId));
+ crit.add(Expression.eq("siteId", siteId));
}
if (ctnDefName !=3D null && !"".equals(ctnDefName.trim()))=
{
crit.add(Expression.eq("ctndef.name", ctnDefName));
@@ -608,7 +608,6 @@
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("from JahiaContainer c ");
queryString.append(" left join fetch c.ctndef ctndef ");
- queryString.append(" left join fetch c.site site ");
queryString.append(" where c.comp_id.id in (");
Iterator it =3D ids.iterator();
Integer id =3D null;
@@ -631,7 +630,6 @@
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("select c from JahiaContainer c ");
queryString.append(" left join fetch c.ctndef ctndef ");
- queryString.append(" left join fetch c.site site ");
queryString.append(" where c.comp_id.id >=3D ? and c.comp_id.id <=
=3D? and c.comp_id.workflowState=3D1");
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -655,7 +653,6 @@
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("from JahiaContainer c ");
queryString.append(" left join fetch c.ctndef ctndef ");
- queryString.append(" left join fetch c.site site ");
queryString.append(" where ");
Iterator it =3D ids.iterator();
Integer id =3D null;
@@ -687,7 +684,6 @@
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("select c from JahiaContainer c ");
queryString.append(" left join fetch c.ctndef ctndef ");
- queryString.append(" left join fetch c.site site ");
queryString.append(" where c.comp_id.id >=3D ? and c.comp_id.id <=
=3D? and c.comp_id.workflowState>=3D1 ORDER BY c.comp_id.workflowState DESC=
");
=
final HibernateTemplate template =3D getHibernateTemplate();
@@ -729,7 +725,6 @@
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("select c from JahiaContainer c ");
queryString.append(" left join fetch c.ctndef ctndef ");
- queryString.append(" left join fetch c.site site ");
queryString.append(" where ");
Iterator it =3D ids.iterator();
Integer id =3D null;
@@ -980,7 +975,7 @@
}
=
public Map deleteAllContainersFromSite(Integer siteID) {
- String queryString =3D "from JahiaContainer c where c.site.id=3D? =
";
+ String queryString =3D "from JahiaContainer c where c.siteId=3D? ";
final HibernateTemplate template =3D getHibernateTemplate();
template.setFlushMode(HibernateTemplate.FLUSH_AUTO);
List list =3D template.find(queryString,siteID);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaContainerListDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java&re=
v=3D18015&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=
aContainerListDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerListDAO.java Mon Jul 16 17:50:12 2007
@@ -57,7 +57,7 @@
hibernateTemplate.save(jahiaContainer);
}
} catch (CloneNotSupportedException e) {
- log.error("Could not clone JahiaContainer");
+ log.error("Could not clone JahiaContainerList");
}
}
=
@@ -72,7 +72,7 @@
hibernateTemplate.save(jahiaContainer);
return jahiaContainer;
} catch (CloneNotSupportedException e) {
- log.error("Could not clone JahiaContainer");
+ log.error("Could not clone JahiaContainerList");
return null;
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaContainerStructureDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaContainerStructureDAO.ja=
va&rev=3D18015&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=
aContainerStructureDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aContainerStructureDAO.java Mon Jul 16 17:50:12 2007
@@ -40,7 +40,7 @@
if(containerDefinitionId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
- retVal =3D template.find(hql.toString(), new Object[]{containe=
rDefinitionId});
+ retVal =3D template.find(hql, new Object[]{containerDefinition=
Id});
}
return retVal;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaFieldsDataDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java&rev=
=3D18015&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=
aFieldsDataDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aFieldsDataDAO.java Mon Jul 16 17:50:12 2007
@@ -62,7 +62,7 @@
hibernateTemplate.save(jahiaContainer);
}
} catch (CloneNotSupportedException e) {
- log.error("Could not clone JahiaContainer");
+ log.error("Could not clone JahiaFieldsData");
}
}
=
@@ -92,7 +92,7 @@
hibernateTemplate.save(jahiaContainer);
return jahiaContainer;
} catch (CloneNotSupportedException e) {
- log.error("Could not clone JahiaContainer");
+ log.error("Could not clone JahiaFieldsData");
return null;
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaObjectDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaObjectDAO.java&rev=3D180=
15&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=
aObjectDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aObjectDAO.java Mon Jul 16 17:50:12 2007
@@ -23,7 +23,6 @@
import org.jahia.hibernate.model.JahiaObject;
import org.jahia.hibernate.model.JahiaObjectPK;
import org.jahia.hibernate.model.JahiaSite;
-import org.jahia.hibernate.model.JahiaRetentionRule;
import org.springframework.orm.hibernate3.HibernateTemplate;
=
import java.util.*;
@@ -78,7 +77,6 @@
StringBuffer buffer =3D new StringBuffer(1024);
buffer.append("select jobj from JahiaObject jobj");
buffer.append(" left join fetch jobj.retentionRule retRule ");
- buffer.append(" left join fetch jobj.site site ");
buffer.append(" where jobj.comp_id.id>=3D? AND jobj.comp_id.id<=3D=
? AND jobj.comp_id.type=3D?");
List jahiaObjs =3D template.find(buffer.toString(),
new Object[]{new Integer(key.getId().intVa=
lue()-batchSize),
@@ -246,15 +244,15 @@
* Create a new entry in database
* @param type
* @param id
- * @param site
+ * @param siteId
*/
- public void create(String type, Integer id, JahiaSite site) {
+ public void create(String type, Integer id, Integer siteId) {
JahiaObject jahiaObject =3D new JahiaObject();
jahiaObject.setComp_id(new JahiaObjectPK(type,id));
- jahiaObject.setSite(site);
+ jahiaObject.setSiteId(siteId);
HibernateTemplate template =3D getHibernateTemplate();
template.setFlushMode(HibernateTemplate.FLUSH_AUTO);
- template.merge(jahiaObject);
+ template.save(jahiaObject);
template.flush();
}
=
@@ -274,7 +272,7 @@
}
=
public void deleteAllFromSite(Integer siteID) {
- String queryString =3D "from JahiaObject c where c.site.id=3D? ";
+ String queryString =3D "from JahiaObject c where c.siteId=3D? ";
final HibernateTemplate template =3D getHibernateTemplate();
template.setFlushMode(HibernateTemplate.FLUSH_AUTO);
template.deleteAll(template.find(queryString,siteID));
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/da=
o/JahiaPagesDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java&rev=3D1801=
5&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=
aPagesDAO.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/dao/Jahi=
aPagesDAO.java Mon Jul 16 17:50:12 2007
@@ -204,7 +204,7 @@
=
public List getAllAclId(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct pd.jahiaAclId from JahiaPagesData =
pd where pd.site.id =3D ? ";
+ String hql =3D "select distinct pd.jahiaAclId from JahiaPagesData =
pd where pd.siteId =3D ? ";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -275,7 +275,7 @@
=
public Integer getNbPages(Integer siteId) {
Integer retVal =3D null;
- String hql =3D "select count( pd.comp_id.id ) from JahiaPagesData =
pd where pd.site.id =3D ? ";
+ String hql =3D "select count( pd.comp_id.id ) from JahiaPagesData =
pd where pd.siteId =3D ? ";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -292,7 +292,7 @@
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
return template.find("select distinct pd.comp_id.id from JahiaPage=
sData pd " +
- "where pd.site.id=3D? and pd.pageType=3D?",
+ "where pd.siteId=3D? and pd.pageType=3D?",
new Object[]{siteId, linkType});
}
=
@@ -309,7 +309,7 @@
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
- return template.find("select distinct pd.comp_id.id from JahiaPage=
sData pd where pd.site.id=3D?",
+ return template.find("select distinct pd.comp_id.id from JahiaPage=
sData pd where pd.siteId=3D?",
new Object[]{siteId});
}
=
@@ -317,7 +317,7 @@
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
- return template.find("select distinct pd.comp_id.id from JahiaPage=
sData pd where pd.site.id=3D? order by pd.comp_id.id",
+ return template.find("select distinct pd.comp_id.id from JahiaPage=
sData pd where pd.siteId=3D? order by pd.comp_id.id",
new Object[]{siteId});
}
=
@@ -349,7 +349,7 @@
=
public Integer getRealActiveNbPages(Integer siteId) {
Integer retVal =3D null;
- String hql =3D "select count( pd.comp_id.id ) from JahiaPagesData =
pd where pd.site.id =3D ? " +
+ String hql =3D "select count( pd.comp_id.id ) from JahiaPagesData =
pd where pd.siteId =3D ? " +
"and pd.type=3D0 and pd.comp_id.workflowState =3D " +=
EntryLoadRequest.ACTIVE_WORKFLOW_STATE;
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
@@ -522,7 +522,7 @@
public Map deleteAllPagesFromSite(Integer siteID) {
HibernateTemplate template =3D getHibernateTemplate();
template.setFlushMode(HibernateTemplate.FLUSH_AUTO);
- List entities =3D template.find("from JahiaPagesData pd where pd.s=
ite.id=3D?", siteID);
+ List entities =3D template.find("from JahiaPagesData pd where pd.s=
iteId=3D?", siteID);
Map map =3D new HashMap(entities.size());
for (int i =3D 0; i < entities.size(); i++) {
JahiaPagesData jahiaPagesData =3D (JahiaPagesData) entities.ge=
t(i);
@@ -539,7 +539,7 @@
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
return template.find("select distinct p.comp_id.pageId,p.comp_id.n=
ame,p.comp_id.languageCode, p.value " +
"from JahiaPagesProp p, JahiaPagesData data "=
+
- "where p.value=3D? and p.comp_id.pageId=3Ddat=
a.comp_id.id and data.site.id=3D?",new Object[]{propertyValue,siteID});
+ "where p.value=3D? and p.comp_id.pageId=3Ddat=
a.comp_id.id and data.siteId=3D?",new Object[]{propertyValue,siteID});
}
=
/**
@@ -563,7 +563,7 @@
+ "from
JahiaPagesProp p, JahiaPagesData data "
+
"where p.comp_id.name=3D'"
+
PageProperty.PAGE_URL_KEY_PROPNAME
- + "'
and p.value=3D? and p.comp_id.pageId=3Ddata.comp_id.id and d=
ata.site.id=3D?",
+ + "'
and p.value=3D? and p.comp_id.pageId=3Ddata.comp_id.id and d=
ata.siteId=3D?",
new Object[] {
pageURLKey, siteID });
else
items =3D template.find("select p.comp_id.pageId "
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=3D18015&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 Jul 16 17:50:12 2007
@@ -119,7 +119,7 @@
}
=
public void createContainerList(org.jahia.data.containers.JahiaContain=
erList containerList,
- JahiaSaveVersion saveVersion) {
+ JahiaSaveVersion saveVersion, int site=
Id) {
JahiaContainerList jahiaContainerList =3D new JahiaContainerList();
jahiaContainerList.setContainerDefinition(definitionDAO.findDefini=
tionById(new Integer(containerList.getctndefid())));
jahiaContainerList.setPageid(new Integer(containerList.getPageID()=
));
@@ -144,15 +144,27 @@
containerList.setID(jahiaContainerList.getComp_id().getId().intVal=
ue());
=
if (isNew) {
- List pageInfos =3D jahiaPagesDAO.getActivePageInfo(new Integer=
(containerList.getPageID()));
- if (!pageInfos.isEmpty()) {
- JahiaPagesData pageData =3D (JahiaPagesData) pageInfos.get=
(0);
- jahiaObjectDAO.create(ContentContainerListKey.CONTAINERLIS=
T_TYPE,
- new Integer(containerList.getID()), =
pageData.getSite());
+ jahiaObjectDAO.create(ContentContainerListKey.CONTAINERLIST_TY=
PE,
+ new Integer(containerList.getID()), new Integer(siteId=
));
+
+ if (listCache =3D=3D null) {
+ try {
+ listCache =3D cacheService.createCacheInstance(JAHIA_C=
ONTAINER_LIST_CACHE);
+ } catch (JahiaInitializationException e) {
+ e.printStackTrace();
+ }
+ }
+
+ if (listCache !=3D null) {
+ List activeAndStagedEntry =3D new ArrayList(1);
+ activeAndStagedEntry.add(new ContentObjectEntryState(jahia=
ContainerList.getComp_id().getWorkflowState().intValue(),
+ jahiaContainerList.getComp_id().getVersionId().int=
Value(), ContentObject.SHARED_LANGUAGE));
+ ContentContainerList contentContainerList =3D convertToCon=
tentContainerList(jahiaContainerList, activeAndStagedEntry);
+ listCache.put(CONTENT_CONTAINER_LIST_CACHE_PREFIX + contai=
nerList.getID(), contentContainerList);
}
}
- containerList.setID(jahiaContainerList.getComp_id().getId().intVal=
ue());
- flushCache(containerList.getID(), jahiaContainerList.getContainerD=
efinition().getJahiaSite().getId().intValue(),
+
+ flushCache(containerList.getID(), siteId,
jahiaContainerList.getContainerDefinition().getName());
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaContainerManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.jav=
a&rev=3D18015&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/=
JahiaContainerManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerManager.java Mon Jul 16 17:50:12 2007
@@ -29,7 +29,6 @@
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.hibernate.dao.*;
import org.jahia.hibernate.model.JahiaCtnEntryPK;
-import org.jahia.hibernate.model.JahiaSite;
import org.jahia.services.cache.Cache;
import org.jahia.services.cache.CacheService;
import org.jahia.services.cache.GroupCacheKey;
@@ -112,7 +111,7 @@
container.getComp_id().setWorkflowState(new Integer(to.getWork=
flowState()));
container.getComp_id().setVersionId(new Long(to.getVersionID()=
));
dao.save(container);
- flushCache(containerId, container.getSite().getId().intValue()=
, container.getListid().intValue(), container.getPageid().intValue());
+ flushCache(containerId, container.getSiteId().intValue(), cont=
ainer.getListid().intValue(), container.getPageid().intValue());
} catch (ObjectRetrievalFailureException e) {
log.warn("Try to delete an unexisting entry " + containerId + =
" " + from.toString());
} catch (CloneNotSupportedException e) {
@@ -210,7 +209,7 @@
org.jahia.hibernate.model.JahiaContainer containerById =3D dao=
.findContainerById(new Integer(containerId), new Long(request.getVersionID(=
)),
=
new Integer(request.getWorkflowState()));
dao.deleteContainer(containerById);
- flushCache(containerId, containerById.getSite().getId().intVal=
ue(), containerById.getListid().intValue(), containerById.getPageid().intVa=
lue());
+ flushCache(containerId, containerById.getSiteId().intValue(), =
containerById.getListid().intValue(), containerById.getPageid().intValue());
} catch (ObjectRetrievalFailureException e) {
log.warn("Try to delete an unexisting entry " + containerId + =
" " + request.toString());
}
@@ -820,16 +819,15 @@
public void purgeContainer(int id) {
org.jahia.hibernate.model.JahiaContainer container =3D dao.loadCon=
tainer(new Integer(id));
dao.deleteAllEntriesForContainerId(new Integer(id));
- flushCache(id, container.getSite().getId().intValue(), container.g=
etListid().intValue(), container.getPageid().intValue());
+ flushCache(id, container.getSiteId().intValue(), container.getList=
id().intValue(), container.getPageid().intValue());
}
=
public JahiaContainer saveContainer(JahiaContainer jahiaContainer, Jah=
iaSaveVersion saveVersion) {
- JahiaSite site =3D siteDAO.findById(new Integer(jahiaContainer.get=
JahiaID()));
org.jahia.hibernate.model.JahiaContainer container =3D new org.jah=
ia.hibernate.model.JahiaContainer();
container.setJahiaAclId(new Integer(jahiaContainer.getAclID()));
container.setCtndef(definitionDAO.findDefinitionById(new Integer(j=
ahiaContainer.getctndefid())));
container.setListid(new Integer(jahiaContainer.getListID()));
- container.setSite(site);
+ container.setSiteId(new Integer(jahiaContainer.getSiteID()));
container.setPageid(new Integer(jahiaContainer.getPageID()));
if (jahiaContainer.getRank() =3D=3D 0) {
container.setRank(new Integer(dao.getMaxRankingValue()+1));
@@ -850,7 +848,7 @@
dao.save(container);
jahiaContainer.setID(container.getComp_id().getId().intValue());
if (isNew) {
- jahiaObjectDAO.create(ContentContainerKey.CONTAINER_TYPE, new =
Integer(jahiaContainer.getID()), site);
+ jahiaObjectDAO.create(ContentContainerKey.CONTAINER_TYPE, new =
Integer(jahiaContainer.getID()), new Integer(jahiaContainer.getSiteID()));
}
flushCache(jahiaContainer.getID(), jahiaContainer.getSiteID(), jah=
iaContainer.getListID(), jahiaContainer.getPageID());
return jahiaContainer;
@@ -876,7 +874,7 @@
container.setJahiaAclId(new Integer(jahiaContainer.getAclID()));
container.setCtndef(definitionDAO.findDefinitionById(new Integer(j=
ahiaContainer.getctndefid())));
container.setListid(new Integer(jahiaContainer.getListID()));
- container.setSite(siteDAO.findById(new Integer(jahiaContainer.getJ=
ahiaID())));
+ container.setSiteId(new Integer(jahiaContainer.getJahiaID()));
container.setPageid(new Integer(jahiaContainer.getPageID()));
container.setRank(new Integer(jahiaContainer.getRank()));
container.setProperties(jahiaContainer.getProperties());
@@ -922,7 +920,7 @@
}
dao.deleteContainers(dao.loadStagedContainers(new Integer(=
containerId)));
}
- flushCache(containerId, container.getSite().getId().intValue()=
, container.getListid().intValue(), container.getPageid().intValue());
+ flushCache(containerId, container.getSiteId().intValue(), cont=
ainer.getListid().intValue(), container.getPageid().intValue());
}
}
=
@@ -942,14 +940,14 @@
} catch (CloneNotSupportedException e) {
log.error("Could not clone org.jahia.hibernate.model.Jahia=
Container");
}
- flushCache(containerId, container.getSite().getId().intValue()=
, container.getListid().intValue(), container.getPageid().intValue());
+ flushCache(containerId, container.getSiteId().intValue(), cont=
ainer.getListid().intValue(), container.getPageid().intValue());
}
}
=
private ContentContainer convertToContentContainer(org.jahia.hibernate=
.model.JahiaContainer jahiaContainer,
List activeAndStage=
dEntry) {
ContentContainer resultContainer;
- resultContainer =3D new ContentContainer(jahiaContainer.getComp_id=
().getId().intValue(), jahiaContainer.getSite().getId().intValue(), jahiaCo=
ntainer.getPageid().intValue(),
+ resultContainer =3D new ContentContainer(jahiaContainer.getComp_id=
().getId().intValue(), jahiaContainer.getSiteId().intValue(), jahiaContaine=
r.getPageid().intValue(),
jahiaContainer.getCtndef().=
getId().intValue(), jahiaContainer.getListid().intValue(), jahiaContainer.g=
etJahiaAclId().intValue(),
activeAndStagedEntry);
resultContainer.setProperties(jahiaContainer.getProperties());
@@ -960,7 +958,7 @@
JahiaContainer jahiaContainer =3D null;
if (container !=3D null) {
jahiaContainer =3D new JahiaContainer(container.getComp_id().g=
etId().intValue(),
- container.getSite().getId(=
).intValue(),
+ container.getSiteId().intV=
alue(),
container.getPageid().intV=
alue(),
container.getListid().intV=
alue(),
container.getRank().intVal=
ue(),
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaObjectManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaObjectManager.java&r=
ev=3D18015&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/=
JahiaObjectManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaObjectManager.java Mon Jul 16 17:50:12 2007
@@ -381,7 +381,7 @@
//timeBPStateChanged =3D ( timeBPStateChanged || hibJahiaObjec=
t.getValidToDate().longValue() !=3D delegate.getValidToDate().longValue() );
hibJahiaObject.setValidToDate(delegate.getValidToDate());
if ( delegate.getSiteId().intValue()>0 ){
- hibJahiaObject.setSite(siteDao.findById(delegate.getSiteId=
()));
+ hibJahiaObject.setSiteId(delegate.getSiteId());
} else {
//hibJahiaObject.setSite(null);
}
@@ -407,9 +407,9 @@
contentObject.notifyStateChanged();
ProcessingContext context =3D Jahia.getThreadParamBean();
if ( context =3D=3D null ){
- if ( hibJahiaObject.getSite() !=3D null ){
+ if ( hibJahiaObject.getSiteId() !=3D null ){
JahiaSite site =3D ServicesRegistry.getInstance().=
getJahiaSitesService()
- .getSite(hibJahiaObject.getSite().getId().=
intValue());
+ .getSite(hibJahiaObject.getSiteId().intVal=
ue());
if ( site !=3D null ){
JahiaUser user =3D getAdminUser(site.getID());
context =3D
@@ -483,8 +483,8 @@
return delegate;
}
delegate.setTimeBPState(hibJahiaObject.getTimeBPState());
- if ( hibJahiaObject.getSite() !=3D null ){
- delegate.setSiteId(hibJahiaObject.getSite().getId());
+ if ( hibJahiaObject.getSiteId() !=3D null ){
+ delegate.setSiteId(hibJahiaObject.getSiteId());
}
if (hibJahiaObject.getValidFromDate()!=3D null){
delegate.setValidFromDate(hibJahiaObject.getValidFromDate());
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaPagesManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java&re=
v=3D18015&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/=
JahiaPagesManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaPagesManager.java Mon Jul 16 17:50:12 2007
@@ -141,7 +141,7 @@
} catch (CloneNotSupportedException e) {
log.error("This object is not cloneable", e);
}
- flushCache(id,data.getSite().getId().intValue());
+ flushCache(id,data.getSiteId().intValue());
}
} catch (ObjectRetrievalFailureException e) {
log.error("JahiaPagesData not found or we are trying to update=
!!!!" + pk);
@@ -165,7 +165,6 @@
if (isNew) {
data.getComp_id().setId(null);
}
- JahiaSite site =3D siteDAO.findById(new Integer(newStagingInfo.get=
JahiaID()));
=
data.setJahiaAclId(new Integer(newStagingInfo.getAclID()));
data.setPageDefinition(definitionDAO.findByPK(new Integer(newStagi=
ngInfo.getPageTemplateID())));
@@ -173,13 +172,13 @@
data.setPageType(new Integer(newStagingInfo.getPageType()));
data.setParentID(new Integer(newStagingInfo.getParentID()));
data.setRemoteURL(newStagingInfo.getRemoteURL());
- data.setSite(site);
+ data.setSiteId(new Integer(newStagingInfo.getJahiaID()));
data.setTitle(newStagingInfo.getTitle());
dao.save(data);
newStagingInfo.setID(data.getComp_id().getId().intValue());
=
if (isNew) {
- jahiaObjectDAO.create(ContentPageKey.PAGE_TYPE, new Integer(ne=
wStagingInfo.getID()), site);
+ jahiaObjectDAO.create(ContentPageKey.PAGE_TYPE, new Integer(ne=
wStagingInfo.getID()), new Integer(newStagingInfo.getJahiaID()));
}
flushCache(newStagingInfo.getID(),newStagingInfo.getJahiaID());
}
@@ -443,7 +442,7 @@
}
data.setParentID(new Integer(newStagingInfo.getParentID()));
data.setRemoteURL(newStagingInfo.getRemoteURL());
- data.setSite(siteDAO.findById(new Integer(jahiaID)));
+ data.setSiteId(new Integer(jahiaID));
data.setTitle(newStagingInfo.getTitle());
if (pk.equals(oldPk)) {
dao.update(data);
@@ -476,7 +475,7 @@
JahiaPageInfo pageInfo =3D null;
if (data !=3D null) {
pageInfo =3D new JahiaPageInfo(data.getComp_id().getId().intVa=
lue(),
- data.getSite().getId().intValue()=
, data.getParentID().intValue(),
+ data.getSiteId().intValue(), data=
.getParentID().intValue(),
data.getPageType().intValue(), da=
ta.getTitle(),
data.getPageDefinition().getId().=
intValue(),
data.getRemoteURL(), data.getPage=
LinkId().intValue(),
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaContainer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaContainer.java&rev=3D1=
8015&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=
hiaContainer.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaContainer.java Mon Jul 16 17:50:12 2007
@@ -56,7 +56,7 @@
/**
* nullable persistent field
*/
- private JahiaSite site;
+ private Integer siteId;
private transient Map properties;
=
/**
@@ -177,15 +177,15 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"jahiaid_jahia_ctn_entries"
+ * @hibernate.property column=3D"jahiaid_jahia_ctn_entries"
+ * length=3D"11"
*/
- public JahiaSite getSite() {
- return this.site;
+ public Integer getSiteId() {
+ return this.siteId;
}
=
- public void setSite(JahiaSite site) {
- this.site =3D site;
+ public void setSiteId(Integer siteId) {
+ this.siteId =3D siteId;
}
=
// ------------------------ CANONICAL METHODS ------------------------
@@ -257,7 +257,7 @@
container.setListid(this.getListid());
container.setPageid(this.getPageid());
container.setRank(this.getRank());
- container.setSite(this.getSite());
+ container.setSiteId(this.getSiteId());
return container;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaObject.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaObject.java&rev=3D1801=
5&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=
hiaObject.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaObject.java Mon Jul 16 17:50:12 2007
@@ -37,7 +37,7 @@
=
private JahiaObjectPK comp_id;
=
- private JahiaSite site;
+ private Integer siteId;
=
private Integer timeBPState =3D new Integer(IS_VALID_STATE);
=
@@ -62,15 +62,15 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"false"
- * @hibernate.column name=3D"jahiaid_jahia_obj"
+ * @hibernate.property column=3D"jahiaid_jahia_obj"
+ * length=3D"11"
*/
- public JahiaSite getSite() {
- return site;
+ public Integer getSiteId() {
+ return siteId;
}
=
- public void setSite(JahiaSite site) {
- this.site =3D site;
+ public void setSiteId(Integer siteId) {
+ this.siteId =3D siteId;
}
=
/**
@@ -208,7 +208,7 @@
public Object clone() throws CloneNotSupportedException {
JahiaObject jahiaObject =3D new JahiaObject();
jahiaObject.setComp_id((JahiaObjectPK) this.getComp_id().clone());
- jahiaObject.setSite(this.getSite());
+ jahiaObject.setSiteId(this.getSiteId());
jahiaObject.setTimeBPState(this.getTimeBPState());
jahiaObject.setValidFromDate(this.getValidFromDate());
jahiaObject.setValidToDate(this.getValidToDate());
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaPagesData.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java&rev=3D1=
8015&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=
hiaPagesData.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesData.java Mon Jul 16 17:50:12 2007
@@ -52,7 +52,7 @@
/**
* nullable persistent field
*/
- private JahiaSite site;
+ private Integer siteId;
=
private transient Map properties;
=
@@ -178,15 +178,15 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"jahiaid_jahia_pages_data"
+ * @hibernate.property column=3D"jahiaid_jahia_pages_data"
+ * length=3D"11"
*/
- public JahiaSite getSite() {
- return this.site;
+ public Integer getSiteId() {
+ return this.siteId;
}
=
- public void setSite(JahiaSite site) {
- this.site =3D site;
+ public void setSiteId(Integer siteId) {
+ this.siteId =3D siteId;
}
=
/**
@@ -296,7 +296,7 @@
data.setParentID(this.getParentID());
data.setProperties(this.getProperties());
data.setRemoteURL(this.getRemoteURL());
- data.setSite(this.getSite());
+ data.setSiteId(this.getSiteId());
data.setTitle(this.getTitle());
return data; //To change body of overridden methods use File | =
Settings | File Templates.
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/JahiaContainersBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/JahiaContainersBaseServ=
ice.java&rev=3D18015&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/services/container=
s/JahiaContainersBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/JahiaContainersBaseService.java Mon Jul 16 17:50:12 2007
@@ -234,7 +234,7 @@
getJahiaVersionService().
getSiteSaveVersion(thePage.getJahiaID());
// save containerList in database
- containerListManager.createContainerList(clonedList, saveVersion);
+ containerListManager.createContainerList(clonedList, saveVersion, =
thePage.getSiteID());
// gets a new field id
int theListID =3D clonedList.getID();
if (theListID =3D=3D 0) {
@@ -1787,9 +1787,9 @@
getSiteSaveVersion(thePage.getJahiaID());
=
if (theContainerList.getID() =3D=3D 0) {
- containerListManager.createContainerList(theContainerList, sav=
eVersion);
+ containerListManager.createContainerList(theContainerList, sav=
eVersion, thePage.getSiteID());
this.containerDefinitionManager.invalidateContainerDefinitionI=
nTemplate(thePage.getPageTemplate(jParams).getID());
- if (theContainerList.getID() > 0) {
+ if (theContainerList.getID() > 0) { theC=
ontainerList.getContentContainerList();
ContentContainerList cList =3D ContentContainerList.getCon=
tainerList(theContainerList.getID());
JahiaEvent objectCreatedEvent =3D new JahiaEvent(this, jPa=
rams,
cList);
@@ -2383,7 +2383,7 @@
=
ServicesRegistry.getInstance().getJahiaSearchService().indexContai=
nerList(listID, user);
=
- WorkflowEvent theEvent =3D new WorkflowEvent(this, theList.getCont=
entContainerList(), user, languageCode, true);
+ WorkflowEvent theEvent =3D new WorkflowEvent(this, contentContaine=
rList, user, languageCode, true);
ServicesRegistry.getInstance().getJahiaEventService().fireObjectCh=
anged(theEvent);
=
return allDeleted;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/test/src/java/org/jahia/hib=
ernate/dao/JahiaContainerDAOTest.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/test/src/java/org/jahia/hibernate/dao/JahiaContainerDAOTes=
t.java&rev=3D18015&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/test/src/java/org/jahia/hibernate=
/dao/JahiaContainerDAOTest.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/test/src/java/org/jahia/hibernate=
/dao/JahiaContainerDAOTest.java Mon Jul 16 17:50:12 2007
@@ -29,7 +29,6 @@
import org.jahia.hibernate.model.JahiaCtnEntryPK;
=
import java.util.List;
-import java.util.Collections;
=
public class JahiaContainerDAOTest extends TestCase {
// ------------------------------ FIELDS ------------------------------
@@ -159,7 +158,7 @@
container.setListid(new Integer(14));
container.setPageid(new Integer(5));
container.setRank(new Integer(0));
- container.setSite(siteDAO.findById(new Integer(1)));
+ container.setSiteId(new Integer(1));
dao.save(container);
final int id =3D container.getComp_id().getId().intValue();
assertTrue(id>0);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
