You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ma...@apache.org on 2009/08/02 19:50:35 UTC
svn commit: r800118 - in /jackrabbit/sandbox/JCR-1456/jackrabbit-core: ./
src/test/repository-descriptor-overlay/
src/test/repository-descriptor-overlay/workspaces/
src/test/repository-descriptor-overlay/workspaces/default/
src/test/repository-descript...
Author: martijnh
Date: Sun Aug 2 17:50:34 2009
New Revision: 800118
URL: http://svn.apache.org/viewvc?rev=800118&view=rev
Log:
JCR-1456 Database connection pooling
* Added an overlay for the repository descriptors used during tests
* Added a profile to use the overlay config
Added:
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/
jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/workspace.xml
Modified:
jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml?rev=800118&r1=800117&r2=800118&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml Sun Aug 2 17:50:34 2009
@@ -242,4 +242,138 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>use-descriptor-overlay</id>
+ <properties>
+ <config.db.name>jackrabbit</config.db.name>
+ <!-- DB specific properties which are used for filtering -->
+ <config.db.fsclass>org.apache.jackrabbit.core.fs.db.DbFileSystem</config.db.fsclass>
+ <config.db.dsclass>org.apache.jackrabbit.core.data.db.DbDataStore</config.db.dsclass>
+ <config.db.pmclass>org.apache.jackrabbit.core.persistence.bundle.MySqlPersistenceManager</config.db.pmclass>
+ <config.db.journalclass>org.apache.jackrabbit.core.journal.DatabaseJournal</config.db.journalclass>
+ <config.db.schema>mysql</config.db.schema>
+ <config.db.user>user</config.db.user>
+ <config.db.pwd>pwd</config.db.pwd>
+ <config.db.driver>com.mysql.jdbc.Driver</config.db.driver>
+ <config.db.url>jdbc:mysql://localhost:3306/${config.db.name}?autoReconnect=true</config.db.url>
+ <!-- DB specific properties for the maven-sql plugin -->
+ <config.db.metaurl>jdbc:mysql://localhost:3306/mysql?autoReconnect=true</config.db.metaurl>
+ <config.db.dropcommand>drop database ${config.db.name}</config.db.dropcommand>
+ <config.db.createcommand>create database ${config.db.name}</config.db.createcommand>
+ </properties>
+ <build>
+ <plugins>
+ <!-- Drop/create the test database on clean -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <driver>${config.db.driver}</driver>
+ <url>${config.db.metaurl}</url>
+ <username>${config.db.user}</username>
+ <password>${config.db.pwd}</password>
+ <settingsKey>sensibleKey</settingsKey>
+ </configuration>
+ <executions>
+ <execution>
+ <id>drop-db</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <autocommit>true</autocommit>
+ <sqlCommand>${config.db.dropcommand}</sqlCommand>
+ <onError>continue</onError>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create-db</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <autocommit>true</autocommit>
+ <sqlCommand>${config.db.createcommand}</sqlCommand>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>overlay-repository-descriptors</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/repository" overwrite="true">
+ <fileset dir="${basedir}/src/test/repository-descriptor-overlay" />
+ <filterset>
+ <filter token="repo.id" value="R1" />
+ <filter token="config.db.schema" value="${config.db.schema}" />
+ <filter token="config.db.driver" value="${config.db.driver}" />
+ <filter token="config.db.url" value="${config.db.url}" />
+ <filter token="config.db.user" value="${config.db.user}" />
+ <filter token="config.db.pwd" value="${config.db.pwd}" />
+ <filter token="config.db.fsclass" value="${config.db.fsclass}" />
+ <filter token="config.db.dsclass" value="${config.db.dsclass}" />
+ <filter token="config.db.pmclass" value="${config.db.pmclass}" />
+ <filter token="config.db.journalclass" value="${config.db.journalclass}" />
+ </filterset>
+ </copy>
+ <copy todir="${project.build.directory}/repository-2" overwrite="true">
+ <fileset dir="${basedir}/src/test/repository-descriptor-overlay" />
+ <filterset>
+ <filter token="repo.id" value="R2" />
+ <filter token="config.db.schema" value="${config.db.schema}" />
+ <filter token="config.db.driver" value="${config.db.driver}" />
+ <filter token="config.db.url" value="${config.db.url}" />
+ <filter token="config.db.user" value="${config.db.user}" />
+ <filter token="config.db.pwd" value="${config.db.pwd}" />
+ <filter token="config.db.fsclass" value="${config.db.fsclass}" />
+ <filter token="config.db.dsclass" value="${config.db.dsclass}" />
+ <filter token="config.db.pmclass" value="${config.db.pmclass}" />
+ <filter token="config.db.journalclass" value="${config.db.journalclass}" />
+ </filterset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<!-- Example Repository Configuration File -->
+<Repository>
+ <!--
+ virtual file system where the repository stores global state
+ (e.g. registered namespaces, custom node types, etc.)
+ -->
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_REP_" />
+ </FileSystem>
+
+ <!--
+ data store configuration
+ -->
+ <DataStore class="@config.db.dsclass@">
+ <param name="url" value="@config.db.url@"/>
+ <param name="user" value="@config.db.user@"/>
+ <param name="password" value="@config.db.pwd@"/>
+ <param name="databaseType" value="@config.db.schema@" />
+ <param name="driver" value="@config.db.driver@" />
+ <param name="minRecordLength" value="1024" />
+ <param name="maxConnections" value="3" />
+ <param name="copyWhenReading" value="true" />
+ <param name="tablePrefix" value="" />
+ <param name="schemaObjectPrefix" value="@repo.id@_DS_" />
+ </DataStore>
+
+ <!--
+ repository lock mechanism configuration
+ <RepositoryLockMechanism class="org.apache.jackrabbit.core.util.CooperativeFileLock"/>
+ -->
+
+ <!--
+ security configuration
+ -->
+ <Security appName="Jackrabbit">
+ <!--
+ security manager:
+ class: FQN of class implementing the JackrabbitSecurityManager interface
+ -->
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
+ <!-- <param name="config" value="${rep.home}/security.xml"/> -->
+ </SecurityManager>
+
+ <!--
+ access manager:
+ class: FQN of class implementing the AccessManager interface
+ -->
+ <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+ <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+ </AccessManager>
+
+ <LoginModule class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
+ <!--
+ anonymous user name ('anonymous' is the default value)
+ -->
+ <param name="anonymousId" value="anonymous"/>
+ <!--
+ administrator user id (default value if param is missing is 'admin')
+ -->
+ <param name="adminId" value="admin"/>
+ <!--
+ optional parameter 'principalProvider'.
+ the value refers to the class name of the PrincipalProvider implementation.
+ -->
+ <!-- <param name="principalProvider" value="..."/> -->
+ </LoginModule>
+ </Security>
+
+ <!--
+ location of workspaces root directory and name of default workspace
+ -->
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" maxIdleTime="2"/>
+ <!--
+ workspace configuration template:
+ used to create the initial workspace if there's no workspace yet
+ -->
+ <Workspace name="${wsp.name}">
+ <!--
+ virtual file system of the workspace:
+ class: FQN of class implementing the FileSystem interface
+ -->
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <!--
+ persistence manager of the workspace:
+ class: FQN of class implementing the PersistenceManager interface
+ -->
+ <PersistenceManager class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+ <!--
+ Search index and the file system it uses.
+ class: FQN of class implementing the QueryHandler interface
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ </SearchIndex>
+ </Workspace>
+
+ <!--
+ Configures the versioning
+ -->
+ <Versioning rootPath="${rep.home}/version">
+ <!--
+ Configures the filesystem to use for versioning for the respective
+ persistence manager
+ -->
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_version_" />
+ </FileSystem>
+
+ <!--
+ Configures the persistence manager to be used for persisting version state.
+ Please note that the current versioning implementation is based on
+ a 'normal' persistence manager, but this could change in future
+ implementations.
+ -->
+ <PersistenceManager class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_version_" />
+ </PersistenceManager>
+ </Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ </SearchIndex>
+
+ <!--
+ Run with a cluster journal
+ -->
+ <Cluster id="node1">
+ <Journal class="@config.db.journalclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_cluster_" />
+ <param name="janitorEnabled" value="false" />
+ </Journal>
+ </Cluster>
+
+</Repository>
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under
+ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="default">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ <param name="respectDocumentOrder" value="true" />
+ <param name="synonymProviderClass"
+ value="org.apache.jackrabbit.core.query.lucene.PropertiesSynonymProvider" />
+ <param name="synonymProviderConfigPath" value="../synonyms.properties" />
+ <param name="supportHighlighting" value="true" />
+ <param name="excerptProviderClass"
+ value="org.apache.jackrabbit.core.query.lucene.WeightedHTMLExcerpt" />
+ <param name="indexingConfiguration" value="${wsp.home}/indexing-configuration.xml" />
+ </SearchIndex>
+
+</Workspace>
\ No newline at end of file
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="index-format-v1">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ </SearchIndex>
+</Workspace>
+
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="index-format-v2">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ </SearchIndex>
+</Workspace>
+
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="index-format-v3">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ </SearchIndex>
+</Workspace>
+
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="indexing-test">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ <param name="indexingConfiguration" value="${wsp.home}/indexing-configuration.xml"/>
+ <param name="supportHighlighting" value="true"/>
+ <param name="excerptProviderClass" value="org.apache.jackrabbit.core.query.lucene.WeightedHTMLExcerpt"/>
+ <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.core.query.lucene.IndexingQueueTest$Extractor"/>
+ <param name="extractorPoolSize" value="2"/>
+ <param name="extractorTimeout" value="10"/>
+ </SearchIndex>
+
+</Workspace>
+
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="security">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index" />
+ </SearchIndex>
+
+</Workspace>
Added: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/workspace.xml?rev=800118&view=auto
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/workspace.xml (added)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/workspace.xml Sun Aug 2 17:50:34 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<Workspace name="workspace-init-test">
+
+ <FileSystem class="@config.db.fsclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </FileSystem>
+
+ <PersistenceManager
+ class="@config.db.pmclass@">
+ <param name="driver" value="@config.db.driver@" />
+ <param name="url" value="@config.db.url@" />
+ <param name="schema" value="@config.db.schema@" />
+ <param name="user" value="@config.db.user@" />
+ <param name="password" value="@config.db.pwd@" />
+ <param name="schemaObjectPrefix" value="@repo.id@_${wsp.name}_" />
+ </PersistenceManager>
+
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SlowQueryHandler">
+ <param name="path" value="${wsp.home}/index" />
+ <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager"/>
+ </SearchIndex>
+
+</Workspace>
+