Author: tdraier
Date: Tue Jun 26 18:55:46 2007
New Revision: 17783
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17783&repname=
=3Djahia
Log:
-acl remapping, remove useless relation
-removed unused attribute from jahia_fields_data
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=
aFieldsDataDAO.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/=
JahiaFieldsDataManager.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=
hiaContainerList.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaFieldsData.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=
17783&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 Tue Jun 26 18:55:46 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);
@@ -607,7 +607,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 (");
@@ -631,7 +630,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");
@@ -656,7 +654,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 ");
@@ -689,7 +686,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=
");
@@ -732,7 +728,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 ");
@@ -992,7 +987,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: 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=3D17783&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 Tue Jun 26 18:55:46 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: 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=
=3D17783&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 Tue Jun 26 18:55:46 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: 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=3D17783&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 Tue Jun 26 18:55:46 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: 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=3D17783&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 Tue Jun 26 18:55:46 2007
@@ -817,7 +817,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);
@@ -864,7 +864,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())));
@@ -941,7 +941,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;
@@ -955,7 +955,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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaFieldsDataManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.ja=
va&rev=3D17783&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/=
JahiaFieldsDataManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaFieldsDataManager.java Tue Jun 26 18:55:46 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: 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=
7783&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 Tue Jun 26 18:55:46 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaContainerList.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaContainerList.java&rev=
=3D17783&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=
hiaContainerList.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaContainerList.java Tue Jun 26 18:55:46 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaFieldsData.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java&rev=3D=
17783&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=
hiaFieldsData.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaFieldsData.java Tue Jun 26 18:55:46 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());
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
