Author: tdraier
Date: Fri Jul 6 12:21:12 2007
New Revision: 17896
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17896&repname=
=3Djahia
Log:
acl optimization and remapping (backport 17782 17783 17784)
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManag=
er.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.j=
ava
trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaAcl.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaContainer.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaContainerList.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaContainerDAO.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java Fri =
Jul 6 12:21:12 2007
@@ -277,7 +277,7 @@
=
public Map getAllContainerAclIdsForContainerList(Integer listId) {
Map retVal =3D null;
- String hql =3D "select distinct c.comp_id.id, c.jahiaAcl.id from J=
ahiaContainer c where c.listid=3D?";
+ String hql =3D "select distinct c.comp_id.id, c.jahiaAclId from Ja=
hiaContainer c where c.listid=3D?";
if (listId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -295,7 +295,7 @@
=
public List getAllContainerAclIdsFromSite(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct c.jahiaAcl.id from JahiaContainer =
c where c.site.id=3D? order by c.jahiaAcl.id";
+ String hql =3D "select distinct c.jahiaAclId from JahiaContainer c=
where c.site.id=3D? order by c.jahiaAclId";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -592,7 +592,6 @@
public List loadDeletedContainer(List ids) {
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("from JahiaContainer c ");
- queryString.append(" left join fetch c.jahiaAcl acl ");
queryString.append(" left join fetch c.ctndef ctndef ");
queryString.append(" left join fetch c.site site ");
queryString.append(" where c.comp_id.id in (");
@@ -616,7 +615,6 @@
public List loadPublishedContainer(Integer containerId, int batchSize)=
{
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("select c from JahiaContainer c ");
- queryString.append(" left join fetch c.jahiaAcl acl ");
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");
@@ -641,7 +639,6 @@
public List loadPublishedContainer(List ids) {
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("from JahiaContainer c ");
- queryString.append(" left join fetch c.jahiaAcl acl ");
queryString.append(" left join fetch c.ctndef ctndef ");
queryString.append(" left join fetch c.site site ");
queryString.append(" where ");
@@ -674,7 +671,6 @@
public List loadStagingContainer(Integer containerId, EntryLoadRequest=
request, int batchSize) {
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("select c from JahiaContainer c ");
- queryString.append(" left join fetch c.jahiaAcl acl ");
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=
");
@@ -717,7 +713,6 @@
public List loadStagingContainer(List ids, EntryLoadRequest request) {
StringBuffer queryString =3D new StringBuffer(1024);
queryString.append("select c from JahiaContainer c ");
- queryString.append(" left join fetch c.jahiaAcl acl ");
queryString.append(" left join fetch c.ctndef ctndef ");
queryString.append(" left join fetch c.site site ");
queryString.append(" where ");
@@ -977,7 +972,7 @@
Map map =3D new HashMap(list.size());
for (int i =3D 0; i < list.size(); i++) {
JahiaContainer data =3D (JahiaContainer) list.get(i);
- map.put(new ContentContainerKey(data.getComp_id().getId().intV=
alue()),data.getJahiaAcl().getId());
+ map.put(new ContentContainerKey(data.getComp_id().getId().intV=
alue()),data.getJahiaAclId());
deleteProperties(data.getComp_id().getId());
}
template.deleteAll(list);
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaContainerListDAO.java&rev=3D17896&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java =
(original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java =
Fri Jul 6 12:21:12 2007
@@ -119,7 +119,7 @@
=
public List getAclContainerListIdsInSite(Integer siteID) {
List retval =3D null;
- String hql =3D "select distinct l.rights.id from JahiaContainerLis=
t l " +
+ String hql =3D "select distinct l.jahiaAclId from JahiaContainerLi=
st l " +
"where l.containerDefinition.jahiaSite.id=3D?";
if (siteID !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
@@ -801,7 +801,7 @@
}
template.deleteAll(template.find("from JahiaContainerListPrope=
rty p where p.comp_id.containerListId=3D?",
data.getComp_id().getId()=
));
- map.put(new ContentContainerListKey(data.getComp_id().getId().=
intValue()),data.getRights().getId());
+ map.put(new ContentContainerListKey(data.getComp_id().getId().=
intValue()),data.getJahiaAclId());
}
template.deleteAll(list);
return map;
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaFieldsDataDAO.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java Fri=
Jul 6 12:21:12 2007
@@ -132,7 +132,7 @@
=
public List findAllAclsIdInSite(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct f.jahiaAcl.id from JahiaFieldsData=
f where f.site.id=3D? order by f.jahiaAcl.id";
+ String hql =3D "select distinct f.jahiaAclId from JahiaFieldsData =
f where f.site.id=3D? order by f.jahiaAclId";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -159,9 +159,9 @@
List retVal =3D null;
String hql;
if (!withTypes) {
- hql =3D "select distinct f.comp_id.id,f.rank from JahiaFieldsD=
ata f where f.containerId=3D? order by f.rank";
+ hql =3D "select distinct f.comp_id.id from JahiaFieldsData f w=
here f.containerId=3D?";
} else {
- hql =3D "select distinct f.comp_id.id,f.type,f.rank from Jahia=
FieldsData f where f.containerId=3D? order by f.rank";
+ hql =3D "select distinct f.comp_id.id,f.type from JahiaFieldsD=
ata f where f.containerId=3D?";
}
if (containerID !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
@@ -177,9 +177,17 @@
List retVal =3D new FastArrayList(list.size());
if (!withTypes) {
for (int i =3D 0; i < list.size(); i++) {
- Object[] objects =3D (Object[]) list.get(i);
- if (!retVal.contains(objects[0])) {
- retVal.add(objects[0]);
+ if (list.get(i) instanceof Object[]) {
+ Object[] objects =3D (Object[]) list.get(i);
+ if (!retVal.contains(objects[0])) {
+ retVal.add(objects[0]);
+ }
+ } else {
+ Integer id =3D (Integer) list.get(i);
+ if (!retVal.contains(id)) {
+ retVal.add(id);
+ }
+
}
}
} else {
@@ -389,9 +397,9 @@
List retVal =3D null;
String hql;
if (!withTypes) {
- hql =3D "select distinct f.comp_id.id,f.rank from JahiaFieldsD=
ata f where f.containerId=3D? and f.comp_id.workflowState=3D1 order by f.ra=
nk";
+ hql =3D "select distinct f.comp_id.id from JahiaFieldsData f w=
here f.containerId=3D? and f.comp_id.workflowState=3D1";
} else {
- hql =3D "select distinct f.comp_id.id,f.type,f.rank from Jahia=
FieldsData f where f.containerId=3D? and f.comp_id.workflowState=3D1 order =
by f.rank";
+ hql =3D "select distinct f.comp_id.id,f.type from JahiaFieldsD=
ata f where f.containerId=3D? and f.comp_id.workflowState=3D1";
=
}
if (containerID !=3D null) {
@@ -517,9 +525,9 @@
List retVal =3D null;
String hql;
if (!withTypes) {
- hql =3D "select distinct f.comp_id.id,f.rank from JahiaFieldsD=
ata f where f.containerId=3D? and f.comp_id.workflowState<=3D1 and f.comp_i=
d.versionId>-1 and f.comp_id.versionId<=3D?";
+ hql =3D "select distinct f.comp_id.id from JahiaFieldsData f w=
here f.containerId=3D? and f.comp_id.workflowState<=3D1 and f.comp_id.versi=
onId>-1 and f.comp_id.versionId<=3D?";
} else {
- hql =3D "select distinct f.comp_id.id,f.type,f.rank from Jahia=
FieldsData f where f.containerId=3D? and f.comp_id.workflowState<=3D1 and f=
.comp_id.versionId>-1 and f.comp_id.versionId<=3D?";
+ hql =3D "select distinct f.comp_id.id,f.type from JahiaFieldsD=
ata f where f.containerId=3D? and f.comp_id.workflowState<=3D1 and f.comp_i=
d.versionId>-1 and f.comp_id.versionId<=3D?";
}
if (containerID !=3D null && version !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
@@ -575,7 +583,7 @@
=
public Map getAllFieldsIdsFromContainerForPage(Integer pageId) {
Map retval =3D null;
- String hql =3D "select distinct f.containerId, f.comp_id.id, f.ran=
k from JahiaFieldsData f where f.pageId=3D? order by f.containerId, f.rank,=
f.comp_id.id";
+ String hql =3D "select distinct f.containerId, f.comp_id.id, from =
JahiaFieldsData f where f.pageId=3D? order by f.containerId, f.comp_id.id";
if (pageId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -1023,7 +1031,7 @@
(data.getIsMetadata() !=3D null && data.getIsMetadata(=
).intValue() =3D=3D 1 ) ){
continue;
}
- map.put(new ContentFieldKey(data.getComp_id().getId().intValue=
()),data.getJahiaAcl().getId());
+ map.put(new ContentFieldKey(data.getComp_id().getId().intValue=
()),data.getJahiaAclId());
}
template.deleteAll(list);
return map;
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaPagesDAO.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java (origina=
l)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java Fri Jul =
6 12:21:12 2007
@@ -204,7 +204,7 @@
=
public List getAllAclId(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct pd.jahiaAcl.id from JahiaPagesData=
pd where pd.site.id =3D ? ";
+ String hql =3D "select distinct pd.jahiaAclId from JahiaPagesData =
pd where pd.site.id =3D ? ";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -527,7 +527,7 @@
for (int i =3D 0; i < entities.size(); i++) {
JahiaPagesData jahiaPagesData =3D (JahiaPagesData) entities.ge=
t(i);
deleteProperties(jahiaPagesData.getComp_id().getId(), template=
);
- map.put(new ContentPageKey(jahiaPagesData.getComp_id().getId()=
.intValue()),jahiaPagesData.getJahiaAcl().getId());
+ map.put(new ContentPageKey(jahiaPagesData.getComp_id().getId()=
.intValue()),jahiaPagesData.getJahiaAclId());
}
template.deleteAll(entities);
return map;
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerLis=
tManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaContainerListManager.java&rev=3D17896&repna=
me=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
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManag=
er.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManag=
er.java Fri Jul 6 12:21:12 2007
@@ -128,7 +128,7 @@
jahiaContainerList.setParentId(new Integer(parentEntryID));
}
jahiaContainerList.setProperties(containerList.getProperties());
- jahiaContainerList.setRights(aclDAO.findLazyAclById(new Integer(co=
ntainerList.getAclID())));
+ jahiaContainerList.setJahiaAclId(new Integer(containerList.getAclI=
D()));
JahiaCtnListPK pk =3D new JahiaCtnListPK();
final int workflowState =3D saveVersion.getWorkflowState();
pk.setWorkflowState(new Integer(workflowState));
@@ -480,7 +480,7 @@
containerList =3D new org.jahia.data.containers.JahiaConta=
inerList(jahiaContainerList.getComp_id().getId().intValue(),
=
parentEntryID, jahiaContainerList.getPageid().intValue(),
=
jahiaContainerList.getContainerDefinition().getId().intValue(),
- =
jahiaContainerList.getRights().getId().intValue());
+ =
jahiaContainerList.getJahiaAclId().intValue());
Properties properties =3D new Properties();
Iterator iterator =3D jahiaContainerList.getProperties().e=
ntrySet().iterator();
while (iterator.hasNext()) {
@@ -527,7 +527,7 @@
jahiaContainerList.setParentId(new Integer(parentEntryID));
}
jahiaContainerList.setProperties(containerList.getProperties());
- jahiaContainerList.setRights(aclDAO.findLazyAclById(new Integer(co=
ntainerList.getAclID())));
+ jahiaContainerList.setJahiaAclId(new Integer(containerList.getAclI=
D()));
=
dao.save(jahiaContainerList);
containerList.setID(jahiaContainerList.getComp_id().getId().intVal=
ue());
@@ -612,7 +612,7 @@
parentContainerID,
jahiaContainerList.getPag=
eid().intValue(),
jahiaContainerList.getCon=
tainerDefinition().getId().intValue(),
- jahiaContainerList.getRig=
hts().getId().intValue(),
+ jahiaContainerList.getJah=
iaAclId().intValue(),
activeAndStagedEntry);
containerList.setProperties(jahiaContainerList.getProperties());
return containerList;
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerMan=
ager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaContainerManager.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.j=
ava (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.j=
ava Fri Jul 6 12:21:12 2007
@@ -811,7 +811,7 @@
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.setJahiaAcl(aclDAO.findLazyAclById(new Integer(jahiaCont=
ainer.getAclID())));
+ container.setJahiaAclId(new Integer(jahiaContainer.getAclID()));
container.setCtndef(definitionDAO.findDefinitionById(new Integer(j=
ahiaContainer.getctndefid())));
container.setListid(new Integer(jahiaContainer.getListID()));
container.setSite(site);
@@ -858,7 +858,7 @@
org.jahia.hibernate.model.JahiaContainer container;
container =3D new org.jahia.hibernate.model.JahiaContainer();
container.setComp_id(pk);
- container.setJahiaAcl(aclDAO.findLazyAclById(new Integer(jahiaCont=
ainer.getAclID())));
+ 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())));
@@ -935,7 +935,7 @@
List activeAndStage=
dEntry) {
ContentContainer resultContainer;
resultContainer =3D new ContentContainer(jahiaContainer.getComp_id=
().getId().intValue(), jahiaContainer.getSite().getId().intValue(), jahiaCo=
ntainer.getPageid().intValue(),
- jahiaContainer.getCtndef().=
getId().intValue(), jahiaContainer.getListid().intValue(), jahiaContainer.g=
etJahiaAcl().getId().intValue(),
+ jahiaContainer.getCtndef().=
getId().intValue(), jahiaContainer.getListid().intValue(), jahiaContainer.g=
etJahiaAclId().intValue(),
activeAndStagedEntry);
resultContainer.setProperties(jahiaContainer.getProperties());
return resultContainer;
@@ -949,7 +949,7 @@
container.getPageid().intV=
alue(),
container.getListid().intV=
alue(),
container.getRank().intVal=
ue(),
- container.getJahiaAcl().ge=
tId().intValue(),
+ container.getJahiaAclId().=
intValue(),
container.getCtndef().getI=
d().intValue(),
container.getComp_id().get=
VersionId().intValue(),
container.getComp_id().get=
WorkflowState().intValue());
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataMa=
nager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaFieldsDataManager.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java Fri Jul 6 12:21:12 2007
@@ -232,10 +232,9 @@
data.setMetadataOwner(jahiaObject);
}
}
- data.setJahiaAcl(aclDAO.findLazyAclById(new Integer(theField.getAc=
lID())));
+ data.setJahiaAclId(new Integer(theField.getAclID()));
data.setPageId(new Integer(theField.getPageID()));
data.setProperties(theField.getProperties());
- data.setRank(new Integer(theField.getRank()));
data.setSite(siteDAO.findById(new Integer(theField.getJahiaID())));
data.setType(new Integer(theField.getType()));
String value =3D theField.getValue();
@@ -279,7 +278,7 @@
data.getFieldDefinition().getId().intValue(),
data.getType().intValue(),
data.getConnectType().intValue(),
- data.getJahiaAcl().getId().intValue(),
+ data.getJahiaAclId().intValue(),
activeEntryStates, activeValues);
if ( data.getMetadataOwner() !=3D null ){
try {
@@ -323,9 +322,8 @@
fieldsData.setMetadataOwner(jahiaObject);
}
}
- fieldsData.setJahiaAcl(aclDAO.findLazyAclById(new Integer(contentF=
ield.getAclID())));
+ fieldsData.setJahiaAclId(new Integer(contentField.getAclID()));
fieldsData.setPageId(new Integer(contentField.getPageID()));
- fieldsData.setRank(new Integer(0));
fieldsData.setSite(siteDAO.findById(new Integer(contentField.getSi=
teID())));
fieldsData.setType(new Integer(contentField.getType()));
fieldsData.setValue(dbValue!=3Dnull?dbValue:"");
@@ -807,10 +805,9 @@
final JahiaFieldsDef fieldDefinition =3D definitionDAO.loadDefinit=
ion(new Integer(theField.getFieldDefID()));
data.setFieldDefinition(fieldDefinition);
data.setIsMetadata(fieldDefinition.getIsMetadata());
- data.setJahiaAcl(aclDAO.findLazyAclById(new Integer(theField.getAc=
lID())));
+ data.setJahiaAclId(new Integer(theField.getAclID()));
data.setPageId(new Integer(theField.getPageID()));
data.setProperties(theField.getProperties());
- data.setRank(new Integer(theField.getRank()));
data.setSite(siteDAO.findById(new Integer(theField.getJahiaID())));
data.setType(new Integer(theField.getType()));
String value =3D theField.getValue();
@@ -924,7 +921,7 @@
data.getFieldDefinition().getId().intValue(),
data.getType().intValue(),
data.getConnectType().intValue(),
- data.getJahiaAcl().getId().intValue(),
+ data.getJahiaAclId().intValue(),
activeEntryStates,
activeValues);
if ( data.getMetadataOwner() !=3D null ){
@@ -981,7 +978,7 @@
oldData.getFi=
eldDefinition().getId().intValue(),
oldData.getTy=
pe().intValue(),
oldData.getCo=
nnectType().intValue(),
- oldData.getJa=
hiaAcl().getId().intValue(),
+ oldData.getJa=
hiaAclId().intValue(),
activeEntrySt=
ates, activeValues);
oldData =3D dao.fillProperties(data);
if ( data.getMetadataOwner() !=3D null ){
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaPagesManager.java&rev=3D17896&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java =
(original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java =
Fri Jul 6 12:21:12 2007
@@ -194,7 +194,7 @@
data.setCounter(new Integer(newStagingInfo.getCounter()));
data.setCreator(newStagingInfo.getCreator());
data.setDoc(newStagingInfo.getDoc());
- data.setJahiaAcl(aclDAO.findAclById(new Integer(newStagingInfo.get=
AclID())));
+ data.setJahiaAclId(new Integer(newStagingInfo.getAclID()));
data.setPageDefinition(definitionDAO.findByPK(new Integer(newStagi=
ngInfo.getPageTemplateID())));
data.setPageLinkId(new Integer(newStagingInfo.getPageLinkID()));
data.setPageType(new Integer(newStagingInfo.getPageType()));
@@ -456,7 +456,7 @@
data.setCounter(new Integer(newStagingInfo.getCounter()));
data.setCreator(newStagingInfo.getCreator());
data.setDoc(newStagingInfo.getDoc());
- data.setJahiaAcl(aclDAO.findAclById(new Integer(newStagingInfo.get=
AclID())));
+ data.setJahiaAclId(new Integer(newStagingInfo.getAclID()));
data.setPageDefinition(definitionDAO.findByPK(new Integer(newStagi=
ngInfo.getPageTemplateID())));
data.setPageLinkId(new Integer(newStagingInfo.getPageLinkID()));
data.setPageType(new Integer(newStagingInfo.getPageType()));
@@ -514,8 +514,8 @@
data.getPageType().intValue(), da=
ta.getTitle(),
data.getPageDefinition().getId().=
intValue(),
data.getRemoteURL(), data.getPage=
LinkId().intValue(),
- data.getCreator(), data.getDoc(),=
data.getCounter().intValue(),
- data.getJahiaAcl().getId().intVal=
ue(),
+ data.getCreator(), data.getDoc(), data.getCounter().in=
tValue(),
+ data.getJahiaAclId().intValue(),
data.getComp_id().getVersionId().=
intValue(),
data.getComp_id().getWorkflowStat=
e().intValue(),
data.getComp_id().getLanguageCode=
(), this);
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaAcl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaAcl.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaAcl.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaAcl.java Fri Jul 6 =
12:21:12 2007
@@ -1,18 +1,18 @@
/*
* Copyright 2002-2006 Jahia Ltd
*
- * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
- * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
- * not use this file except in compliance with the License. You should hav=
e =
- * received a copy of the License along with this program; if not, you may=
obtain =
- * a copy of the License at =
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL),
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may
+ * not use this file except in compliance with the License. You should have
+ * received a copy of the License along with this program; if not, you may=
obtain
+ * a copy of the License at
*
* http://www.jahia.org/license/
*
- * Unless required by applicable law or agreed to in writing, software =
- * distributed under the License is distributed on an "AS IS" BASIS, =
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
- * See the License for the specific language governing permissions and =
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/package org.jahia.hibernate.model;
=
@@ -58,12 +58,14 @@
* nullable persistent field
*/
private Integer inheritance;
- =
+
private transient static Logger logger =3D Logger.getLogger (JahiaAcl.=
class);
private transient JahiaBaseACL mAcl =3D null;
=
private Map entries;
=
+ private Boolean hasEntries;
+
private Map groupEntries;
=
/**
@@ -81,12 +83,13 @@
*/
public JahiaAcl() {
entries =3D new FastHashMap(11);
+ hasEntries =3D Boolean.FALSE;
}
=
// --------------------- GETTER / SETTER METHODS ---------------------
=
/**
- * @hibernate.map lazy=3D"false"
+ * @hibernate.map lazy=3D"true"
* inverse=3D"true"
* cascade=3D"none"
* @hibernate.collection-key column=3D"id_jahia_acl"
@@ -94,18 +97,25 @@
* @hibernate.collection-index column=3D"target_jahia_acl_entries" typ=
e=3D"string"
*/
public Map getEntries() {
+ if (hasEntries !=3D null && !hasEntries.booleanValue()) {
+ this.groupEntries =3D new HashMap();
+ this.userEntries =3D new HashMap();
+ return new HashMap();
+ }
if (userEntries =3D=3D null) {
this.groupEntries =3D new HashMap();
this.userEntries =3D new HashMap();
- for (Iterator iterator =3D entries.keySet().iterator(); iterat=
or.hasNext();) {
+ Map loadedEntries =3D getEntries();
+ for (Iterator iterator =3D loadedEntries.keySet().iterator(); =
iterator.hasNext();) {
String s =3D (String) iterator.next();
- JahiaAclEntry ace =3D (JahiaAclEntry) entries.get(s);
+ JahiaAclEntry ace =3D (JahiaAclEntry) loadedEntries.get(s);
if (ace.getComp_id().getType().intValue() =3D=3D 1) {
userEntries.put(s,ace);
} else {
groupEntries.put(s,ace);
}
}
+ return loadedEntries;
}
return entries;
}
@@ -121,7 +131,13 @@
=
public void setUserEntries(Map userEntries) {
getEntries().keySet().removeAll(this.userEntries.keySet());
+ if (!userEntries.isEmpty()) {
+ setHasEntries(Boolean.TRUE);
+ }
getEntries().putAll(userEntries);
+ if (entries.isEmpty()) {
+ setHasEntries(Boolean.FALSE);
+ }
this.userEntries =3D userEntries;
}
=
@@ -132,7 +148,13 @@
=
public void setGroupEntries(Map groupEntries) {
getEntries().keySet().removeAll(this.groupEntries.keySet());
+ if (!groupEntries.isEmpty()) {
+ setHasEntries(Boolean.TRUE);
+ }
getEntries().putAll(groupEntries);
+ if (entries.isEmpty()) {
+ setHasEntries(Boolean.FALSE);
+ }
this.groupEntries =3D groupEntries;
}
=
@@ -163,6 +185,18 @@
return true;
}
=
+ /**
+ * @hibernate.property column=3D"hasentries_jahia_acl"
+ * length=3D"11"
+ */
+ public Boolean getHasEntries() {
+ return hasEntries;
+ }
+
+ public void setHasEntries(Boolean hasEntries) {
+ this.hasEntries =3D hasEntries;
+ }
+
private transient JahiaAcl parent;
=
private Integer parentId;
@@ -211,13 +245,14 @@
acl.setParentId(parentId);
acl.setInheritance(inheritance);
acl.setId(id);
- acl.setEntries(new HashMap(entries));
+ acl.setEntries(new HashMap(getEntries()));
+ acl.setHasEntries(getHasEntries());
return acl;
}
=
public boolean equals(Object obj) {
if (this =3D=3D obj) return true;
- =
+
if (obj !=3D null && this.getClass() =3D=3D obj.getClass()) {
final JahiaAcl castOther =3D (JahiaAcl) obj;
return new EqualsBuilder()
@@ -242,6 +277,9 @@
// -------------------------- OTHER METHODS --------------------------
=
public boolean clearEntries(int userTypeEntry) {
+ if (getEntries().isEmpty()) {
+ return true;
+ }
if (userTypeEntry =3D=3D ACLInfo.USER_TYPE_ENTRY) {
entries.keySet().removeAll(getUserEntries().keySet());
userEntries.clear();
@@ -249,6 +287,9 @@
entries.keySet().removeAll(getGroupEntries().keySet());
groupEntries.clear();
}
+ if (entries.isEmpty()) {
+ setHasEntries(Boolean.FALSE);
+ }
return true;
}
=
@@ -571,12 +612,18 @@
public boolean removeGroupEntry(JahiaGroup group) {
getGroupEntries().remove(group.getName());
entries.remove(group.getName());
+ if (entries.isEmpty()) {
+ setHasEntries(Boolean.FALSE);
+ }
return true;
}
=
public boolean removeUserEntry(JahiaUser user) {
getUserEntries().remove(user.getName());
entries.remove(user.getName());
+ if (entries.isEmpty()) {
+ setHasEntries(Boolean.FALSE);
+ }
return true;
}
=
@@ -591,6 +638,7 @@
=
} else {
//Create new jahiaAclEntry to ensure presence of pk
+ setHasEntries(Boolean.TRUE);
current =3D new JahiaAclEntry(
new JahiaAclEntryPK(this, new Integer(ACLInfo.GROUP_TY=
PE_ENTRY), group.getName()),
entry.getEntryState(), entry.getEntryTri());
@@ -606,6 +654,7 @@
current.setEntryState(entry.getEntryState());
current.setEntryTri(entry.getEntryTri());
} else {
+ setHasEntries(Boolean.TRUE);
current =3D new JahiaAclEntry(
new JahiaAclEntryPK(this, new Integer(ACLInfo.USER_TYP=
E_ENTRY),
user.getName()),
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaContainer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaContainer.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaContainer.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaContainer.java Fri J=
ul 6 12:21:12 2007
@@ -62,7 +62,8 @@
/**
* persistent field
*/
- private org.jahia.hibernate.model.JahiaAcl jahiaAcl;
+
+ private Integer jahiaAclId;
=
/**
* identifier field
@@ -120,15 +121,15 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"rights_jahia_ctn_entries"
+ * @hibernate.property name=3D"jahiaAclId"
+ * column=3D"rights_jahia_ctn_entries"
*/
- public org.jahia.hibernate.model.JahiaAcl getJahiaAcl() {
- return this.jahiaAcl;
+ public Integer getJahiaAclId() {
+ return this.jahiaAclId;
}
=
- public void setJahiaAcl(org.jahia.hibernate.model.JahiaAcl jahiaAcl) {
- this.jahiaAcl =3D jahiaAcl;
+ public void setJahiaAclId(Integer jahiaAclId) {
+ this.jahiaAclId =3D jahiaAclId;
}
=
/**
@@ -252,7 +253,7 @@
JahiaContainer container =3D new JahiaContainer();
container.setComp_id((JahiaCtnEntryPK) this.getComp_id().clone());
container.setCtndef(this.getCtndef());
- container.setJahiaAcl(this.getJahiaAcl());
+ container.setJahiaAclId(this.getJahiaAclId());
container.setListid(this.getListid());
container.setPageid(this.getPageid());
container.setRank(this.getRank());
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaContainerList.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaContainerList.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaContainerList.java (=
original)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaContainerList.java F=
ri Jul 6 12:21:12 2007
@@ -53,7 +53,8 @@
/**
* nullable persistent field
*/
- private JahiaAcl rights;
+ private Integer jahiaAclId;
+
private transient Map properties;
=
=
@@ -119,17 +120,16 @@
}
=
=
-
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"rights_jahia_ctn_lists"
+ * @hibernate.property name=3D"jahiaAclId"
+ * column=3D"rights_jahia_ctn_lists"
*/
- public JahiaAcl getRights() {
- return this.rights;
+ public Integer getJahiaAclId() {
+ return this.jahiaAclId;
}
=
- public void setRights(JahiaAcl rights) {
- this.rights =3D rights;
+ public void setJahiaAclId(Integer jahiaAclId) {
+ this.jahiaAclId =3D jahiaAclId;
}
=
public String toString() {
@@ -221,7 +221,7 @@
containerList.setContainerDefinition(this.getContainerDefinition()=
);
containerList.setPageid(this.getPageid());
containerList.setParentId(this.getParentId());
- containerList.setRights(this.getRights());
+ containerList.setJahiaAclId(this.getJahiaAclId());
containerList.setProperties(this.getProperties());
return containerList;
}
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaFieldsData.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java Fri =
Jul 6 12:21:12 2007
@@ -47,11 +47,6 @@
/**
* nullable persistent field
*/
- private Integer rank;
-
- /**
- * nullable persistent field
- */
private Integer type;
=
/**
@@ -72,7 +67,7 @@
/**
* persistent field
*/
- private org.jahia.hibernate.model.JahiaAcl jahiaAcl;
+ private Integer jahiaAclId;
=
/**
* identifier field
@@ -168,15 +163,15 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"rights_jahia_fields_data"
+ * @hibernate.property name=3D"jahiaAclId"
+ * column=3D"rights_jahia_fields_data"
*/
- public org.jahia.hibernate.model.JahiaAcl getJahiaAcl() {
- return this.jahiaAcl;
+ public Integer getJahiaAclId() {
+ return this.jahiaAclId;
}
=
- public void setJahiaAcl(org.jahia.hibernate.model.JahiaAcl jahiaAcl) {
- this.jahiaAcl =3D jahiaAcl;
+ public void setJahiaAclId(Integer jahiaAclId) {
+ this.jahiaAclId =3D jahiaAclId;
}
=
/**
@@ -199,18 +194,6 @@
}
=
/**
- * @hibernate.property column=3D"rank_jahia_fields_data"
- * length=3D"11"
- */
- public Integer getRank() {
- return this.rank;
- }
-
- public void setRank(Integer rank) {
- this.rank =3D rank;
- }
-
- /**
* @hibernate.many-to-one not-null=3D"true"
* @hibernate.column name=3D"jahiaid_jahia_fields_data"
*/
@@ -315,9 +298,8 @@
data.setFieldDefinition(this.getFieldDefinition());
data.setIsMetadata(this.getIsMetadata());
data.setMetadataOwner(this.getMetadataOwner());
- data.setJahiaAcl(this.getJahiaAcl());
+ data.setJahiaAclId(this.getJahiaAclId());
data.setPageId(this.getPageId());
- data.setRank(this.getRank());
data.setSite(this.getSite());
data.setType(this.getType());
data.setValue(this.getValue());
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaPagesData.java&rev=3D17896&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
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java Fri J=
ul 6 12:21:12 2007
@@ -64,7 +64,7 @@
/**
* persistent field
*/
- private org.jahia.hibernate.model.JahiaAcl jahiaAcl;
+ private Integer jahiaAclId;
=
/**
* identifier field
@@ -149,15 +149,15 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"rights_jahia_pages_data"
+ * @hibernate.property name=3D"jahiaAclId"
+ * column=3D"rights_jahia_pages_data"
*/
- public org.jahia.hibernate.model.JahiaAcl getJahiaAcl() {
- return this.jahiaAcl;
+ public Integer getJahiaAclId() {
+ return this.jahiaAclId;
}
=
- public void setJahiaAcl(org.jahia.hibernate.model.JahiaAcl jahiaAcl) {
- this.jahiaAcl =3D jahiaAcl;
+ public void setJahiaAclId(Integer jahiaAclId) {
+ this.jahiaAclId =3D jahiaAclId;
}
=
/**
@@ -343,7 +343,7 @@
data.setCounter(this.getCounter());
data.setCreator(this.getCreator());
data.setDoc(this.getDoc());
- data.setJahiaAcl(this.getJahiaAcl());
+ data.setJahiaAclId(this.getJahiaAclId());
data.setPageDefinition(this.getPageDefinition());
data.setPageLinkId(this.getPageLinkId());
data.setPageType(this.getPageType());
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
