You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2005/12/20 12:21:32 UTC
svn commit: r357963 - in /incubator/jackrabbit/trunk/contrib:
bdb-persistence/applications/test/ examples/src/repo/
jca/applications/test/ jcr-commands/applications/test/
jcr-server/webapp/src/webapp/WEB-INF/repository/
jcrtaglib/src/examples/web/WEB-I...
Author: mreutegg
Date: Tue Dec 20 03:21:15 2005
New Revision: 357963
URL: http://svn.apache.org/viewcvs?rev=357963&view=rev
Log:
JCR-257: Use separate index for jcr:system tree
Modified:
incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml
incubator/jackrabbit/trunk/contrib/examples/src/repo/repository.xml
incubator/jackrabbit/trunk/contrib/jca/applications/test/repository.xml
incubator/jackrabbit/trunk/contrib/jcr-commands/applications/test/repository.xml
incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/repository/repository.xml
incubator/jackrabbit/trunk/contrib/jcrtaglib/src/examples/web/WEB-INF/repository.xml
incubator/jackrabbit/trunk/contrib/orm-persistence/applications/test/repository.xml
incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/content-repository/repository.xml
Modified: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml Tue Dec 20 03:21:15 2005
@@ -30,7 +30,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -203,4 +203,18 @@
<PersistenceManager class="org.apache.jackrabbit.core.state.bdb.BerkeleyDBPersistenceManager"/>
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/examples/src/repo/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/examples/src/repo/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/examples/src/repo/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/examples/src/repo/repository.xml Tue Dec 20 03:21:15 2005
@@ -22,4 +22,7 @@
</FileSystem>
<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager" />
</Versioning>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/jca/applications/test/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jca/applications/test/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jca/applications/test/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jca/applications/test/repository.xml Tue Dec 20 03:21:15 2005
@@ -30,7 +30,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -230,4 +230,18 @@
<PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/jcr-commands/applications/test/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-commands/applications/test/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-commands/applications/test/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-commands/applications/test/repository.xml Tue Dec 20 03:21:15 2005
@@ -30,7 +30,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -224,4 +224,18 @@
<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/repository/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/repository/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/repository/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/webapp/src/webapp/WEB-INF/repository/repository.xml Tue Dec 20 03:21:15 2005
@@ -28,7 +28,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -189,4 +189,18 @@
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/jcrtaglib/src/examples/web/WEB-INF/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcrtaglib/src/examples/web/WEB-INF/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcrtaglib/src/examples/web/WEB-INF/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcrtaglib/src/examples/web/WEB-INF/repository.xml Tue Dec 20 03:21:15 2005
@@ -30,7 +30,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -194,23 +194,9 @@
<!--
Search index and the file system it uses.
class: FQN of class implementing the QueryHandler interface
- Supported Parameters:
- - useCompoundFile: advises lucene to use compound files for the index files
- - minMergeDocs: minimum number of nodes in an index until segments are merged
- - maxMergeDocs: maximum number of nodes in segments that will be merged
- - mergeFactor: determines how often segment indices are merged
- - bufferSize: maximum number of documents that are held in a pending queue until added to the index
-->
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="useCompoundFile" value="true"/>
- <param name="minMergeDocs" value="1000"/>
- <param name="maxMergeDocs" value="100000"/>
- <param name="mergeFactor" value="10"/>
- <param name="bufferSize" value="10"/>
-
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${wsp.home}/index"/>
- </FileSystem>
+ <param name="path" value="${wsp.home}/index"/>
</SearchIndex>
</Workspace>
@@ -244,4 +230,18 @@
<PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/orm-persistence/applications/test/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/orm-persistence/applications/test/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/orm-persistence/applications/test/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/orm-persistence/applications/test/repository.xml Tue Dec 20 03:21:15 2005
@@ -30,7 +30,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -236,4 +236,18 @@
<PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>
Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/content-repository/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/content-repository/repository.xml?rev=357963&r1=357962&r2=357963&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/content-repository/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/content-repository/repository.xml Tue Dec 20 03:21:15 2005
@@ -31,7 +31,7 @@
a Versioning element that is used for configuring
versioning-related settings
-->
- <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
+ <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
<!--
a virtual file system
@@ -217,4 +217,18 @@
<PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager"/>
</Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+
+ The same parameters are supported as in the search index configuration
+ inside the workspace definition element.
+
+ This element is optional. If omitted, the /jcr:system tree will not be
+ indexed and no results will be returned for that tree!
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
</Repository>