Author: tdraier
Date: Tue Jun 26 19:00:06 2007
New Revision: 17784
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17784&repname=
=3Djahia
Log:
-acl remapping for pages, remove useless relation
Modified:
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/=
JahiaPagesManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaPagesData.java
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=3D1778=
4&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 Tue Jun 26 19:00:06 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: 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=3D17784&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 Tue Jun 26 19:00:06 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: 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=
7784&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 Tue Jun 26 19:00:06 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
