[portal-commits] JBoss Portal SVN: r11799 - in branches/JBoss_Portal_Branch_2_7: build and 7 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Wed Sep 3 18:47:47 EDT 2008
Author: sohil.shah at jboss.com
Date: 2008-09-03 18:47:47 -0400 (Wed, 03 Sep 2008)
New Revision: 11799
Removed:
branches/JBoss_Portal_Branch_2_7/cms/
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/build/build.xml
branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/search/build.xml
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java
Log:
integrating with the new cms module based on upgraded jackrabbit-1.4
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -46,9 +46,10 @@
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0.4"/>
+ <componentref name="jboss-portal/modules/cms" version="trunk-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
- <componentref name="jackrabbit" version="1.1.1"/>
+ <componentref name="jackrabbit" version="1.4"/>
<componentref name="apache-beanutils" version="1.7.0"/>
<componentref name="apache-codec" version="1.3.0"/>
<componentref name="apache-collections" version="3.1"/>
@@ -57,8 +58,8 @@
<componentref name="apache-httpclient" version="3.0.1"/>
<componentref name="apache-lang" version="2.1"/>
<componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
- <componentref name="apache-lucene" version="1.4.3"/>
+ <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
+ <componentref name="apache-lucene" version="2.2.0"/>
<componentref name="apache-net" version="1.4.1"/>
<componentref name="apache-xerces" version="2.7.1"/>
<componentref name="asm" version="1.5.3"/>
@@ -101,7 +102,7 @@
<componentref name="qdox" version="1.4"/>
<componentref name="trove" version="1.0.2"/>
<componentref name="sleepycat" version="3.0.12"/>
- <componentref name="slf4j" version="1.0.2"/>
+ <componentref name="slf4j" version="1.3.0"/>
<componentref name="stax-api" version="1.0"/>
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2-portal"/>
@@ -118,7 +119,7 @@
<componentref name="tagsoup" version="1.2"/>
<componentref name="portlet" version="2.0-Draft32"/>
<componentref name="sun-jstl" version="1.2"/>
- <componentref name="jboss/web" version="2.1.0.GA"/>
+ <componentref name="jboss/web" version="2.1.0.GA"/>
</build>
<synchronizeinfo/>
Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -117,8 +117,7 @@
<module name="api"/>
<module name="server"/>
<module name="portlet-server"/>
- <module name="theme"/>
- <module name="cms"/>
+ <module name="theme"/>
<module name="core"/>
<module name="core-cms"/>
<module name="core-management"/>
@@ -138,13 +137,9 @@
<group name="portal">
<include
- modules="api, jems, server, security, search, portlet-server, faces, theme, workflow, registration, core, cms, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/>
+ modules="api, jems, server, security, search, portlet-server, faces, theme, workflow, registration, core, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/>
</group>
- <group name="cms">
- <include modules="jems, workflow, cms"/>
- </group>
-
<group name="security">
<include modules="jems, security"/>
</group>
@@ -370,10 +365,7 @@
</packageset>
<packageset dir="../theme/src/main">
<exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../cms/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
+ </packageset>
<packageset dir="../core/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -119,12 +119,13 @@
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
<path refid="jbpm.jpdl.classpath"/>
+ <!-- cms module -->
+ <path refid="jboss.portal/modules/cms.classpath"/>
</path>
<!-- Configure modules -->
<call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <path refid="jboss.portal-cms.classpath"/>
+ <path id="dependentmodule.classpath">
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-search.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
@@ -248,23 +249,25 @@
<fileset dir="${build.resources}/portal-cms-sar"/>
</copy>
<copy todir="${build.resources}/portal-cms/lib">
+ <!-- portal cms -->
<fileset dir="${build.lib}" includes="portal-core-cms-lib.jar"/>
- <fileset dir="${jboss.portal-cms.root}/lib" includes="portal-cms-lib.jar"/>
- <fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
- <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
- <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
- <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
+ <fileset dir="${jboss.portal/modules/cms.lib}" includes="cms-jackrabbit-trunk-SNAPSHOT.jar"/>
+
+ <!-- jcr/jackrabbit integration -->
+ <fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
+ <fileset dir="${jackrabbit.jackrabbit.lib}"/>
<!-- cms indexing integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/>
<fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/>
-
- <!-- cms optimization integration - this contains a clustered cache enabled version -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <!-- cms optimization integration - this contains a clustered cache enabled version -->
<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
<fileset dir="${jboss.cache.lib}" includes="jboss-cache-jdk50.jar"/>
- <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
+
+ <!-- miscellaneous thirdparty dep -->
+ <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
+ <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
+ <fileset dir="${slf4j.slf4j.lib}"/>
</copy>
<!-- portal-cms.war -->
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -128,18 +128,18 @@
<!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${wsp.home}/index"/>
- <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/>
- <param name="useCompoundFile" value="true"/>
- <param name="minMergeDocs" value="100"/>
- <param name="volatileIdleTime" value="3"/>
- <param name="maxMergeDocs" value="100000"/>
- <param name="mergeFactor" value="10"/>
- <param name="bufferSize" value="10"/>
- <param name="cacheSize" value="1000"/>
- <param name="forceConsistencyCheck" value="false"/>
- <param name="autoRepair" value="true"/>
- </SearchIndex>
+ <param name="path" value="${wsp.home}/index"/>
+ <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.HTMLTextExtractor"/>
+ <param name="useCompoundFile" value="true"/>
+ <param name="minMergeDocs" value="100"/>
+ <param name="volatileIdleTime" value="3"/>
+ <param name="maxMergeDocs" value="100000"/>
+ <param name="mergeFactor" value="10"/>
+ <param name="bufferSize" value="10"/>
+ <param name="cacheSize" value="1000"/>
+ <param name="forceConsistencyCheck" value="false"/>
+ <param name="autoRepair" value="true"/>
+ </SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/versions">
<!--
Modified: branches/JBoss_Portal_Branch_2_7/search/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/build.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -175,14 +175,14 @@
<target name="most" depends="_default:most"/>
<target name="help" depends="_default:help"/>
- <target name="tests" depends="init">
+ <target name="tests" depends="compile">
<execute-tests>
<x-test>
- <test todir="${test.reports}" name="org.jboss.portal.search.test.LuceneQueryTest"/>
+ <test todir="${test.reports}" name="org.jboss.portal.search.test.ConverterTest"/>
<test todir="${test.reports}" name="org.jboss.portal.search.test.FederationTest"/>
</x-test>
<x-classpath>
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -49,7 +49,8 @@
{
try
{
- luceneQuery = QueryParser.parse(queryString, "all", new StandardAnalyzer());
+ QueryParser queryParser = new QueryParser("all" , new StandardAnalyzer());
+ luceneQuery = queryParser.parse(queryString);
}
catch (ParseException e)
{
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -56,7 +56,7 @@
org.apache.lucene.search.BooleanClause luceneClause = luceneClauses[i];
try
{
- clauses.add(new BooleanClause((SimpleQuery)convert(luceneClause.query), luceneClause.required, luceneClause.prohibited));
+ clauses.add(new BooleanClause((SimpleQuery)convert(luceneClause.getQuery()), luceneClause.isRequired(), luceneClause.isProhibited()));
}
catch (QueryConversionException e)
{
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -77,9 +77,9 @@
{
result.append(", ");
}
- if (!clause.prohibited)
+ if (!clause.isProhibited())
{
- result.append(((JCRQuery)convert(clause.query)).getJcrQuery());
+ result.append(((JCRQuery)convert(clause.getQuery())).getJcrQuery());
first = false;
}
}
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -92,11 +92,11 @@
Document doc = new Document();
if (genericDoc.getTitle() != null)
{
- doc.add(Field.Text("title", genericDoc.getTitle()));
+ doc.add(new Field("title", genericDoc.getTitle(), Field.Store.YES, Field.Index.TOKENIZED));
}
if (genericDoc.getDate() != 0)
{
- doc.add(Field.Text("date", genericDoc.getDate() + ""));
+ doc.add(new Field("date", genericDoc.getDate() + "", Field.Store.YES, Field.Index.TOKENIZED));
}
if (genericDoc.getFields() != null)
{
@@ -105,7 +105,7 @@
while (itKeys.hasNext())
{
String key = (String)itKeys.next();
- doc.add(Field.Text(key, (String)map.get(key)));
+ doc.add(new Field(key, (String)map.get(key), Field.Store.YES, Field.Index.TOKENIZED));
}
}
documents.add(doc);
More information about the portal-commits
mailing list