Author: tdraier
Date: Fri Jul 6 12:26:29 2007
New Revision: 17899
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17899&repname=
=3Djahia
Log:
cleanup and optimized jahia_fields_data, improved mapping (backport 17835 1=
7836 17837 17838 17839 17840)
Modified:
trunk/core/src/java/org/jahia/data/containers/JahiaContainer.java
trunk/core/src/java/org/jahia/data/containers/JahiaContainerList.java
trunk/core/src/java/org/jahia/data/fields/JahiaField.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDataDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaFieldsDataManager.=
java
trunk/core/src/java/org/jahia/hibernate/model/JahiaAcl.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsData.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDataPK.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesDataPK.java
trunk/core/src/java/org/jahia/services/fields/ContentField.java
Modified: trunk/core/src/java/org/jahia/data/containers/JahiaContainer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/JahiaContainer.java&rev=3D17899&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/data/containers/JahiaContainer.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/data/containers/JahiaContainer.java Fri J=
ul 6 12:26:29 2007
@@ -808,19 +808,11 @@
if (containerACL !=3D null) {
// Test the access rights
result =3D containerACL.getPermission(user, permission);
-
- // destroy the object.
- containerACL =3D null;
}
} catch (JahiaException ex) {
- //JahiaConsole.println ("JahiaContainer", "JahiaException caug=
ht in checkAccess.");
+ logger.debug("Problem getting ACL on container.", ex);
}
=
- //if (!result) {
- // JahiaConsole.println ("JahiaContainer", "Permission denied f=
or user ["+
- // user.getName()+"] to container ["+Integer.toString(I=
D)+
- // "] for access permission ["+Integer.toString(permiss=
ion)+"]");
- //}
return result;
}
=
Modified: trunk/core/src/java/org/jahia/data/containers/JahiaContainerList.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/JahiaContainerList.java&rev=3D17899&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/data/containers/JahiaContainerList.java (=
original)
+++ trunk/core/src/java/org/jahia/data/containers/JahiaContainerList.java F=
ri Jul 6 12:26:29 2007
@@ -404,32 +404,18 @@
if ( aclID =3D=3D 0 )
return true;
=
-
- //JahiaConsole.println ("->> containerList checkAccess : container=
List ["+Integer.toString (ID)+
- // "], permission ["+Integer.toString (permission)+"], user ["+=
user.getName()+"]");
-
boolean result =3D false;
- try
- {
+ try {
// Try to instanciate the ACL.
JahiaBaseACL containerListACL =3D getACL();
if (containerListACL !=3D null) {
// Test the access rights
result =3D containerListACL.getPermission (user, permissio=
n);
-
- // destroy the object.
- containerListACL =3D null;
}
- }
- catch (JahiaException ex) {
+ } catch (JahiaException ex) {
logger.debug("Problem getting ACL on container list.", ex);
}
=
- //if (!result) {
- // JahiaConsole.println ("JahiaContainerList", "Permission deni=
ed for user ["+
- // user.getName()+"] to containerList ["+Integer.toStri=
ng(ID)+
- // "] for access permission ["+Integer.toString(permiss=
ion)+"]");
- //}
return result;
}
=
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaField.java&rev=3D17899&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/data/fields/JahiaField.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaField.java Fri Jul 6 12=
:26:29 2007
@@ -464,9 +464,6 @@
return false;
}
=
- //JahiaConsole.println ("->> field checkAccess : field ["+Integer.=
toString (ID)+
- // "], permission ["+Integer.toString (permis=
sion)+"], user ["+user.getName()+"]");
-
boolean result =3D false;
try {
// Try to instanciate the ACL.
@@ -476,21 +473,12 @@
if (fieldACL !=3D null) {
// Test the access rights
result =3D fieldACL.getPermission(user, permission);
-
- // destroy the object.
- fieldACL =3D null;
}
}
- }
- catch (JahiaException ex) {
+ } catch (JahiaException ex) {
logger.error("JahiaException caught in checkAccess.", ex);
}
=
- //if (!result) {
- // JahiaConsole.println ("JahiaField", "Permission denied for u=
ser ["+
- // user.getName()+"] to field ["+Integer.toString(ID)+
- // "] for access permission ["+Integer.toString(permiss=
ion)+"]");
- //}
return result;
}
=
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=3D17899&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:26:29 2007
@@ -132,7 +132,7 @@
=
public List findAllAclsIdInSite(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct f.jahiaAclId from JahiaFieldsData =
f where f.site.id=3D? order by f.jahiaAclId";
+ String hql =3D "select distinct f.jahiaAclId from JahiaFieldsData =
f where f.siteId=3D? order by f.jahiaAclId";
if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
@@ -203,15 +203,15 @@
return retVal;
}
=
- public List findAllFieldsIdInSite(Integer containerID) {
+ public List findAllFieldsIdInSite(Integer siteId) {
List retVal =3D null;
- String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.site=3D? order by f.comp_id.id";
- if (containerID !=3D null) {
+ String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.siteId=3D? order by f.comp_id.id";
+ if (siteId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
retVal =3D template.find(hql,
- new Object[]{containerID});
+ new Object[]{siteId});
}
return retVal;
}
@@ -268,7 +268,7 @@
}
=
public Integer findMetadataByOwnerAndName(String name, JahiaObjectPK o=
wnerKey) {
- String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.fieldDefinition.name=3D? AND f.isMetadata=3D1 AND f.metadataOwner=
.comp_id.id=3D? AND f.metadataOwner.comp_id.type=3D?";
+ String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.fieldDefinition.name=3D? AND f.metadataOwnerId=3D? AND f.metadata=
OwnerType=3D?";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
@@ -281,26 +281,13 @@
}
=
public List findMetadatasByOwner(JahiaObjectPK ownerKey) {
- String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.isMetadata=3D1 AND f.metadataOwner.comp_id.id=3D? AND f.metadataO=
wner.comp_id.type=3D?";
+ String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.metadataOwnerId=3D? AND f.metadataOwnerType=3D?";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
return template.find(hql, new Object[]{ownerKey.getId(),ownerKey.g=
etType()});
}
=
- public JahiaObject findJahiaObjectByMetadata(Integer fieldId) {
- String hql =3D "select distinct f.metadataOwner from JahiaFieldsDa=
ta f where f.comp_id.id=3D?";
- final HibernateTemplate template =3D getHibernateTemplate();
- template.setCacheQueries(true);
- template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
- List list =3D template.find(hql,
- new Object[]{fieldId});
- if ( list.size()>0 ){
- return (JahiaObject)list.get(0);
- }
- return null;
- }
-
public List findFieldsIdInPageByType(Integer pageId, Integer type) {
List retVal =3D null;
String hql =3D "select distinct f.comp_id.id from JahiaFieldsData =
f where f.type=3D? and f.pageId=3D? order by f.comp_id.id";
@@ -382,7 +369,7 @@
}
=
public List findOldEntryStateForMetadatas(JahiaObjectPK ownerKey) {
- String hql =3D "select f.comp_id.id,f.comp_id.versionId,f.comp_id.=
workflowState,f.comp_id.languageCode from JahiaFieldsData f where f.metadat=
aOwner.comp_id.id=3D? AND f.metadataOwner.comp_id.type=3D? AND f.comp_id.wo=
rkflowState<=3D0";
+ String hql =3D "select f.comp_id.id,f.comp_id.versionId,f.comp_id.=
workflowState,f.comp_id.languageCode from JahiaFieldsData f where f.metadat=
aOwnerId=3D? AND f.metadataOwnerType=3D? AND f.comp_id.workflowState<=3D0";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
@@ -820,7 +807,7 @@
}
=
public List loadAllActiveOrStagedFieldsByMetadataOwner(JahiaObjectPK o=
wnerKey) {
- String hql =3D "from JahiaFieldsData f where f.metadataOwner.comp_=
id.id=3D? AND f.metadataOwner.comp_id.type=3D? AND f.comp_id.workflowState>=
=3D1 order by f.comp_id.id";
+ String hql =3D "from JahiaFieldsData f where f.metadataOwnerId=3D?=
AND f.metadataOwnerType=3D? AND f.comp_id.workflowState>=3D1 order by f.co=
mp_id.id";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(false);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
@@ -828,7 +815,7 @@
}
=
public List loadAllStagedFieldsByMetadataOwner(JahiaObjectPK ownerKey)=
{
- String hql =3D "from JahiaFieldsData f where f.metadataOwner.comp_=
id.id=3D? AND f.metadataOwner.comp_id.type=3D? AND f.comp_id.workflowState>=
1 order by f.comp_id.id";
+ String hql =3D "from JahiaFieldsData f where f.metadataOwnerId=3D?=
AND f.metadataOwnerType=3D? AND f.comp_id.workflowState>1 order by f.comp_=
id.id";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(false);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
@@ -836,7 +823,7 @@
}
=
public List findStagedFieldsByMetadataOwner(JahiaObjectPK ownerKey) {
- String hql =3D "select f.comp_id.id from JahiaFieldsData f where f=
.metadataOwner.comp_id.id=3D? AND f.metadataOwner.comp_id.type=3D? AND f.co=
mp_id.workflowState>1";
+ String hql =3D "select f.comp_id.id from JahiaFieldsData f where f=
.metadataOwnerId=3D? AND f.metadataOwnerType=3D? AND f.comp_id.workflowStat=
e>1";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(false);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
@@ -1027,8 +1014,7 @@
for (int i =3D 0; i < list.size(); i++) {
JahiaFieldsData data =3D (JahiaFieldsData) list.get(i);
deleteProperties(data, template);
- if ( data.getContainerId().intValue() !=3D 0 ||
- (data.getIsMetadata() !=3D null && data.getIsMetadata(=
).intValue() =3D=3D 1 ) ){
+ if ( data.getContainerId().intValue() !=3D 0 || data.getMetada=
taOwnerId() !=3D null ){
continue;
}
map.put(new ContentFieldKey(data.getComp_id().getId().intValue=
()),data.getJahiaAclId());
@@ -1038,13 +1024,14 @@
}
=
public JahiaObjectPK findJahiaObjectPKByMetadata(Integer fieldId) {
- String hql =3D "select distinct f.metadataOwner.comp_id from Jahia=
FieldsData f where f.comp_id.id=3D?";
+ String hql =3D "select distinct f.metadataOwnerId,f.metadataOwnerT=
ype from JahiaFieldsData f where f.comp_id.id=3D?";
final HibernateTemplate template =3D getHibernateTemplate();
template.setCacheQueries(true);
template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
List list =3D template.find(hql, new Object[]{fieldId});
if ( list.size()>0 ){
- return (JahiaObjectPK) list.get(0);
+ Object[] objs =3D (Object[]) list.get(0);
+ return new JahiaObjectPK((String) objs[1], (Integer) objs[0]);
}
return null;
}
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=3D17899&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:26:29 2007
@@ -204,7 +204,7 @@
new Integer(to.getWo=
rkflowState()),
to.getLanguageCode()=
));
dao.save(data);
- flushCache(id,data.getSite()!=3Dnull?data.getSite().getId(=
).intValue():0, data.getContainerId().intValue());
+ flushCache(id,data.getSiteId()!=3Dnull?data.getSiteId().in=
tValue():0, data.getContainerId().intValue());
fieldCache.put(CACHE_KEY_PREFIX+id, cf);
}
} catch (ObjectRetrievalFailureException e) {
@@ -223,19 +223,19 @@
fieldDefinition =3D definitionDAO.loadDefinition(new Integer(t=
heField.getFieldDefID()));
}
data.setFieldDefinition(fieldDefinition);
- data.setIsMetadata(fieldDefinition.getIsMetadata());
if ( theField.getMetadataOwnerObjectKey() !=3D null ){
ObjectKey objKey =3D theField.getMetadataOwnerObjectKey();
org.jahia.hibernate.model.JahiaObject jahiaObject =3D
jahiaObjectDAO.findByPK(new JahiaObjectPK(objKey.getTy=
pe(),new Integer(objKey.getIDInType())));
if ( jahiaObject !=3D null ){
- data.setMetadataOwner(jahiaObject);
+ data.setMetadataOwnerId(jahiaObject.getComp_id().getId());
+ data.setMetadataOwnerType(jahiaObject.getComp_id().getType=
());
}
}
data.setJahiaAclId(new Integer(theField.getAclID()));
data.setPageId(new Integer(theField.getPageID()));
data.setProperties(theField.getProperties());
- data.setSite(siteDAO.findById(new Integer(theField.getJahiaID())));
+ data.setSiteId(new Integer(theField.getJahiaID()));
data.setType(new Integer(theField.getType()));
String value =3D theField.getValue();
if (value.equals("")) {
@@ -256,7 +256,7 @@
data.setComp_id(pk);
dao.save(data);
theField.setID(data.getComp_id().getId().intValue());
- flushCache(theField.getID(),data.getSite()!=3Dnull?data.getSite().=
getId().intValue():0, theField.getctnid());
+ flushCache(theField.getID(),data.getSiteId()!=3Dnull?data.getSiteI=
d().intValue():0, theField.getctnid());
=
ContentObjectEntryState entryState =3D new ContentObjectEntryState(
data.getComp_id().getWorkflowState().intValue(),
@@ -280,11 +280,11 @@
data.getConnectType().intValue(),
data.getJahiaAclId().intValue(),
activeEntryStates, activeValues);
- if ( data.getMetadataOwner() !=3D null ){
+ if ( data.getMetadataOwnerId() !=3D null ){
try {
- contentFieldInstance.setMetadataOwnerObjectKey(
- data.getMetadataOwner().getComp_id().toObjectK=
ey());
- fieldCache.put(MD_KEY_PREFIX+data.getMetadataOwner().g=
etComp_id().toObjectKey()+fieldDefinition.getName(), new Integer(contentFie=
ldInstance.getID()));
+ ObjectKey key =3D new JahiaObjectPK(data.getMetadataOw=
nerType(), data.getMetadataOwnerId()).toObjectKey();
+ contentFieldInstance.setMetadataOwnerObjectKey(key);
+ fieldCache.put(MD_KEY_PREFIX+key+fieldDefinition.getNa=
me(), new Integer(contentFieldInstance.getID()));
} catch ( Throwable t ){
}
}
@@ -313,18 +313,18 @@
fieldsData.setContainerId(new Integer(contentField.getContainerID(=
)));
final JahiaFieldsDef fieldDefinition =3D definitionDAO.loadDefinit=
ion(new Integer(contentField.getFieldDefID()));
fieldsData.setFieldDefinition(fieldDefinition);
- fieldsData.setIsMetadata(fieldDefinition.getIsMetadata());
if ( contentField.getMetadataOwnerObjectKey() !=3D null ){
ObjectKey objKey =3D contentField.getMetadataOwnerObjectKey();
org.jahia.hibernate.model.JahiaObject jahiaObject =3D
jahiaObjectDAO.findByPK(new JahiaObjectPK(objKey.getTy=
pe(),new Integer(objKey.getIDInType())));
if ( jahiaObject !=3D null ){
- fieldsData.setMetadataOwner(jahiaObject);
+ fieldsData.setMetadataOwnerId(jahiaObject.getComp_id().get=
Id());
+ fieldsData.setMetadataOwnerType(jahiaObject.getComp_id().g=
etType());
}
}
fieldsData.setJahiaAclId(new Integer(contentField.getAclID()));
fieldsData.setPageId(new Integer(contentField.getPageID()));
- fieldsData.setSite(siteDAO.findById(new Integer(contentField.getSi=
teID())));
+ fieldsData.setSiteId(new Integer(contentField.getSiteID()));
fieldsData.setType(new Integer(contentField.getType()));
fieldsData.setValue(dbValue!=3Dnull?dbValue:"");
dao.save(fieldsData);
@@ -340,7 +340,7 @@
=
new Integer(entryState.getWorkflowState()), entry=
State.getLanguageCode()));
if (jahiaFieldsDataByPK !=3D null) {
dao.deleteJahiaField(jahiaFieldsDataByPK);
- flushCache(id, jahiaFieldsDataByPK.getSite() !=3D null ? j=
ahiaFieldsDataByPK.getSite().getId().intValue() : 0, jahiaFieldsDataByPK.ge=
tContainerId().intValue());
+ flushCache(id, jahiaFieldsDataByPK.getSiteId() !=3D null ?=
jahiaFieldsDataByPK.getSiteId().intValue() : 0, jahiaFieldsDataByPK.getCon=
tainerId().intValue());
fieldCache.put(CACHE_KEY_PREFIX+id, cf);
}
} catch (ObjectDeletedException e) {
@@ -399,7 +399,7 @@
}
}
}
- flushCache(containerId,container.getSite()!=3Dnull?contain=
er.getSite().getId().intValue():0, container.getContainerId().intValue());
+ flushCache(containerId,container.getSiteId()!=3Dnull?conta=
iner.getSiteId().intValue():0, container.getContainerId().intValue());
} else {
List stagedContainers =3D null;
try {
@@ -409,7 +409,7 @@
dao.deleteJahiaFields(stagedContainers);
if(stagedContainers.size()>0) {
container =3D (JahiaFieldsData) stagedContainers.get(0);
- flushCache(containerId,container.getSite()!=3Dnull?contain=
er.getSite().getId().intValue():0, container.getContainerId().intValue());
+ flushCache(containerId,container.getSiteId()!=3Dnull?conta=
iner.getSiteId().intValue():0, container.getContainerId().intValue());
}
}
} else if (saveVersion.isVersioned()) {
@@ -421,13 +421,13 @@
jahiaContainer.getComp_id().setWorkflowState(new Integer(-=
1));
jahiaContainer.getComp_id().setVersionId(new Long(saveVers=
ion.getVersionID()));
dao.save(container);
- flushCache(containerId,container.getSite()!=3Dnull?contain=
er.getSite().getId().intValue():0, container.getContainerId().intValue());
+ flushCache(containerId,container.getSiteId()!=3Dnull?conta=
iner.getSiteId().intValue():0, container.getContainerId().intValue());
} catch (CloneNotSupportedException e) {
log.error("Could not clone org.jahia.hibernate.model.Jahia=
Container");
}
} else {
dao.deleteJahiaField(container);
- flushCache(containerId,container.getSite()!=3Dnull?container.g=
etSite().getId().intValue():0, container.getContainerId().intValue());
+ flushCache(containerId,container.getSiteId()!=3Dnull?container=
.getSiteId().intValue():0, container.getContainerId().intValue());
}
// remove all links for page if no pages exist at all with this id
if(dao.getNBFields(containerId)=3D=3D0){
@@ -804,11 +804,10 @@
data.setContainerId(new Integer(theField.getctnid()));
final JahiaFieldsDef fieldDefinition =3D definitionDAO.loadDefinit=
ion(new Integer(theField.getFieldDefID()));
data.setFieldDefinition(fieldDefinition);
- data.setIsMetadata(fieldDefinition.getIsMetadata());
data.setJahiaAclId(new Integer(theField.getAclID()));
data.setPageId(new Integer(theField.getPageID()));
data.setProperties(theField.getProperties());
- data.setSite(siteDAO.findById(new Integer(theField.getJahiaID())));
+ data.setSiteId(new Integer(theField.getJahiaID()));
data.setType(new Integer(theField.getType()));
String value =3D theField.getValue();
if (value.equals("")) {
@@ -834,7 +833,7 @@
data.setComp_id(pk);
dao.update(data);
theField.setID(data.getComp_id().getId().intValue());
- flushCache(theField.getID(),data.getSite()!=3Dnull?data.getSite().=
getId().intValue():0,theField.getctnid());
+ flushCache(theField.getID(),data.getSiteId()!=3Dnull?data.getSiteI=
d().intValue():0,theField.getctnid());
}
=
public synchronized void updateValue(ContentField contentField, Conten=
tObjectEntryState newEntryState, String value, boolean cache) {
@@ -857,7 +856,7 @@
}
fieldsData.setValue(value);
dao.update(fieldsData);
- flushCache(contentField.getID(),fieldsData.getSite()!=3Dnull?f=
ieldsData.getSite().getId().intValue():0, contentField.getContainerID());
+ flushCache(contentField.getID(),fieldsData.getSiteId()!=3Dnull=
?fieldsData.getSiteId().intValue():0, contentField.getContainerID());
if (cache) {
this.fieldCache.put(CACHE_KEY_PREFIX+contentField.getID(),=
contentField);
}
@@ -909,9 +908,9 @@
=
final ContentFieldTools instance =3D ContentFieldTools.getInstance=
();
int jahiaID =3D 0;
- if(data.getSite()!=3Dnull) {
+ if(data.getSiteId()!=3Dnull) {
// Metadata field are not bind to one site
- jahiaID =3D data.getSite().getId().intValue();
+ jahiaID =3D data.getSiteId().intValue();
}
final ContentField contentFieldInstance =3D instance.createContent=
FieldInstance(
data.getComp_id().getId().intValue(),
@@ -924,10 +923,10 @@
data.getJahiaAclId().intValue(),
activeEntryStates,
activeValues);
- if ( data.getMetadataOwner() !=3D null ){
+ if ( data.getMetadataOwnerId() !=3D null ){
try {
- contentFieldInstance.setMetadataOwnerObjectKey(
- data.getMetadataOwner().getComp_id().toObjectKey()=
);
+ ObjectKey key =3D new JahiaObjectPK(data.getMetadataOwnerT=
ype(), data.getMetadataOwnerId()).toObjectKey();
+ contentFieldInstance.setMetadataOwnerObjectKey(key);
} catch ( Throwable t ){
}
} else {
@@ -966,9 +965,9 @@
data =3D (JahiaFieldsData) list.get(i);
if (oldData !=3D null && oldData.getComp_id().getId().=
intValue() !=3D data.getComp_id().getId().intValue()) {
int jahiaID =3D 0;
- if (oldData.getSite() !=3D null) {
+ if (oldData.getSiteId() !=3D null) {
// Metadata field are not bind to one site
- jahiaID =3D oldData.getSite().getId().intValue=
();
+ jahiaID =3D oldData.getSiteId().intValue();
}
final ContentField contentFieldInstance =3D Conten=
tFieldTools.getInstance()
.createContentFieldInstance(oldData.getCom=
p_id().getId().intValue(),
@@ -981,10 +980,10 @@
oldData.getJa=
hiaAclId().intValue(),
activeEntrySt=
ates, activeValues);
oldData =3D dao.fillProperties(data);
- if ( data.getMetadataOwner() !=3D null ){
+ if ( data.getMetadataOwnerId() !=3D null ){
try {
- contentFieldInstance.setMetadataOwnerObjec=
tKey(
- data.getMetadataOwner().getComp_id=
().toObjectKey());
+ ObjectKey key =3D new JahiaObjectPK(data.g=
etMetadataOwnerType(), data.getMetadataOwnerId()).toObjectKey();
+ contentFieldInstance.setMetadataOwnerObjec=
tKey(key);
} catch ( Throwable t ){
}
}
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=3D17899&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:26:29 2007
@@ -64,7 +64,7 @@
=
private Map entries;
=
- private Boolean hasEntries;
+ private Integer hasEntries;
=
private Map groupEntries;
=
@@ -83,7 +83,7 @@
*/
public JahiaAcl() {
entries =3D new FastHashMap(11);
- hasEntries =3D Boolean.FALSE;
+ hasEntries =3D new Integer(0);
}
=
// --------------------- GETTER / SETTER METHODS ---------------------
@@ -97,7 +97,7 @@
* @hibernate.collection-index column=3D"target_jahia_acl_entries" typ=
e=3D"string"
*/
public Map getEntries() {
- if (hasEntries !=3D null && !hasEntries.booleanValue()) {
+ if (hasEntries !=3D null && hasEntries.intValue()=3D=3D0) {
this.groupEntries =3D new HashMap();
this.userEntries =3D new HashMap();
return new HashMap();
@@ -132,11 +132,11 @@
public void setUserEntries(Map userEntries) {
getEntries().keySet().removeAll(this.userEntries.keySet());
if (!userEntries.isEmpty()) {
- setHasEntries(Boolean.TRUE);
+ setHasEntries(new Integer(1));
}
getEntries().putAll(userEntries);
if (entries.isEmpty()) {
- setHasEntries(Boolean.FALSE);
+ setHasEntries(new Integer(0));
}
this.userEntries =3D userEntries;
}
@@ -149,11 +149,11 @@
public void setGroupEntries(Map groupEntries) {
getEntries().keySet().removeAll(this.groupEntries.keySet());
if (!groupEntries.isEmpty()) {
- setHasEntries(Boolean.TRUE);
+ setHasEntries(new Integer(1));
}
getEntries().putAll(groupEntries);
if (entries.isEmpty()) {
- setHasEntries(Boolean.FALSE);
+ setHasEntries(new Integer(0));
}
this.groupEntries =3D groupEntries;
}
@@ -187,13 +187,12 @@
=
/**
* @hibernate.property column=3D"hasentries_jahia_acl"
- * length=3D"11"
*/
- public Boolean getHasEntries() {
+ public Integer getHasEntries() {
return hasEntries;
}
=
- public void setHasEntries(Boolean hasEntries) {
+ public void setHasEntries(Integer hasEntries) {
this.hasEntries =3D hasEntries;
}
=
@@ -288,7 +287,7 @@
groupEntries.clear();
}
if (entries.isEmpty()) {
- setHasEntries(Boolean.FALSE);
+ setHasEntries(new Integer(0));
}
return true;
}
@@ -613,7 +612,7 @@
getGroupEntries().remove(group.getName());
entries.remove(group.getName());
if (entries.isEmpty()) {
- setHasEntries(Boolean.FALSE);
+ setHasEntries(new Integer(0));
}
return true;
}
@@ -622,7 +621,7 @@
getUserEntries().remove(user.getName());
entries.remove(user.getName());
if (entries.isEmpty()) {
- setHasEntries(Boolean.FALSE);
+ setHasEntries(new Integer(0));
}
return true;
}
@@ -638,7 +637,7 @@
=
} else {
//Create new jahiaAclEntry to ensure presence of pk
- setHasEntries(Boolean.TRUE);
+ setHasEntries(new Integer(1));
current =3D new JahiaAclEntry(
new JahiaAclEntryPK(this, new Integer(ACLInfo.GROUP_TY=
PE_ENTRY), group.getName()),
entry.getEntryState(), entry.getEntryTri());
@@ -654,7 +653,7 @@
current.setEntryState(entry.getEntryState());
current.setEntryTri(entry.getEntryTri());
} else {
- setHasEntries(Boolean.TRUE);
+ setHasEntries(new Integer(1));
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/JahiaFieldsData.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaFieldsData.java&rev=3D17899&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:26:29 2007
@@ -54,14 +54,15 @@
*/
private JahiaFieldsDef fieldDefinition;
=
- private Integer isMetadata =3D new Integer(0);
+ private Integer metadataOwnerId;
=
- private JahiaObject metadataOwner;
+ private String metadataOwnerType;
=
/**
* nullable persistent field
*/
- private JahiaSite site;
+ private Integer siteId;
+
private transient Map properties;
=
/**
@@ -137,29 +138,25 @@
}
=
/**
- * @hibernate.property column=3D"ismdata_jahia_fields_data"
- * length=3D"11"
- * @return
+ * @hibernate.property column=3D"id_jahia_obj"
*/
- public Integer getIsMetadata() {
- return isMetadata;
+ public Integer getMetadataOwnerId() {
+ return metadataOwnerId;
}
=
- public void setIsMetadata(Integer isMetadata) {
- this.isMetadata =3D isMetadata;
+ public void setMetadataOwnerId(Integer metadataOwner) {
+ this.metadataOwnerId =3D metadataOwner;
}
=
/**
- * @hibernate.many-to-one not-null=3D"false" class=3D"org.jahia.hibern=
ate.model.JahiaObject"
- * @hibernate.column name=3D"id_jahia_obj"
- * @hibernate.column name=3D"type_jahia_obj"
+ * @hibernate.property column=3D"type_jahia_obj" length=3D"22"
*/
- public JahiaObject getMetadataOwner() {
- return metadataOwner;
+ public String getMetadataOwnerType() {
+ return metadataOwnerType;
}
=
- public void setMetadataOwner(JahiaObject metadataOwner) {
- this.metadataOwner =3D metadataOwner;
+ public void setMetadataOwnerType(String metadataOwner) {
+ this.metadataOwnerType =3D metadataOwner;
}
=
/**
@@ -194,15 +191,14 @@
}
=
/**
- * @hibernate.many-to-one not-null=3D"true"
- * @hibernate.column name=3D"jahiaid_jahia_fields_data"
+ * @hibernate.property column=3D"jahiaid_jahia_fields_data"
*/
- 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 site) {
+ this.siteId =3D site;
}
=
/**
@@ -296,11 +292,11 @@
data.setConnectType(this.getConnectType());
data.setContainerId(this.getContainerId());
data.setFieldDefinition(this.getFieldDefinition());
- data.setIsMetadata(this.getIsMetadata());
- data.setMetadataOwner(this.getMetadataOwner());
+ data.setMetadataOwnerId(this.getMetadataOwnerId());
+ data.setMetadataOwnerType(this.getMetadataOwnerType());
data.setJahiaAclId(this.getJahiaAclId());
data.setPageId(this.getPageId());
- data.setSite(this.getSite());
+ data.setSiteId(this.getSiteId());
data.setType(this.getType());
data.setValue(this.getValue());
return data;
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDataPK.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaFieldsDataPK.java&rev=3D17899&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/JahiaFieldsDataPK.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDataPK.java Fr=
i Jul 6 12:26:29 2007
@@ -104,7 +104,7 @@
=
/**
* @hibernate.property column=3D"language_code"
- * length=3D"250"
+ * length=3D"10"
*/
public String getLanguageCode() {
return this.languageCode;
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesDataPK.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaPagesDataPK.java&rev=3D17899&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/JahiaPagesDataPK.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesDataPK.java Fri=
Jul 6 12:26:29 2007
@@ -104,7 +104,7 @@
=
/**
* @hibernate.property column=3D"language_code"
- * length=3D"250"
+ * length=3D"10"
*/
public String getLanguageCode() {
return this.languageCode;
Modified: trunk/core/src/java/org/jahia/services/fields/ContentField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/fields/ContentField.java&rev=3D17899&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/services/fields/ContentField.java (origin=
al)
+++ trunk/core/src/java/org/jahia/services/fields/ContentField.java Fri Jul=
6 12:26:29 2007
@@ -2034,7 +2034,7 @@
return buff.toString();
}
=
- public boolean checkAccess(JahiaUser user, int permission) {
+ public boolean checkAccess(JahiaUser user, int permission, boolean che=
ckChilds) {
if (containerID > 0) {
// We must get the acl associated with the container list
try {
@@ -2055,6 +2055,7 @@
}
}
} catch (JahiaException e) {
+ logger.error("Cannot check acl on field"+ this.getID(), e);
}
}
return super.checkAccess(user, permission,false);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
