You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2005/07/26 19:16:03 UTC

svn commit: r225351 - in /incubator/jackrabbit/trunk/contrib/bdb-persistence: ./ applications/test/ applications/test/repository/ applications/test/repository/nodetypes/ applications/test/workspaces/ applications/test/workspaces/default/ applications/t...

Author: stefan
Date: Tue Jul 26 10:15:55 2005
New Revision: 225351

URL: http://svn.apache.org/viewcvs?rev=225351&view=rev
Log:
tweaked bdb-persistence to automatically run 'core' test-cases

Added:
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/custom_nodetypes.xml   (with props)
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/workspace.xml   (with props)
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/workspace.xml   (with props)
    incubator/jackrabbit/trunk/contrib/bdb-persistence/maven.xml   (with props)
Modified:
    incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml
    incubator/jackrabbit/trunk/contrib/bdb-persistence/project.properties
    incubator/jackrabbit/trunk/contrib/bdb-persistence/project.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=225351&r1=225350&r2=225351&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml (original)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository.xml Tue Jul 26 10:15:55 2005
@@ -166,7 +166,7 @@
             class: FQN of class implementing the FileSystem interface
         -->
         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-            <param name="path" value="${wsp.home}"/>
+            <param name="path" value="${wsp.home}/data"/>
         </FileSystem>
         <!--
             persistence manager of the workspace:
@@ -212,11 +212,8 @@
             Configures the filesystem to use for versioning for the respective
             persistence manager
         -->
-        <FileSystem class="com.day.jackrabbit.fs.cq.CQFileSystem">
-            <param name="path" value="${rep.home}/version/version.dat"/>
-            <param name="autoRepair" value="false"/>
-            <param name="blockSize" value="128"/>
-            <param name="autoSync" value="false"/>
+        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+            <param name="path" value="${rep.home}/version" />
         </FileSystem>
         
         <!--

Added: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/custom_nodetypes.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/custom_nodetypes.xml?rev=225351&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/custom_nodetypes.xml (added)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/custom_nodetypes.xml Tue Jul 26 10:15:55 2005
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed 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.
+ */
+ -->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:test="http://www.apache.org/jackrabbit/test" xmlns:mix="http://www.jcp.org/jcr/mix/1.0">
+  <nodeType name="test:versionable" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>mix:versionable</supertype>
+      <supertype>nt:base</supertype>
+    </supertypes>
+    <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="test:copyOnParentVersionProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="test:versionOnParentVersionProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" multiple="false" />
+    <propertyDefinition name="test:initializeOnParentVersionProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="INITIALIZE" protected="false" multiple="false" />
+    <propertyDefinition name="test:computeOnParentVersionProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COMPUTE" protected="false" multiple="false" />
+    <propertyDefinition name="test:ignoreOnParentVersionProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="false" multiple="false" />
+    <propertyDefinition name="test:abortOnParentVersionProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="false" multiple="false" />
+    <childNodeDefinition name="*" defaultPrimaryType="test:versionable" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="test:copyOnParentVersion" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="test:versionOnParentVersion" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="test:initializeOnParentVersion" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="INITIALIZE" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="test:computeOnParentVersion" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="COMPUTE" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="test:ignoreOnParentVersion" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="test:abortOnParentVersion" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+  </nodeType>
+  
+  <!-- Defines a referenceable nodetype for testing purposes -->
+  <nodeType name="test:refTargetNode" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>mix:versionable</supertype>
+      <supertype>nt:base</supertype>
+    </supertypes>
+    <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+  </nodeType>
+
+  <!-- Defines a nodetype for tests of NodeType.canSetProperty(), Property.setValue() and Node.setProperty() -->
+  <nodeType name="test:canSetProperty" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>nt:base</supertype>
+    </supertypes>
+    <propertyDefinition name="String" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="StringMultiple" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="StringConstraints" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>abc</valueConstraint>
+        <valueConstraint>def</valueConstraint>
+        <valueConstraint>ghi</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="StringMultipleConstraints" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>abc</valueConstraint>
+        <valueConstraint>def</valueConstraint>
+        <valueConstraint>ghi</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Binary" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="BinaryMultiple" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="BinaryConstraints" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>(,100)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="BinaryMultipleConstraints" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>(,100)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Date" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="DateMultiple" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="DateConstraints" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>(1974-02-15T00:00:00.000Z,)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="DateMultipleConstraints" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>(,1974-02-15T00:00:00.000Z)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Double" requiredType="Double" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="DoubleMultiple" requiredType="Double" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="DoubleConstraints" requiredType="Double" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>(100,)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="DoubleMultipleConstraints" requiredType="Double" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>(,100)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Long" requiredType="Long" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="LongMultiple" requiredType="Long" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="LongConstraints" requiredType="Long" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>(100,)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="LongMultipleConstraints" requiredType="Long" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>(,100)</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Boolean" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="BooleanMultiple" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="BooleanConstraints" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>true</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="BooleanMultipleConstraints" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>true</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Name" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="NameMultiple" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="NameConstraints" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>abc</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="NameMultipleConstraints" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>abc</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="Path" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <propertyDefinition name="PathMultiple" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+    <propertyDefinition name="PathConstraints" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>/abc</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="PathMultipleConstraints" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>/abc</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="ReferenceConstraints" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+      <valueConstraints>
+        <valueConstraint>test:canSetProperty</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+    <propertyDefinition name="ReferenceMultipleConstraints" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+      <valueConstraints>
+        <valueConstraint>test:canSetProperty</valueConstraint>
+      </valueConstraints>
+    </propertyDefinition>
+  </nodeType>
+
+  <!-- Defines a nodetype for testing NodeType.canAddChildNode() -->
+  <nodeType name="test:canAddChildNode" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>nt:base</supertype>
+    </supertypes>
+    <childNodeDefinition name="testChildWithDefaultType" defaultPrimaryType="nt:base" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+    <childNodeDefinition name="testChildWithoutDefaultType" defaultPrimaryType="" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+  </nodeType>
+
+  <!-- Defines a nodetype for testing Node.setProperty(). -->
+  <nodeType name="test:setProperty" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>nt:base</supertype>
+      <supertype>mix:referenceable</supertype>
+    </supertypes>
+    <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="test:multiProperty" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true" />
+    <childNodeDefinition name="*" defaultPrimaryType="test:setProperty" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false" />
+  </nodeType>
+  
+  <!-- Defines a nodetype to test assuming the PropertyType at Node.setProperty(). -->
+  <nodeType name="test:setPropertyAssumingType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>nt:base</supertype>
+    </supertypes>
+    <propertyDefinition name="test:singleProperty" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="test:multiProperty" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true" />
+    <childNodeDefinition name="*" defaultPrimaryType="test:setPropertyAssumingType" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false" />
+  </nodeType>
+
+  <!-- Defines a nodetype with a childNodeDefinition that does not allow same name siblings -->
+  <nodeType name="test:sameNameSibsFalseChildNodeDefinition" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <supertypes>
+      <supertype>nt:base</supertype>
+    </supertypes>
+    <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+    <childNodeDefinition name="*" defaultPrimaryType="test:sameNameSibsFalseChildNodeDefinition" autoCreated="false" mandatory="false" onParentVersion="COMPUTE" protected="false" sameNameSiblings="false">
+      <requiredPrimaryTypes>
+        <requiredPrimaryType>nt:base</requiredPrimaryType>
+      </requiredPrimaryTypes>
+    </childNodeDefinition>
+  </nodeType>  
+
+</nodeTypes>
+

Propchange: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/repository/nodetypes/custom_nodetypes.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/workspace.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/workspace.xml?rev=225351&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/workspace.xml (added)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/workspace.xml Tue Jul 26 10:15:55 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<Workspace name="default">
+  <!--
+      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}/data" />
+  </FileSystem>
+  <!--
+      persistence of the workspace:
+      class: FQN of class implementing PersistenceManager interface
+  -->
+  <PersistenceManager class="org.apache.jackrabbit.core.state.bdb.BerkeleyDBPersistenceManager"/>
+  <!--
+      Search index and the file system it uses.
+  -->
+  <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>
+  </SearchIndex>
+</Workspace>
+

Propchange: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/default/workspace.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/workspace.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/workspace.xml?rev=225351&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/workspace.xml (added)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/workspace.xml Tue Jul 26 10:15:55 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<Workspace name="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}/data" />
+  </FileSystem>
+  <!--
+      persistence of the workspace:
+      class: FQN of class implementing PersistenceManager interface
+  -->
+  <PersistenceManager class="org.apache.jackrabbit.core.state.bdb.BerkeleyDBPersistenceManager"/>
+  <!--
+      Search index and the file system it uses.
+  -->
+  <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>
+  </SearchIndex>
+</Workspace>
+

Propchange: incubator/jackrabbit/trunk/contrib/bdb-persistence/applications/test/workspaces/test/workspace.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/contrib/bdb-persistence/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/maven.xml?rev=225351&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/maven.xml (added)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/maven.xml Tue Jul 26 10:15:55 2005
@@ -0,0 +1,84 @@
+<!--
+   Copyright 2004-2005 The Apache Software Foundation or its licensors,
+                       as applicable.
+
+   Licensed 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.
+-->
+
+<project
+    default="jar:jar"
+    xmlns:deploy="deploy"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant">
+
+    <!-- Additionally cleans the test data created -->
+    <postGoal name="clean">
+        <attainGoal name="test:clean"/>
+    </postGoal>
+
+    <!-- deletes the test data -->
+    <goal name="test:clean">
+
+        <ant:delete includeEmptyDirs="true">
+            <ant:fileset dir="applications/test/repository">
+                <ant:include name="**/*"/>
+                <ant:exclude name="**/custom_nodetypes.xml"/>
+            </ant:fileset>
+        </ant:delete>
+
+        <ant:delete includeEmptyDirs="true">
+            <ant:fileset dir="applications/test/workspaces">
+                <ant:include name="**/*"/>
+                <ant:exclude name="**/workspace.xml"/>
+            </ant:fileset>
+        </ant:delete>
+
+        <ant:delete includeEmptyDirs="true">
+            <ant:fileset dir="applications/test/version">
+                <ant:include name="**/*"/>
+            </ant:fileset>
+        </ant:delete>        
+
+        <ant:delete dir="applications/test/tx"/>
+    </goal>
+    
+    <!--
+        Creates a jar file with the JackrabbitRepositoryStub class which is
+        needed for running test cases
+    -->
+    <goal name="jackrabbit:test-stub">
+        <attainGoal name="test:compile"/>
+        <ant:jar destfile="./target/jackrabbit-test-stub-${pom.currentVersion}.jar"
+            basedir="target/test-classes"
+            includes="org/apache/jackrabbit/core/JackrabbitRepositoryStub.class"/>
+    </goal>
+
+    <!--
+        Run Jackrabbit init tests first.
+    -->
+    <preGoal name="test:test">
+        <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
+            <attainGoal name="jackrabbit:test-init"/>
+        </j:if>
+    </preGoal>
+
+    <!--
+        Runs the init test cases to fill the repository with data for
+        read-only tests.
+    -->
+    <goal name="jackrabbit:test-init">
+        <j:set var="testcase" value="org.apache.jackrabbit.init.TestAll"/>
+        <attainGoal name="test:single"/>
+    </goal>
+
+</project>

Propchange: incubator/jackrabbit/trunk/contrib/bdb-persistence/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/bdb-persistence/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/project.properties?rev=225351&r1=225350&r2=225351&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/project.properties (original)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/project.properties Tue Jul 26 10:15:55 2005
@@ -26,11 +26,12 @@
 ######################################################################
 maven.test.failure = false
 maven.junit.fork=true
-maven.test.search.classdir=true
+#maven.test.search.classdir=true
 maven.junit.jvmargs=-Xmx1024M
-maven.junit.sysproperties=org.xml.sax.driver java.security.auth.login.config
+#maven.junit.sysproperties=org.xml.sax.driver java.security.auth.login.config
+maven.junit.sysproperties=org.xml.sax.driver
 org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-java.security.auth.login.config=applications/test/jaas.config
+#java.security.auth.login.config=applications/test/jaas.config
 
 
 #If you wish to skip tests when doing builds, uncomment

Modified: incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml?rev=225351&r1=225350&r2=225351&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml Tue Jul 26 10:15:55 2005
@@ -19,7 +19,7 @@
 	<pomVersion>3</pomVersion>
 	<artifactId>jackrabbit-bdb</artifactId>
 	<groupId>jackrabbit</groupId>
-	<name>JackRabbit BerkeleyDB Persistence Manager</name>
+	<name>Jackrabbit BerkeleyDB Persistence Manager</name>
 	<currentVersion>1.0-SNAPSHOT</currentVersion>
 	<organization>
 		<name>The Apache Software Foundation</name>
@@ -55,6 +55,9 @@
 	</developers>
 
 	<dependencies>
+		<!--
+			compile-time dependencies of the BerkeleyDB persistence manager
+		-->
 		<dependency>
 			<groupId>berkeleydb</groupId>
 			<artifactId>je</artifactId>
@@ -62,40 +65,114 @@
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>jsr170</groupId>
-			<artifactId>jcr</artifactId>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
 			<version>1.0</version>
 			<type>jar</type>
-			<url>http://www.day.com/maven/jsr170/jars/jcr-1.0.jar</url>
 		</dependency>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
+			<groupId>jsr170</groupId>
+			<artifactId>jcr</artifactId>
 			<version>1.0</version>
 			<type>jar</type>
+			<url>http://www.day.com/maven/jsr170/jars/jcr-1.0.jar</url>
 		</dependency>
 		<dependency>
 			<groupId>jackrabbit</groupId>
-			<artifactId>jackrabbit-commons</artifactId>
+			<artifactId>jackrabbit-core</artifactId>
 			<version>${pom.currentVersion}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
 			<groupId>jackrabbit</groupId>
-			<artifactId>jackrabbit-core</artifactId>
+			<artifactId>jackrabbit-commons</artifactId>
 			<version>${pom.currentVersion}</version>
 			<type>jar</type>
 		</dependency>
+
+		<!--
+			compile-time dependencies of the jUnit test-cases 
+			in the core subproject	
+		-->
+		<dependency>
+			<id>concurrent</id>
+			<version>1.3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>geronimo-spec</groupId>
+			<artifactId>geronimo-spec-jta</artifactId>
+			<version>1.0-M1</version>
+		</dependency>
+		<dependency>
+			<id>log4j</id>
+			<version>1.2.8</version>
+		</dependency>
+
+		<!--
+			runtime dependencies of jackrabbit/jUnit test-cases 
+		-->
+	        <dependency>
+			<id>commons-collections</id>
+			<version>3.1</version>
+	        </dependency>
+		<dependency>
+			<id>log4j</id>
+			<version>1.2.8</version>
+		</dependency>
+		<dependency>
+			<groupId>lucene</groupId>
+			<artifactId>lucene</artifactId>
+			<version>1.4.3</version>
+		</dependency>
+	        <dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.6.2</version>
+	        </dependency>
+		<dependency>
+			<groupId>xml-apis</groupId>
+			<artifactId>xmlParserAPIs</artifactId>
+			<version>2.0.2</version>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<sourceDirectory>src/java</sourceDirectory>
-		<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+		<unitTestSourceDirectory>../../core/src/test</unitTestSourceDirectory>
 		<unitTest>
 			<includes>
 				<include>**/*TestAll.java</include>
 			</includes>
+			<excludes>
+				<exclude>**/init/*</exclude>
+			</excludes>
+			<resources>
+				<resource>
+					<directory>applications/test</directory>
+					<includes>
+						<include>*.properties</include>
+						<include>*.xml</include>
+					</includes>
+				</resource>
+				<resource>
+					<directory>../../core/src/test</directory>
+					<includes>
+						<include>**/*.xml</include>
+						<include>**/*.txt</include>
+					</includes>
+				</resource>
+			</resources>
 		</unitTest>
+		<resources>
+			<resource>
+				<directory>src/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+					<include>**/*.properties</include>
+					<include>**/*.TextFilterService</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 
 	<reports>