Author: sshyrkov
Date: Tue Oct 30 10:10:10 2007
New Revision: 19000
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19000&repname=
=3Djahia
Log:
[trunk r18987] - containers filter, sort optimization.
- container query tag to generate container filter/search/sort using standa=
rd container definition.
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/qu=
ery/
- copied from r18987, trunk/core/src/java/org/jahia/data/beans/query/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/qu=
ery/ContainerQueryBean.java
- copied unchanged from r18987, trunk/core/src/java/org/jahia/data/be=
ans/query/ContainerQueryBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/qu=
ery/ContainerQueryFactory.java
- copied unchanged from r18987, trunk/core/src/java/org/jahia/data/be=
ans/query/ContainerQueryFactory.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/qu=
ery/QueryContext.java
- copied unchanged from r18987, trunk/core/src/java/org/jahia/data/be=
ans/query/QueryContext.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query/
- copied from r18987, trunk/core/src/java/org/jahia/taglibs/query/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ContainerQueryTag.java
- copied unchanged from r18987, trunk/core/src/java/org/jahia/taglibs=
/query/ContainerQueryTag.java
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerMetadataFilterBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerFactory.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/MetadataBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/MetadataService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/AbstractLuceneSearchIndexer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/c=
ontent.tld
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/co=
ntainers/ContainerMetadataFilterBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/containers/ContainerMetadataFilte=
rBean.java&rev=3D19000&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerMetadataFilterBean.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerMetadataFilterBean.java Tue Oct 30 10:10:10 2007
@@ -458,6 +458,7 @@
int i =3D 0;
while ( (i<nbVals) && !match ){
v =3D (String)vals[i];
+ i++;
int size =3D this.getClauses().size();
int j =3D 0;
while ( (j<size) && !match )
@@ -482,8 +483,8 @@
getContentDefinitionInstance(
contentObject.getDefinitionKey(this
.getEntryLoadRequest()));
- if ( contentDefinition !=3D null &&
- containerDefinitionName.equals(conten=
tDefinition.getName()) ){
+ if ( containerDefinitionName =3D=3D null |=
| (contentDefinition !=3D null &&
+ containerDefinitionName.equals(conten=
tDefinition.getName())) ){
result.set(contentObject.getID());
}
} catch ( Throwable t ){
@@ -570,8 +571,8 @@
getContentDefinitionInstance(
contentObject.getDefinitionKey(this
.getEntryLoadRequest()));
- if ( contentDefinition !=3D null &&
- containerDefinitionName.equals(conten=
tDefinition.getName()) ){
+ if ( containerDefinitionName =3D=3D null |=
| ( contentDefinition !=3D null &&
+ containerDefinitionName.equals(conten=
tDefinition.getName()) ) ){
result.set(contentObject.getID());
}
} catch ( Throwable t ){
@@ -617,6 +618,7 @@
SoapParamBean jParams =3D new SoapParamBean(site, user);
int fieldId =3D 0;
JahiaField jahiaField =3D null;
+ Object objectItem =3D null;
for ( int i=3D0 ; i<objectKeys.size() ; i++ ){
objectKey =3D (ObjectKey)objectKeys.get(i);
fieldId =3D Integer.parseInt(objectKey.getIDInType());
@@ -624,7 +626,14 @@
.loadField(fieldId,LoadFlags.ALL,jParams,this.get=
EntryLoadRequest());
if ( jahiaField !=3D null ){
if (siteId =3D=3D -1 || jahiaField.getSiteID() =3D=3D site=
Id) {
+ if ( jahiaField instanceof JahiaDateField ){
+ objectItem =3D jahiaField.getObject();
+ if ( objectItem !=3D null ){
+ fieldValue =3D objectItem.toString();
+ }
+ } else {
fieldValue =3D jahiaField.getRawValue();
+ }
if (fieldValue !=3D null) {
datas.put(objectKey, fieldValue);
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/containers/ContainerFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/containers/ContainerFactory.j=
ava&rev=3D19000&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerFactory.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerFactory.java Tue Oct 30 10:10:10 2007
@@ -18,6 +18,7 @@
=
package org.jahia.services.containers;
=
+import org.jahia.bin.Jahia;
import org.jahia.content.ContentContainerKey;
import org.jahia.content.CoreFilterNames;
import org.jahia.data.containers.*;
@@ -25,6 +26,7 @@
import org.jahia.data.search.JahiaSearchResult;
import org.jahia.exceptions.JahiaException;
import org.jahia.hibernate.manager.*;
+import org.jahia.hibernate.model.JahiaAcl;
import org.jahia.params.ParamBean;
import org.jahia.params.ProcessingContext;
import org.jahia.params.SessionState;
@@ -35,7 +37,6 @@
import org.jahia.services.search.JahiaSearcher;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
-import org.jahia.bin.Jahia;
import org.springframework.context.ApplicationContext;
=
import java.util.*;
@@ -754,109 +755,71 @@
// start check for correct rights.
if (jParams !=3D null) { // no jParams, can't check for rights
=
- // Check container ACL access.
- Map acls =3D new Hashtable();
if (ctnids.size() > 0) {
-
-// JahiaACLManagerService.getInstance()
-// .preloadContainerACLsByPage(theContainerList.getPage=
ID());
-
-// JahiaACLManagerService.getInstance()
-// .preloadFieldACLsByPage(theContainerList.getPageID()=
);
-
// Check for expired container
boolean disableTimeBasedPublishingFilter =3D jParams.isFil=
terDisabled(CoreFilterNames.
TIME_BASED_PUBLISHING_FILTER);
=
-// if ((theContainerList.getID() > 0)) {
-// acls =3D containerManager.getAllContainersAclid(theC=
ontainerList.getID());
-// }
-// if (acls =3D=3D null) {
- acls =3D new Hashtable();
-// }
+ // lets set the full size of the data for the container li=
st.
+ theContainerList.setFullSize(ctnids.size());
+
+ // init the container list pagination
+ JahiaContainerListPagination cListPagination =3D new Jahia=
ContainerListPagination(theContainerList, jParams, -1);
+ theContainerList.setCtnListPagination(cListPagination);
+
+ int startPos =3D 0;
+ int endPos =3D cListPagination.getSize();
+
+ if (cListPagination.isValid()) {
+ startPos =3D cListPagination.getFirstItemIndex();
+ endPos =3D cListPagination.getLastItemIndex();
+ }
+ if (endPos < cListPagination.getSize()) {
+ endPos +=3D 1;
+ }
+
Vector v =3D new Vector();
int size =3D ctnids.size();
+ Integer ctnID =3D null;
+ int aclID =3D 0;
+ JahiaAcl acl =3D null;
+ JahiaObjectDelegate delegate =3D null;
for (int i =3D 0; i < size; i++) {
try {
- final Integer ctnID =3D (Integer) ctnids.get(i);
- Integer aclID =3D (Integer) acls.get(ctnID);
- if (aclID =3D=3D null) {
- aclID =3D new Integer(containerManager.getCont=
ainerACLID(ctnID.intValue()));
- }
- final JahiaBaseACL acl =3D new JahiaBaseACL(aclID.=
intValue());
- if (acl.getPermission(currentUser, JahiaBaseACL.RE=
AD_RIGHTS)) {
- if (! v.contains(ctnID)) v.add(ctnID);
- if (acl.getPermission(currentUser, JahiaBaseAC=
L.WRITE_RIGHTS)) {
- if (! res.contains(ctnID) && ctnID.intValu=
e() !=3D -1) res.add(ctnID);
- }
- }
- } catch (Throwable t) {
- logger.error(t, t);
- }
- }
- ctnids =3D v;
- if ( ctnids.size()>0 && !disableTimeBasedPublishingFilter
- && (ParamBean.NORMAL.equals(jParams.getOperationMo=
de()))){
- // @todo: complete time based publishing a=
nd Preview mode
- //|| ParamBean.PREVIEW.equals(jParams.getO=
perationMode())) ) {
- Set allowedObjects =3D new HashSet();
- JahiaObjectDelegate delegate =3D null;
- for (Iterator iterator =3D ctnids.iterator(); iterator=
.hasNext();) {
- Integer id =3D (Integer) iterator.next();
+ ctnID =3D (Integer) ctnids.get(i);
+ aclID =3D containerManager.getContainerACLID(ctnID=
.intValue());
+ acl =3D ServicesRegistry.getInstance().getJahiaACL=
ManagerService().lookupACL(aclID);
+ if (acl!=3D null && acl.getPermission(currentUser,=
JahiaBaseACL.READ_RIGHTS)) {
+ if ( !disableTimeBasedPublishingFilter
+ && ParamBean.NORMAL.equals(jParams.getOper=
ationMode()) ){
if ( Jahia.getSettings().isBatchLoadingEnabled() ){
delegate =3D jahiaObjectManager
- .getJahiaObjectDelegate(new ContentContain=
erKey(id.intValue()),
+ .getJahiaObjectDelegate(new Conten=
tContainerKey(ctnID.intValue()),
Jahia.getSettings().getBatchLoadin=
gSize());
} else {
delegate =3D jahiaObjectManager
- .getJahiaObjectDelegate(new ContentContain=
erKey(id.intValue()));
+ .getJahiaObjectDelegate(new Conten=
tContainerKey(ctnID.intValue()));
}
- if ( delegate !=3D null && delegate.isValid()){
- allowedObjects.add(new Integer(delegate.getObj=
ectKey().getIdInType()));
+ if ( delegate =3D=3D null || !delegate.isV=
alid()){
+ continue;
}
}
- v =3D new Vector();
- Vector res2 =3D new Vector();
- size =3D ctnids.size();
- for (int i =3D 0; i < size; i++) {
- final Integer ctnID =3D (Integer) ctnids.get(i);
- if ( allowedObjects.contains(ctnID) ){
- v.add(ctnID);
- if (res.contains(ctnID)){
- res2.add(ctnID);
+ if (!v.contains(ctnID)) v.add(ctnID);
+
+ if ( i > endPos + 100 ){
+ break;
}
+ if (acl.getPermission(currentUser, JahiaBaseAC=
L.WRITE_RIGHTS)) {
+ if (!res.contains(ctnID) && ctnID.intValue=
() !=3D -1) res.add(ctnID);
}
}
- ctnids =3D v;
- res =3D res2;
+ } catch (Throwable t) {
+ logger.error(t, t);
}
}
- }
-
- final Vector v =3D new Vector();
- final Map loadedContainers =3D new HashMap();
- for (int i =3D 0; i < ctnids.size(); i++) {
- int ctnid =3D ((Integer) ctnids.elementAt(i)).intValue();
- try {
- final JahiaContainer thisContainer =3D jahiaContainersServ=
ice.loadContainer(ctnid, loadFlag, jParams, loadVersion,
- cachedFieldsInContainer,
- cachedContainerListsFromContainers,
- cachedContainerListsFromContainers);
- if (thisContainer !=3D null && thisContainer.getID() !=3D =
-1) { // no read rights on this container
- v.add(new Integer(ctnid));
- loadedContainers.put(new Integer(ctnid), thisContainer=
);
- }
- } catch (Throwable t) {
- String errorMsg =3D "Error loading container [" + ctnid + =
"]";
- if (loadVersion !=3D null) {
- errorMsg +=3D " loadVersion=3D" + loadVersion.toString=
();
- }
- logger.debug(errorMsg);
+ ctnids =3D v;
}
}
- ctnids =3D v;
-
- //List containers =3D jahiaContainersService.loadContainers(ctnids=
,loadFlag,jParams,loadVersion);
=
// lets set the full size of the data for the container list.
theContainerList.setFullSize(ctnids.size());
@@ -879,18 +842,19 @@
JahiaContainer thisContainer =3D null;
for (int i =3D startPos; i < endPos; i++) {
int ctnid =3D ((Integer) ctnids.elementAt(i)).intValue();
- /*
- if (thisContainer =3D=3D null) {
- // should not
- thisContainer =3D jahiaContainersService.loadContainer=
(ctnid, loadFlag, jParams, loadVersion,
- cachedFieldsInContainer, cachedContainerListsF=
romContainers,
- cachedContainerListsFromContainers);
+ try {
+ thisContainer =3D jahiaContainersService.loadContainer(ctn=
id, loadFlag, jParams, loadVersion,
+ cachedFieldsInContainer,
+ cachedContainerListsFromContainers,
+ cachedContainerListsFromContainers);
+ } catch (Throwable t) {
+ String errorMsg =3D "Error loading container [" + ctnid + =
"]";
+ if (loadVersion !=3D null) {
+ errorMsg +=3D " loadVersion=3D" + loadVersion.toString=
();
}
- if (thisContainer !=3D null && thisContainer.getID() !=3D =
-1) { // no read rights on this container
- theContainerList.addContainer(thisContainer);
- }*/
+ logger.debug(errorMsg);
+ }
=
- thisContainer =3D (JahiaContainer)loadedContainers.get(new Int=
eger(ctnid));
if (thisContainer !=3D null && thisContainer.getID() !=3D -1) =
{ // no read rights on this container
theContainerList.addContainer(thisContainer);
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/metadata/MetadataBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/metadata/MetadataBaseService.=
java&rev=3D19000&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/MetadataBaseService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/MetadataBaseService.java Tue Oct 30 10:10:10 2007
@@ -47,7 +47,8 @@
private static org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger (MetadataBaseService.class);
=
- static private String GET_METADATA_FIELDS_BY_NAME =3D "SELECT DISTINCT=
a.id_jahia_fields_data FROM jahia_fields_data a, jahia_fields_def b WHERE =
a.ismdata_jahia_fields_data=3D1 AND a.fielddefid_jahia_fields_data=3Db.id_j=
ahia_fields_def AND b.name_jahia_fields_def=3D?";
+ static private String GET_METADATA_FIELDS_BY_NAME =3D "SELECT DISTINCT=
a.id_jahia_fields_data FROM jahia_fields_data a, jahia_fields_def b WHERE =
b.ismdata_jahia_fields_def=3D1 AND a.fielddefid_jahia_fields_data=3Db.id_ja=
hia_fields_def AND b.name_jahia_fields_def=3D?";
+ static private String GET_METADATA_FIELDS_BY_NAME_AND_BY_SITEID =3D "S=
ELECT DISTINCT a.id_jahia_fields_data FROM jahia_fields_data a, jahia_field=
s_def b WHERE b.ismdata_jahia_fields_def=3D1 AND a.jahiaid_jahia_fields_dat=
a=3D? a.fielddefid_jahia_fields_data=3Db.id_jahia_fields_def AND b.name_jah=
ia_fields_def=3D?";
=
static private MetadataBaseService instance =3D null;
=
@@ -348,7 +349,20 @@
*/
public ArrayList getMetadataByName(String name)
throws JahiaException {
+ return getMetadataByName(name,-1);
+ }
=
+ /**
+ * Returns an array of ObjectKey that are metadatas of a given site
+ *
+ * @param name String, the metadata name
+ * @param siteId, the site id
+ * @throws JahiaException
+ * @return ArrayList
+ * @throws JahiaException
+ */
+ public ArrayList getMetadataByName(String name, int siteId)
+ throws JahiaException {
ArrayList metadatas =3D new ArrayList();
=
if ( name =3D=3D null ){
@@ -362,8 +376,14 @@
try {
=
dbConn =3D org.jahia.services.database.ConnectionDispenser.get=
Connection ();
+ if ( siteId > 0 ){
+ stmt =3D dbConn.prepareStatement (GET_METADATA_FIELDS_BY_N=
AME_AND_BY_SITEID);
+ stmt.setInt(1, siteId);
+ stmt.setString (2, name);
+ } else {
stmt =3D dbConn.prepareStatement (GET_METADATA_FIELDS_BY_NAME);
stmt.setString (1, name);
+ }
rs =3D stmt.executeQuery ();
=
while (rs.next()) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/metadata/MetadataService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/metadata/MetadataService.java=
&rev=3D19000&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/MetadataService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/MetadataService.java Tue Oct 30 10:10:10 2007
@@ -151,5 +151,17 @@
public abstract ArrayList getMetadataByName(String name)
throws JahiaException;
=
+ /**
+ * Returns an array of ObjectKey that are metadatas of a given site
+ *
+ * @param name String, the metadata name
+ * @param siteId, the site id
+ * @throws JahiaException
+ * @return ArrayList
+ * @throws JahiaException
+ */
+ public abstract ArrayList getMetadataByName(String name, int siteId)
+ throws JahiaException;
+
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/search/lucene/AbstractLuceneSearchIndexer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/search/lucene/AbstractLuceneS=
earchIndexer.java&rev=3D19000&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/AbstractLuceneSearchIndexer.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/AbstractLuceneSearchIndexer.java Tue Oct 30 10:10:10 2007
@@ -72,7 +72,7 @@
=
private long optimizationInterval;
=
- private long luceneCommitLockTimeOut =3D IndexWriter.COMMIT_LOCK_TIMEO=
UT;
+ private long luceneCommitLockTimeOut =3D 10000;
private long luceneWriteLockTimeOut =3D IndexWriter.WRITE_LOCK_TIMEOUT;
private int luceneMergeFactor =3D IndexWriter.DEFAULT_MERGE_FACTOR;
private int luceneMinMergeDocs =3D 10;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/tag=
libs/content.tld
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/content.tld&rev=3D19000&re=
pname=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-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/c=
ontent.tld (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/c=
ontent.tld Tue Oct 30 10:10:10 2007
@@ -163,6 +163,42 @@
tags for Jahia containers -->
=
<tag>
+ <name>containerQuery</name>
+ <tagclass>org.jahia.taglibs.query.ContainerQueryTag</tagclass>
+ <info>Used to build ContainerQueryBean</info>
+ <attribute>
+ <name>listName</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>queryContextWholeSiteFiltering</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>queryContextContainerListId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>queryContextSiteId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>queryContextDefinitionName</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>containerList</name>
<tagclass>org.jahia.taglibs.container.ContainerListTag</tagclass>
<info>Displays a container list</info>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
