Author: sshyrkov
Date: Mon Nov 26 19:38:52 2007
New Revision: 19295
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19295&repname=
=3Djahia
Log:
[trunk r19264]: provide a search based interpreter to translate a query mod=
el to a lucene query whenever possible.
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Contain=
erConstraintInterpreter.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/C=
ontainerConstraintInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Content=
DefinitionNameConstraint.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/C=
ontentDefinitionNameConstraint.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/QuerySe=
rvice.java
- copied, changed from r19264, trunk/core/src/java/org/jahia/query/Qu=
eryService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/RangeCo=
nstraint.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/R=
angeConstraint.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/
- copied from r19264, trunk/core/src/java/org/jahia/query/filtercreat=
or/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/AbstractFilterCreator.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/f=
iltercreator/AbstractFilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/DefaultFilterCreator.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/f=
iltercreator/DefaultFilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/FilterCreator.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/f=
iltercreator/FilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/SearchBasedFilterCreator.java
- copied unchanged from r19264, trunk/core/src/java/org/jahia/query/f=
iltercreator/SearchBasedFilterCreator.java
Removed:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/QueryModelToQueryBeanBuilder.java
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerSearcherToFilterAdapter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Constra=
intInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Literal=
.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/QueryMo=
delConstants.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registries/Se=
rvicesRegistry.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerQueryFactory.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSearcher.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ContainerQueryTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-services.xml
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/ContainerSearcherToFilterAdapter.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/containers/ContainerSearcherToFil=
terAdapter.java&rev=3D19295&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/ContainerSearcherToFilterAdapter.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerSearcherToFilterAdapter.java Mon Nov 26 19:38:52 2007
@@ -15,7 +15,7 @@
* Time: 09:28:23
* To change this template use File | Settings | File Templates.
*/
-public class ContainerSearcherToFilterAdapter implements ContainerFilterIn=
terface {
+public class ContainerSearcherToFilterAdapter implements ContainerFilterIn=
terface, MergeableFilter {
=
private ContainerSearcher searcher;
=
@@ -62,4 +62,43 @@
public void setSearcher(ContainerSearcher searcher) {
this.searcher =3D searcher;
}
+
+ /**
+ * A filter may be capable of merging with another filter instance for=
optimization.
+ *
+ * @param filter
+ * @return true if the merging is performed, false if no merging was p=
erformed.
+ *
+ */
+ public boolean mergeAnd(ContainerFilterInterface filter) {
+ if (!(filter instanceof ContainerSearcherToFilterAdapter)){
+ return false;
+ }
+ ContainerSearcherToFilterAdapter filterBean =3D (ContainerSearcher=
ToFilterAdapter)filter;
+ StringBuffer queryBuffer =3D new StringBuffer();
+ queryBuffer.append("(").append(this.getSearcher().getQuery()).appe=
nd(") ").append(" AND ");
+ queryBuffer.append("(").append(filterBean.getSearcher().getQuery()=
).append(")");
+ this.searcher.setQuery(queryBuffer.toString());
+ return true;
+ }
+
+ /**
+ * A filter may be capable of merging with another filter instance for=
optimization.
+ *
+ * @param filter
+ * @return true if the merging is performed, false if no merging was p=
erformed.
+ *
+ */
+ public boolean mergeOr(ContainerFilterInterface filter) {
+ if (!(filter instanceof ContainerSearcherToFilterAdapter)){
+ return false;
+ }
+ ContainerSearcherToFilterAdapter filterBean =3D (ContainerSearcher=
ToFilterAdapter)filter;
+ StringBuffer queryBuffer =3D new StringBuffer();
+ queryBuffer.append("(").append(this.getSearcher().getQuery()).appe=
nd(") ").append(" OR ");
+ queryBuffer.append("(").append(filterBean.getSearcher().getQuery()=
).append(")");
+ this.searcher.setQuery(queryBuffer.toString());
+ return true;
+ }
+
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/C=
onstraintInterpreter.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/query/ConstraintInterpreter.java&rev=
=3D19295&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/query/Constra=
intInterpreter.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Constra=
intInterpreter.java Mon Nov 26 19:38:52 2007
@@ -15,10 +15,13 @@
=
public void comparison(Comparison c) throws JahiaException;
=
+ public void range(RangeConstraint c) throws JahiaException;
+
public void fullTextSearch(FullTextSearch c) throws JahiaException;
=
public void not(Not c) throws JahiaException;
=
public void or(Or c) throws JahiaException;
=
+ public void contentDefinitionName(ContentDefinitionNameConstraint c) t=
hrows JahiaException;
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/L=
iteral.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/query/Literal.java&rev=3D19295&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/query/Literal=
.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Literal=
.java Mon Nov 26 19:38:52 2007
@@ -2,6 +2,7 @@
=
import org.jahia.utils.JahiaTools;
=
+import java.util.Iterator;
import java.util.List;
=
/**
@@ -31,6 +32,19 @@
if ( value =3D=3D null ){
return null;
}
+ if ( value instanceof String ){
+ return (String)value;
+ } else if ( value instanceof List ) {
+ StringBuffer buff =3D new StringBuffer();
+ Iterator it =3D ((List)value).iterator();
+ while(it.hasNext()){
+ buff.append(it.next().toString());
+ if (it.hasNext()){
+ buff.append(",");
+ }
+ }
+ return buff.toString();
+ }
return value.toString();
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Q=
ueryModelConstants.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/query/QueryModelConstants.java&rev=3D1=
9295&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/query/QueryMo=
delConstants.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/QueryMo=
delConstants.java Mon Nov 26 19:38:52 2007
@@ -32,5 +32,7 @@
public static final String LANGUAGE_CODES_PARAMS =3D "LANGUAGE_CODES";
public static final String SITE_IDS_PARAMS =3D "SITE_IDS";
public static final String SITE_LEVEL_QUERY_PARAMS =3D "SITE_LEVEL_QUE=
RY";
+
+ public static final String FILTER_CREATORS =3D "FILTER_CREATORS";
=
}
Copied: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/Que=
ryService.java (from r19264, trunk/core/src/java/org/jahia/query/QueryServi=
ce.java)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/query/QueryService.java&rev=3D19295&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
--- trunk/core/src/java/org/jahia/query/QueryService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/QuerySe=
rvice.java Mon Nov 26 19:38:52 2007
@@ -15,9 +15,6 @@
*/
public class QueryService extends JahiaService {
=
- private static org.apache.log4j.Logger logger =3D
- org.apache.log4j.Logger.getLogger(QueryService.class);
-
private static QueryService singletonInstance =3D null;
=
private String defaultFilterCreatorName;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registr=
ies/ServicesRegistry.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/registries/ServicesRegistry.java&rev=
=3D19295&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/registries/Se=
rvicesRegistry.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registries/Se=
rvicesRegistry.java Mon Nov 26 19:38:52 2007
@@ -73,6 +73,7 @@
import org.jahia.services.version.JahiaVersionService;
import org.jahia.services.webapps_deployer.JahiaWebAppsDeployerService;
import org.jahia.services.workflow.WorkflowService;
+import org.jahia.query.QueryService;
import org.jahia.settings.SettingsBean;
import org.springframework.beans.BeansException;
=
@@ -215,7 +216,6 @@
private static final String ESI_SOAP_INVALIDATOR_SERVICE =3D "EsiSOAPI=
nvalidatorService";
private static final String ESI_URL_GENERATOR_SERVICE =3D "EsiURLGener=
atorService";
=
-
// BEGIN [added by Pascal Aubry for CAS authentication]
private static final String CAS_SERVICE =3D "CasService";
// END [added by Pascal Aubry for CAS authentication]
@@ -576,6 +576,10 @@
return (JahiaTemplateManagerService) getService("JahiaTemplateMana=
gerService");
}
=
+ public QueryService getQueryService() {
+ return (QueryService) getService("QueryService");
+ }
+ =
// Nicol=C3=83=C2=A1s Charczewski - Neoris Argentina - 30/03/2006 - Be=
gin
public JahiaStatisticsManagerService getJahiaStatisticsService () {
return (JahiaStatisticsManagerService) getService(JAHIA_STATISTICS=
_SERVICE);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/containers/ContainerQueryFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/containers/ContainerQueryFact=
ory.java&rev=3D19295&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/ContainerQueryFactory.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerQueryFactory.java Mon Nov 26 19:38:52 2007
@@ -1,10 +1,9 @@
package org.jahia.services.containers;
=
-import org.jahia.data.containers.*;
-import org.jahia.services.containers.ContainerQueryBean;
-import org.jahia.services.containers.ContainerQueryContext;
+import org.jahia.data.containers.JahiaContainer;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
+import org.jahia.query.ContainerConstraintInterpreter;
import org.jahia.query.QueryModel;
=
/**
@@ -48,7 +47,7 @@
if ( queryModel =3D=3D null ){
return null;
}
- QueryModelToQueryBeanBuilder builder =3D new QueryModelToQueryBean=
Builder();
+ ContainerConstraintInterpreter builder =3D new ContainerConstraint=
Interpreter();
return builder.getContainerQueryBean(queryModel,queryContext,conte=
xt);
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/search/JahiaSearcher.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/search/JahiaSearcher.java&rev=
=3D19295&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/JahiaSearcher.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSearcher.java Mon Nov 26 19:38:52 2007
@@ -69,7 +69,7 @@
*
* @param query the last performed query.
*/
- protected void setQuery (String query) {
+ public void setQuery (String query) {
this.query =3D query;
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/query/ContainerQueryTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/query/ContainerQueryTag.java&r=
ev=3D19295&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/taglibs/query=
/ContainerQueryTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ContainerQueryTag.java Mon Nov 26 19:38:52 2007
@@ -40,6 +40,8 @@
=
private JahiaContainerList targetContainerList;
=
+ private String queryContextContainerListID;
+ =
private ContainerQueryBean queryBean;
=
private String queryBeanID;
@@ -84,6 +86,14 @@
this.queryModelBeanName =3D queryModelBeanName;
}
=
+ public String getQueryContextContainerListID() {
+ return queryContextContainerListID;
+ }
+
+ public void setQueryContextContainerListID(String queryContextContaine=
rListID) {
+ this.queryContextContainerListID =3D queryContextContainerListID;
+ }
+
public JahiaContainerList getQueryContainerList() {
return queryContainerList;
}
@@ -117,6 +127,11 @@
return null;
}
=
+ int queryContextCtnID =3D targetCtnListID;
+ if ( this.queryContextContainerListID !=3D null && !"".equals(this=
.queryContextContainerListID.trim()) ){
+ queryContextCtnID =3D Integer.parseInt(this.queryContextContai=
nerListID);
+ }
+
if (this.queryContainerList =3D=3D null) {
Properties localParameters =3D null;
QueryModel queryModel =3D null;
@@ -132,7 +147,7 @@
}
try {
ContainerQueryContext queryContext =3D ContainerQueryConte=
xt.getQueryContext(queryModel,
- targetCtnListID,localParameters);
+ queryContextCtnID,localParameters);
queryBean =3D queryFactory.getContainerQueryBean(queryMode=
l,queryContext,
jData.getProcessingContext());
} catch ( Throwable t ){
@@ -140,7 +155,7 @@
}
} else {
try {
- ContainerQueryContext queryContext =3D new ContainerQueryC=
ontext(targetCtnListID,
+ ContainerQueryContext queryContext =3D new ContainerQueryC=
ontext(queryContextCtnID,
JahiaTools.getTokensList(this.getContentDefinition=
Names(),","),
JahiaTools.getIntegerList(this.getSiteIDs(),","),
"true".equalsIgnoreCase(this.getSiteLevelQuery()));
@@ -222,6 +237,7 @@
queryModelBeanName =3D null;
targetContainerListName =3D null;
targetContainerListID =3D null;
+ queryContextContainerListID =3D null;
queryBean =3D null;
=
return result;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-services.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services=
.xml&rev=3D19295&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/webapp/WEB-INF/etc/spring/ap=
plicationcontext-services.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-services.xml Mon Nov 26 19:38:52 2007
@@ -1077,4 +1077,47 @@
</bean>
</property>
</bean>
+
+ <bean id=3D"defaultFilterCreator" class=3D"org.jahia.query.filtercreat=
or.DefaultFilterCreator">
+ <property name=3D"name">
+ <value>defaultFilterCreator</value>
+ </property>
+ </bean>
+ <bean id=3D"QueryService" parent=3D"proxyTemplate">
+ <property name=3D"target">
+ <bean class=3D"org.jahia.query.QueryService" parent=3D"jahiaSe=
rviceTemplate" factory-method=3D"getInstance">
+ <property name=3D"defaultFilterCreatorName">
+ <value>defaultFilterCreator</value>
+ </property>
+ <property name=3D"filterCreators">
+ <map>
+ <entry>
+ <key><value>defaultFilterCreator</value></key>
+ <ref bean=3D"defaultFilterCreator" />
+ </entry>
+ <!--entry>
+ <key><value>logsFilterCreator</value></key>
+ <bean class=3D"org.jahia.query.filtercreator.L=
ogsBasedFilterCreator">
+ <property name=3D"name">
+ <value>logsFilterCreator</value>
+ </property>
+ </bean>
+ </entry-->
+ <entry>
+ <key><value>searchFilterCreator</value></key>
+ <bean class=3D"org.jahia.query.filtercreator.S=
earchBasedFilterCreator">
+ <property name=3D"name">
+ <value>searchFilterCreator</value>
+ </property>
+ </bean>
+ </entry>
+ </map>
+ </property>
+ <property name=3D"defaultFilterCreator">
+ <ref bean=3D"defaultFilterCreator" />
+ </property>
+ </bean>
+ </property>
+ </bean>
+ =
</beans>
\ No newline at end of file
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=3D19295&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 Mon Nov 26 19:38:52 2007
@@ -306,6 +306,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>queryContextContainerListID</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
<attribute>
<name>siteIDs</name>
<required>false</required>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
