Index: jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml	(revision 828674)
+++ jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml	(working copy)
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<Workspace name="workspace-init-test">
+<Workspace name="wsp-init-test">
   <!--
       virtual file system of the workspace:
       class: FQN of class implementing FileSystem interface
Index: jackrabbit-core/src/test/repository/workspaces/workspace-init-test/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository/workspaces/workspace-init-test/workspace.xml	(revision 828674)
+++ jackrabbit-core/src/test/repository/workspaces/workspace-init-test/workspace.xml	(working copy)
@@ -1,41 +0,0 @@
-<?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">
-  <!--
-      virtual file system of the workspace:
-      class: FQN of class implementing FileSystem interface
-  -->
-  <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-    <param name="path" value="${wsp.home}" />
-  </FileSystem>
-
-  <!--
-      persistence of the workspace:
-      class: FQN of class implementing PersistenceManager interface
-  -->
-  <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>
-  
-  <!--
-      Search index and the file system it uses.
-  -->
-  <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>
-
Index: jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
===================================================================
--- jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java	(revision 828674)
+++ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java	(working copy)
@@ -48,7 +48,7 @@
             Thread t = new Thread(new Runnable() {
                 public void run() {
                     try {
-                        getHelper().getSuperuserSession("workspace-init-test").logout();
+                        getHelper().getSuperuserSession("wsp-init-test").logout();
                     } catch (RepositoryException e) {
                         throw new RuntimeException(e);
                     }
Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml	(revision 0)
@@ -0,0 +1,32 @@
+<?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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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>
\ No newline at end of file

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v1/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml	(revision 0)
@@ -0,0 +1,32 @@
+<?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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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>
\ No newline at end of file

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v2/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml	(revision 0)
@@ -0,0 +1,39 @@
+<?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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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>
\ No newline at end of file

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml	(revision 0)
@@ -0,0 +1,32 @@
+<?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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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>
\ No newline at end of file

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/index-format-v3/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml	(revision 0)
@@ -0,0 +1,38 @@
+<?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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/default/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml	(revision 0)
@@ -0,0 +1,32 @@
+<?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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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>
\ No newline at end of file

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/security/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml	(revision 0)
@@ -0,0 +1,33 @@
+<?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="wsp-init-test">
+    <FileSystem class="@config.db.fsclass@">
+        <param name="driver" value="@config.db.driver@" />
+        <param name="url" value="@config.db.url@" />
+        <param name="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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>
\ No newline at end of file

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml
===================================================================
--- jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml	(revision 0)
+++ jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml	(revision 0)
@@ -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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <param name="schemaObjectPrefix" value="@repo.id@_REP_" />
+    </FileSystem>
+
+    <!--
+        data store configuration
+    -->
+    <DataStore class="@config.db.dsclass@">
+        <param name="driver" value="@config.db.driver@" />
+        <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="minRecordLength" value="1024" />
+        <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="user" value="@config.db.user@" />
+        <param name="password" value="@config.db.pwd@" />
+        <param name="schema" value="@config.db.schema@" />
+        <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="user" value="@config.db.user@"/>
+            <param name="password" value="@config.db.pwd@"/>
+            <param name="schema" value="@config.db.schema@"/>
+            <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="user" value="@config.db.user@"/>
+            <param name="password" value="@config.db.pwd@"/>
+            <param name="schema" value="@config.db.schema@"/>
+            <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="user" value="@config.db.user@"/>
+            <param name="password" value="@config.db.pwd@"/>
+            <param name="schema" value="@config.db.schema@"/>
+            <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="user" value="@config.db.user@"/>
+            <param name="password" value="@config.db.pwd@"/>
+            <param name="schema" value="@config.db.schema@"/>
+            <param name="schemaObjectPrefix" value="@repo.id@_cluster_" />
+            <param name="janitorEnabled" value="false" />
+        </Journal>
+    </Cluster>
+
+</Repository>

Property changes on: jackrabbit-core/src/test/repository-descriptor-overlay/repository.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java	(revision 828674)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java	(working copy)
@@ -995,9 +995,10 @@
             // read ddl from resources
             InputStream in = DatabaseFileSystem.class.getResourceAsStream(schema + ".ddl");
             if (in == null) {
-                String msg = "Configuration error: unknown schema '" + schema + "'";
-                log.debug(msg);
-                throw new RepositoryException(msg);
+//                String msg = "Configuration error: unknown schema '" + schema + "'";
+//                log.debug(msg);
+//                throw new RepositoryException(msg);
+                in = DatabaseFileSystem.class.getResourceAsStream("default.ddl");
             }
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             Statement stmt = con.createStatement();
Index: jackrabbit-core/pom.xml
===================================================================
--- jackrabbit-core/pom.xml	(revision 828674)
+++ jackrabbit-core/pom.xml	(working copy)
@@ -100,6 +100,8 @@
               <value>
                 org.apache.jackrabbit.core.xml.DocumentViewTest#testMultiValue
                 org.apache.jackrabbit.core.ConcurrentImportTest
+                org.apache.jackrabbit.core.data.GarbageCollectorTest#testGC
+                org.apache.jackrabbit.core.data.GarbageCollectorTest#testCloseSessionWhileRunningGc
               </value>
             </property>
           </systemProperties>
@@ -241,4 +243,239 @@
     </dependency>
   </dependencies>
 
+  <!--
+    These profiles can be used to run the (integration) tests against different DB backends.
+    For instance, if you want to run the integration tests against MySQL backend, do:
+    
+      mvn clean integration-test -Pmysql,use-descriptor-overlay
+    
+    Note: the ${config.db.name} database is dropped and re-created in the clean phase. 
+  -->
+  <profiles>
+    <profile>
+      <id>mysql</id>
+      <properties>
+        <config.db.name>jackrabbit</config.db.name>
+        <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.validation.query>select 1</config.db.validation.query>
+        <config.db.user>martijnh</config.db.user>
+        <config.db.pwd>martijnh</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>
+        <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>
+    </profile>
+    <profile>
+      <id>mssql</id>
+      <properties>
+        <config.db.name>jackrabbit</config.db.name>
+        <config.db.fsclass>org.apache.jackrabbit.core.fs.db.MSSqlFileSystem</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.MSSqlPersistenceManager</config.db.pmclass>
+        <config.db.journalclass>org.apache.jackrabbit.core.journal.MSSqlDatabaseJournal</config.db.journalclass>
+        <config.db.schema>mssql</config.db.schema>
+        <config.db.validation.query>select 1</config.db.validation.query>
+        <config.db.user>user</config.db.user>
+        <config.db.pwd>pwd</config.db.pwd>
+        <config.db.driver>net.sourceforge.jtds.jdbc.Driver</config.db.driver>
+        <config.db.url>jdbc:jtds:sqlserver://localhost:2433/${config.db.name}</config.db.url>
+        <config.db.metaurl>jdbc:jtds:sqlserver://localhost:2433/master</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>
+    </profile>
+    <profile>
+      <id>oracle</id>
+      <properties>
+        <config.db.name>unused</config.db.name>
+        <config.db.fsclass>org.apache.jackrabbit.core.fs.db.OracleFileSystem</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.OraclePersistenceManager</config.db.pmclass>
+        <config.db.journalclass>org.apache.jackrabbit.core.journal.OracleDatabaseJournal</config.db.journalclass>
+        <config.db.schema>oracle</config.db.schema>
+        <config.db.validation.query>select 'validationQuery' from dual</config.db.validation.query>
+        <config.db.user>user</config.db.user>
+        <config.db.pwd>password</config.db.pwd>
+        <config.db.driver>oracle.jdbc.driver.OracleDriver</config.db.driver>
+        <config.db.url>jdbc:oracle:thin:@localhost:1521:xe</config.db.url>
+        <config.db.metaurl>unused</config.db.metaurl>
+        <config.db.dropcommand>unused</config.db.dropcommand>
+        <config.db.createcommand>unused</config.db.createcommand>
+      </properties>
+    </profile>
+    <profile>
+      <id>h2</id>
+      <properties>
+        <config.db.name>jackrabbit</config.db.name>
+        <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.H2PersistenceManager</config.db.pmclass>
+        <config.db.journalclass>org.apache.jackrabbit.core.journal.DatabaseJournal</config.db.journalclass>
+        <config.db.schema>h2</config.db.schema>
+        <config.db.validation.query>select 1</config.db.validation.query>
+        <config.db.user>user</config.db.user>
+        <config.db.pwd>pwd</config.db.pwd>
+        <config.db.driver>org.h2.Driver</config.db.driver>
+        <config.db.url>jdbc:h2:tcp://localhost/${config.db.name};TRACE_LEVEL_FILE=3</config.db.url>
+        <config.db.metaurl>unused</config.db.metaurl>
+        <config.db.dropcommand>unused</config.db.dropcommand>
+        <config.db.createcommand>unused</config.db.createcommand>
+      </properties>
+    </profile>
+    <profile>
+      <id>use-descriptor-overlay</id>
+      <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>
+            <dependency>
+              <groupId>net.sourceforge.jtds</groupId>
+              <artifactId>jtds</artifactId>
+              <version>1.2.2</version>
+              <scope>provided</scope>
+            </dependency>
+            <dependency>
+              <groupId>com.h2database</groupId>
+              <artifactId>h2</artifactId>
+              <version>1.1.118</version>
+              <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="A" />
+                      <filter token="config.db.schema" value="${config.db.schema}" />
+                      <filter token="config.db.validation.query" value="${config.db.validation.query}" />
+                      <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="B" />
+                      <filter token="config.db.schema" value="${config.db.schema}" />
+                      <filter token="config.db.validation.query" value="${config.db.validation.query}" />
+                      <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>
+        <dependency>
+          <groupId>net.sourceforge.jtds</groupId>
+          <artifactId>jtds</artifactId>
+          <version>1.2.2</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.h2database</groupId>
+          <artifactId>h2</artifactId>
+          <version>1.1.118</version>
+          <scope>test</scope>
+        </dependency>
+<!--
+        <dependency>
+          <groupId>com.oracle</groupId>
+          <artifactId>ojdbc14</artifactId>
+          <version>10.2.0.3.0</version>
+          <scope>test</scope>
+        </dependency>
+-->
+      </dependencies>
+    </profile>
+  </profiles>
 </project>