Return-Path: Delivered-To: apmail-incubator-jackrabbit-dev-archive@www.apache.org Received: (qmail 64397 invoked from network); 6 Apr 2005 12:36:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Apr 2005 12:36:07 -0000 Received: (qmail 43731 invoked by uid 500); 6 Apr 2005 12:36:06 -0000 Mailing-List: contact jackrabbit-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-dev@incubator.apache.org Received: (qmail 43718 invoked by uid 99); 6 Apr 2005 12:36:06 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from server2.jahia.com (HELO server2.jahia.com) (80.74.132.69) by apache.org (qpsmtpd/0.28) with ESMTP; Wed, 06 Apr 2005 05:36:03 -0700 Received: (qmail 18126 invoked from network); 6 Apr 2005 12:35:58 -0000 Received: from line-zh-122-57.adsl.econophone.ch (HELO ?127.0.0.1?) (212.53.122.57) by server2.jahia.com with AES256-SHA encrypted SMTP; 6 Apr 2005 12:35:58 -0000 Message-ID: <4253D7B1.3050906@jahia.com> Date: Wed, 06 Apr 2005 14:36:01 +0200 From: Serge Huber User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) X-Accept-Language: en-us, en MIME-Version: 1.0 To: jackrabbit-dev@incubator.apache.org Subject: Patch for ORM-Persistence Content-Type: multipart/mixed; boundary="------------090005050603090207050002" X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --------------090005050603090207050002 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi all, I have a patch for orm-persistence, which includes all my latest work. It should be in sync with the latest commits (at the time of this writing), so shouldn't be a problem to apply. What this patch solves : - test configuration didn't work - Hibernate PM rewritten to function as OJB patch (http://issues.apache.org/jira/browse/JCR-63) by Edgar Poce (thanks !) - bug in multi-values, caused by using the "," as a separator char. The patch is made against contrib/orm-persistence. Thanks for applying this patch if everything seems ok. Regards, Serge Huber. --------------090005050603090207050002 Content-Type: text/plain; name="orm-20050406-1430.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="orm-20050406-1430.patch" Index: project.properties =================================================================== --- project.properties (revision 160266) +++ project.properties (working copy) @@ -13,19 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. +###################################################################### +# Apache Central Repository +###################################################################### +maven.repo.central=www.apache.org +maven.repo.central.directory=/www/www.apache.org/dist/java-repository +maven.remote.group=apcvs +maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory ###################################################################### # JUnit Testing ###################################################################### - maven.test.failure = false maven.junit.fork=true maven.test.search.classdir=true -maven.junit.sysproperties=org.xml.sax.driver maven.junit.jvmargs=-Xmx1024M +maven.junit.sysproperties=org.xml.sax.driver java.security.auth.login.config org.xml.sax.driver=org.apache.xerces.parsers.SAXParser +java.security.auth.login.config=applications/test/jaas.config + +#If you wish to skip tests when doing builds, uncomment +#maven.test.skip = true + ###################################################################### +# Checkstyle +###################################################################### +maven.checkstyle.properties= checkstyle.xml +maven.linkcheck.enable=false + +###################################################################### # JavaDoc # # javadoc urls can be added here, multiple urls are appended using a comma @@ -40,7 +57,40 @@ maven.javadoc.version=false ###################################################################### -# Checkstyle +# Other opts ###################################################################### -maven.checkstyle.properties= checkstyle.xml -maven.linkcheck.enable=false +# uncomment the next line to work in offline mode (no jar download & no linkcheck) +#maven.mode.online= + +maven.compile.debug=on +maven.compile.deprecation=off +maven.compile.optimize=off + +maven.jarResources.basedir=src/java +maven.jar.excludes=**/package.html + +# specifying additional remote repository for downloading dependencies +# not available at www.ibiblio.org/maven/ +maven.repo.remote = http://www.ibiblio.org/maven/,http://www.day.com/maven/ + +###################################################################### +# Site L&F +###################################################################### +# maven.xdoc.jsl= +maven.xdoc.date= +maven.xdoc.poweredby.image=maven-feather.png +maven.xdoc.version=${pom.currentVersion} +maven.xdoc.developmentProcessUrl=http://incubator.apache.org/projects/jackrabbit.html +maven.changelog.range=60 +maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory + +# ------------------------------------------------------------------------ +# M A V E N J A R O V E R R I D E +# ------------------------------------------------------------------------ +#maven.jar.override = on +#maven.jar.jcr = ${basedir}/lib/jcr.jar + +###################################################################### +# Site Deploy (into ../jackrabbit-site for checkout on incubator.apache.org) +###################################################################### +maven.site.deploy.method=fs Index: maven.xml =================================================================== --- maven.xml (revision 160266) +++ maven.xml (working copy) @@ -29,6 +29,14 @@ id="maven.test.compile.src.set" refid="parent.test.src.dir"/> + + + + + + + + @@ -46,7 +54,7 @@ - + Index: applications/test/repository/nodetypes/custom_nodetypes.xml =================================================================== --- applications/test/repository/nodetypes/custom_nodetypes.xml (revision 160266) +++ applications/test/repository/nodetypes/custom_nodetypes.xml (working copy) @@ -18,19 +18,19 @@ */ --> - + mix:versionable nt:base - - - - - - - - + + + + + + + + nt:base @@ -66,5 +66,163 @@ + + + + + mix:versionable + nt:base + + + + + + + + nt:base + + + + + + abc + def + ghi + + + + + abc + def + ghi + + + + + + + (,100) + + + + + (,100) + + + + + + + (1974-02-15T00:00:00.000Z,) + + + + + (,1974-02-15T00:00:00.000Z) + + + + + + + (100,) + + + + + (,100) + + + + + + + (100,) + + + + + (,100) + + + + + + + true + + + + + true + + + + + + + abc + + + + + abc + + + + + + + /abc + + + + + /abc + + + + + + + + nt:base + + + + nt:base + + + + + nt:base + + + + + + + + nt:base + mix:referenceable + + + + + + + + + + nt:base + + + + + nt:base + + + + Index: applications/test/workspaces/test/workspace.xml =================================================================== --- applications/test/workspaces/test/workspace.xml (revision 0) +++ applications/test/workspaces/test/workspace.xml (revision 0) @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/test/workspaces/default/workspace.xml =================================================================== --- applications/test/workspaces/default/workspace.xml (revision 160266) +++ applications/test/workspaces/default/workspace.xml (working copy) @@ -14,8 +14,8 @@ persistence of the workspace: class: FQN of class implementing PersistenceManager interface --> - - + + @@ -24,8 +24,11 @@ + + + Index: applications/test/jaas.config =================================================================== --- applications/test/jaas.config (revision 0) +++ applications/test/jaas.config (revision 0) @@ -0,0 +1,3 @@ +Jackrabbit { + org.apache.jackrabbit.core.security.SimpleLoginModule required anonymousId="anonymous"; +}; \ No newline at end of file Index: applications/test/repositoryStubImpl.properties =================================================================== --- applications/test/repositoryStubImpl.properties (revision 160266) +++ applications/test/repositoryStubImpl.properties (working copy) @@ -1,24 +1,16 @@ -# Copyright 2003-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. -# # This is the configuration file for the jackrabbit repository test stub. # # Stub implementation class -javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.test.JackrabbitRepositoryStub +javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.core.JackrabbitRepositoryStub +# repository specific configuration +org.apache.jackrabbit.repository.config=applications/test/repository.xml +org.apache.jackrabbit.repository.name=repo +org.apache.jackrabbit.repository.home=applications/test +org.apache.jackrabbit.repository.jaas.config=applications/test/jaas.config + # credential configuration javax.jcr.tck.superuser.name=superuser javax.jcr.tck.superuser.pwd= @@ -30,10 +22,10 @@ # global test configuration javax.jcr.tck.testroot=/testroot javax.jcr.tck.nodetype=nt:unstructured -javax.jcr.tck.nodename1=foo -javax.jcr.tck.nodename2=bar -javax.jcr.tck.nodename3=foobar -javax.jcr.tck.nodename4=myname +javax.jcr.tck.nodename1=node1 +javax.jcr.tck.nodename2=node2 +javax.jcr.tck.nodename3=node3 +javax.jcr.tck.nodename4=node4 javax.jcr.tck.propertyname1=prop1 javax.jcr.tck.propertyname2=prop2 javax.jcr.tck.workspacename=test @@ -47,15 +39,309 @@ # Test method: testName javax.jcr.tck.AddNodeTest.testName.nodename1=myname -# QUERY CONFIGURATION +# ============================================================================== +# JAVAX.JCR CONFIGURATION +# ============================================================================== +# Test class: ItemDefTest +javax.jcr.tck.ItemDefTest.testroot=/testdata + +# Test class: ItemReadMethodsTest +javax.jcr.tck.ItemReadMethodsTest.testroot=/testdata + +# Test class: NodeReadMethodsTest +javax.jcr.tck.NodeReadMethodsTest.testroot=/testdata + +# Test class: PropertyTypeTest +javax.jcr.tck.PropertyTypeTest.testroot=/testdata + +# Test class: BinaryPropertyTest +javax.jcr.tck.BinaryPropertyTest.testroot=/testdata + +# Test class: BooleanPropertyTest +javax.jcr.tck.BooleanPropertyTest.testroot=/testdata + +# Test class: DatePropertyTest +javax.jcr.tck.DatePropertyTest.testroot=/testdata + +# Test class: DoublePropertyTest +javax.jcr.tck.DoublePropertyTest.testroot=/testdata + +# Test class: LongPropertyTest +javax.jcr.tck.LongPropertyTest.testroot=/testdata + +# Test class: NamePropertyTest +javax.jcr.tck.NamePropertyTest.testroot=/testdata + +# Test class: PathPropertyTest +javax.jcr.tck.PathPropertyTest.testroot=/testdata + +# Test class: ReferencePropertyTest +javax.jcr.tck.ReferencePropertyTest.testroot=/testdata + +# Test class: StringPropertyTest +javax.jcr.tck.StringPropertyTest.testroot=/testdata + +# Test class: UndefinedPropertyTest +javax.jcr.tck.UndefinedPropertyTest.testroot=/testdata + +# Test class: PropertyReadMethodsTest +javax.jcr.tck.PropertyReadMethodsTest.testroot=/testdata + +# Test class: NodeIteratorTest +javax.jcr.tck.NodeIteratorTest.testroot=/testdata + +# Test class: NodeDiscoveringNodeTypesTest +javax.jcr.tck.NodeDiscoveringNodeTypesTest.testroot=/testdata + +# Test class: RepositoryDescriptorTest +javax.jcr.tck.RepositoryDescriptorTest.testroot=/testdata + +# Test class: WorkspaceReadMethodsTest +javax.jcr.tck.WorkspaceReadMethodsTest.testroot=/testdata + +# Test class: SessionReadMethodsTest +javax.jcr.tck.SessionReadMethodsTest.testroot=/testdata + +# Test class: NamespaceRegistryReadMethodsTest +javax.jcr.tck.NamespaceRegistryReadMethodsTest.testroot=/testdata + +# Test class: NamespaceRemappingTest +javax.jcr.tck.NamespaceRemappingTest.testroot=/testdata + +# Test class: SessionTest +# Test method: testMoveItemExistsException +# nodetype that does not allow same name siblings +javax.jcr.tck.SessionTest.testMoveItemExistsException.nodetype2=nt:folder +# valid node type that can be added as child of nodetype2 +javax.jcr.tck.SessionTest.testMoveItemExistsException.nodetype3=nt:hierarchyNode + +# Test class: SessionTest +# Test method: testSaveContstraintViolationException +# nodetype that has a property that is mandatory but not autocreated +javax.jcr.tck.SessionTest.testSaveContstraintViolationException.nodetype2=nt:file + +# Test class: SessionUUIDTest +# node type that has a property of type PropertyType.REFERENCE +javax.jcr.tck.SessionUUIDTest.nodetype=nt:unstructured +# name of the property that is of type PropertyType.REFERENCE +javax.jcr.tck.SessionUUIDTest.propertyname1=foobar +# nodetype that has nodetype mix:referenceable assigned +javax.jcr.tck.SessionUUIDTest.nodetype2=test:refTargetNode + +# Test class: SessionUUIDTest +# Test method: testSaveMovedRefNode +# name of the property that can be modified +javax.jcr.tck.SessionUUIDTest.testSaveMovedRefNode.propertyname1=foobar + +# Test class: NodeTest +# Test method: testAddNodeItemExistsException +# nodetype that does not allow same name siblings and allows child nodes of +# the same type +javax.jcr.tck.NodeTest.testAddNodeItemExistsException.nodetype=nt:folder + +# Test class: NodeTest +# Test method: testRemoveMandatoryNode +# nodetype that has a mandatory child node definition +javax.jcr.tck.NodeTest.testRemoveMandatoryNode.nodetype2=nt:file +# nodetype of the mandatory child +javax.jcr.tck.NodeTest.testRemoveMandatoryNode.nodetype3=nt:base +# name of the mandatory node +javax.jcr.tck.NodeTest.testRemoveMandatoryNode.nodename3=jcr:content + +# Test class: NodeTest +# Test method: testSaveContstraintViolationException +# nodetype that has a property that is mandatory but not autocreated +javax.jcr.tck.NodeTest.testSaveContstraintViolationException.nodetype2=nt:file + +# Test class: NodeUUIDTest +# node type that has a property of type PropertyType.REFERENCE +javax.jcr.tck.NodeUUIDTest.nodetype=nt:unstructured +# name of the property that is of type PropertyType.REFERENCE +javax.jcr.tck.NodeUUIDTest.propertyname1=ref +# nodetype that has nodetype mix:referenceable assigned +javax.jcr.tck.NodeUUIDTest.nodetype2=test:refTargetNode + +# Test class: NodeUUIDTest +# Test method: testSaveMovedRefNode +# name of the property that can be modified +javax.jcr.tck.NodeUUIDTest.testSaveMovedRefNode.propertyname1=foobar +# nodetype that has nodetype mix:referenceable assigned + +# Test class: NodeOrderableChildNodesTest +# nodetype that supports orderable child nodes +javax.jcr.tck.NodeOrderableChildNodesTest.nodetype2=nt:unstructured +# valid node type that can be added as child of nodetype 2 +javax.jcr.tck.NodeOrderableChildNodesTest.nodetype3=nt:unstructured + +# Test class: NodeOrderableChildNodesTest +# Test method: testOrderBeforeUnsupportedRepositoryOperationException +# nodetype that does not allow ordering of child nodes +javax.jcr.tck.NodeOrderableChildNodesTest.testOrderBeforeUnsupportedRepositoryOperationException.nodetype2=nt:folder +# valid node type that can be added as child of nodetype 2 +javax.jcr.tck.NodeOrderableChildNodesTest.testOrderBeforeUnsupportedRepositoryOperationException.nodetype3=nt:hierarchyNode + +# Test class: SetPropertyNodeTest +# nodetype which is referenceable +javax.jcr.tck.SetPropertyNodeTest.nodetype=test:setProperty + +# Test class: SetPropertyValueTest +# property that allows multiple values +javax.jcr.tck.SetPropertyValueTest.propertyname2=test:multiProperty +javax.jcr.tck.SetPropertyValueTest.nodetype=test:setProperty + +# Test class: SetPropertyStringTest +# property that allows multiple values +javax.jcr.tck.SetPropertyStringTest.propertyname2=test:multiProperty +javax.jcr.tck.SetPropertyStringTest.nodetype=test:setProperty + +# Test class: WorkspaceCloneSameNameSibsTest +javax.jcr.tck.WorkspaceCloneSameNameSibsTest.sameNameSibsFalseNodeType=test:sameNameSibsFalseChildNodeDef +javax.jcr.tck.WorkspaceCloneSameNameSibsTest.sameNameSibsTrueNodeType=nt:unstructured + +# Test class: WorkspaceCopyBetweenWorkspacesSameNameSibsTest +javax.jcr.tck.WorkspaceCopyBetweenWorkspacesSameNameSibsTest.sameNameSibsFalseNodeType=test:sameNameSibsFalseChildNodeDef +javax.jcr.tck.WorkspaceCopyBetweenWorkspacesSameNameSibsTest.sameNameSibsTrueNodeType=nt:unstructured + +# Test class: WorkspaceCopySameNameSibsTest +javax.jcr.tck.WorkspaceCopySameNameSibsTest.sameNameSibsFalseNodeType=test:sameNameSibsFalseChildNodeDef +javax.jcr.tck.WorkspaceCopySameNameSibsTest.sameNameSibsTrueNodeType=nt:unstructured + +# Test class: WorkspaceMoveSameNameSibsTest +javax.jcr.tck.WorkspaceMoveSameNameSibsTest.sameNameSibsFalseNodeType=test:sameNameSibsFalseChildNodeDef +javax.jcr.tck.WorkspaceMoveSameNameSibsTest.sameNameSibsTrueNodeType=nt:unstructured + +# Test class: RepositoryLoginTest +javax.jcr.tck.RepositoryLoginTest.testroot=/testdata + +# Test class: ReferenceableRootNodesTest +javax.jcr.tck.ReferenceableRootNodesTest.testroot=/testdata + +# Test class: ExportDocViewTest +javax.jcr.tck.ExportDocViewTest.testroot=/testdata + +# ------------------------------------------------------------------------------ +# observation configuration +# ------------------------------------------------------------------------------ + +# Test class: AddEventListenerTest +# Test method: testNodeType +javax.jcr.tck.AddEventListenerTest.testNodeType.nodetype2=nt:folder + +# Configuration settings for the serialization. +# Note that the serialization test tries to use as many features of the repository +# as possible, but fails silently if a feature is not available. You have to +# specify all of the following configuration entries, even if your repository does +# not support the feature that is associated with them. + +# Root node for the example tree +javax.jcr.tck.SerializationTest.testroot=/testdata/serialization + +# Node type to use for the example tree. Specify a node type that allows complex trees and all property types if possible +javax.jcr.tck.SerializationTest.nodetype=nt:unstructured + +# Name of the nodes for source and target tree +javax.jcr.tck.SerializationTest.sourceFolderName=source +javax.jcr.tck.SerializationTest.targetFolderName=target +javax.jcr.tck.SerializationTest.rootNodeName=test + +# List the properties whose values may change during serialization/deserialization. For example, +# the UUID of a node is unique in the repository, so it will have to change when you re-import +# a tree at a different location. +javax.jcr.tck.SerializationTest.propertyValueMayChange= jcr:created jcr:uuid jcr:versionHistory jcr:baseVersion jcr:predecessors P_Reference + +# The name of the test node types. For easier diagnostics, the node types have names +# that tell you the kind of information they store +javax.jcr.tck.SerializationTest.nodeTypesTestNode=NodeTypes +javax.jcr.tck.SerializationTest.mixinTypeTestNode=MixinTypes +javax.jcr.tck.SerializationTest.propertyTypesTestNode=PropertyTypes +javax.jcr.tck.SerializationTest.sameNameChildrenTestNode=SameNameChildren +javax.jcr.tck.SerializationTest.multiValuePropertiesTestNode=MultiValueProperties +javax.jcr.tck.SerializationTest.referenceableNodeTestNode=ReferenceableNode +javax.jcr.tck.SerializationTest.orderChildrenTestNode=OrderChildren +javax.jcr.tck.SerializationTest.namespaceTestNode=Namespace + +# The name of the test property types. +javax.jcr.tck.SerializationTest.stringTestProperty=P_String +javax.jcr.tck.SerializationTest.binaryTestProperty=P_Binary +javax.jcr.tck.SerializationTest.dateTestProperty=P_Date +javax.jcr.tck.SerializationTest.longTestProperty=P_Long +javax.jcr.tck.SerializationTest.doubleTestProperty=P_Double +javax.jcr.tck.SerializationTest.booleanTestProperty=P_Boolean +javax.jcr.tck.SerializationTest.nameTestProperty=P_Name +javax.jcr.tck.SerializationTest.pathTestProperty=P_Path +javax.jcr.tck.SerializationTest.referenceTestProperty=P_Reference +javax.jcr.tck.SerializationTest.multiValueTestProperty=P_MultiValue + +# Test method: testVersioningExceptionSessionFileChild +# specified nodetype must be versionable and allow child nodes of the same type. +javax.jcr.tck.SerializationTest.testVersioningExceptionSessionFileChild.nodetype=test:versionable + +# Test method: testVersioningExceptionSessionFileParent +# specified nodetype must be versionable and allow child nodes of the same type. +javax.jcr.tck.SerializationTest.testVersioningExceptionSessionFileParent.nodetype=test:versionable + +# Test class: ExportSysViewTest +javax.jcr.tck.ExportSysViewTest.testroot=/testdata + +# ============================================================================== +# JAVAX.JCR.QUERY CONFIGURATION +# ============================================================================== + # Test class: SaveTest # Test method: testConstraintViolationException # Specified node type must not allow child nodes. javax.jcr.tck.SaveTest.testConstraintViolationException.nodetype=nt:query -# VERSIONING CONFIGURATION +# Test class: XPathQueryLevel1Test +javax.jcr.tck.XPathQueryLevel1Test.testroot=/testdata/query +# Test class: XPathDocOrderTest +javax.jcr.tck.XPathDocOrderTest.testroot=/testdata/query + +# Test class: XPathPosIndexTest +javax.jcr.tck.XPathPosIndexTest.testroot=/testdata/query + +# Test class: XPathOrderByTest +javax.jcr.tck.XPathOrderByTest.testroot=/testdata/query + +# Test class: XPathSyntaxTest +javax.jcr.tck.XPathSyntaxTest.testroot=/testdata/query + +# Test class: XPathJcrPathTest +javax.jcr.tck.XPathJcrPathTest.testroot=/testdata + +# Test class: SQLQueryLevel1Test +javax.jcr.tck.SQLQueryLevel1Test.testroot=/testdata/query + +# Test class: SQLSyntaxTest +javax.jcr.tck.SQLSyntaxTest.testroot=/testdata/query + +# Test class: SQLOrderByTest +javax.jcr.tck.SQLOrderByTest.testroot=/testdata/query + +# Test class: DerefQueryLevel1Test +javax.jcr.tck.DerefQueryLevel1Test.testroot=/testdata + +# Test class: GetPropertyNamesTest +javax.jcr.tck.GetPropertyNamesTest.testroot=/testdata + +# Test class: SQLJcrPathTest +javax.jcr.tck.SQLJcrPathTest.testroot=/testdata + +# Test class: SQLPathTest +javax.jcr.tck.SQLPathTest.testroot=/testdata + +# Test class: PredicatesTest +javax.jcr.tck.PredicatesTest.testroot=/testdata + +# Test class: SimpleSelectionTest +javax.jcr.tck.SimpleSelectionTest.testroot=/testdata + +# ============================================================================== +# JAVAX.JCR.VERSIONING CONFIGURATION +# ============================================================================== + # nodetye that is versionable. if it is not, an attempt is made to create versionable nodes # by adding a mix:versionable mixin-type. # NOTE: javax.jcr.tck.nodetype must define a non-versionable nodetype! @@ -90,6 +376,11 @@ javax.jcr.tck.OnParentVersionIgnoreTest.propertyname1=test:ignoreOnParentVersionProp javax.jcr.tck.OnParentVersionInitializeTest.propertyname1=test:initializeOnParentVersionProp +# Test class: RestoreTest +# Test method: testRestoreWithUUIDConflict +# nodename4 must be the name of a child node with a OPV definition COPY or VERSION +javax.jcr.tck.RestoreTest.testRestoreWithUUIDConflict.nodename4=test:versionOnParentVersion + # config for nodes that show the indicated OPV behaviour: # nodes are added in order to test the versioning behaviour indicated by the test-class name. # NOTE: @@ -101,9 +392,4 @@ javax.jcr.tck.OnParentVersionCopyTest.nodename4=test:copyOnParentVersion javax.jcr.tck.OnParentVersionCopyTest.nodetype=nt:unstructured javax.jcr.tck.OnParentVersionAbortTest.nodename4=test:abortOnParentVersion -javax.jcr.tck.OnParentVersionAbortTest.nodetype=nt:unstructured - -# repository name -org.apache.jackrabbit.repository.config=applications/test/repository.xml -org.apache.jackrabbit.repository.name=repo -org.apache.jackrabbit.repository.home=applications/test +javax.jcr.tck.OnParentVersionAbortTest.nodetype=nt:unstructured \ No newline at end of file Index: applications/test/log4j.xml =================================================================== --- applications/test/log4j.xml (revision 160266) +++ applications/test/log4j.xml (working copy) @@ -24,19 +24,14 @@ - - + + + + + @@ -53,7 +48,7 @@ - - + + Index: applications/test/repository.xml =================================================================== --- applications/test/repository.xml (revision 160266) +++ applications/test/repository.xml (working copy) @@ -1,20 +1,4 @@ - - + + + + + + + + + @@ -86,7 +92,7 @@ ]> + + + + + + + + + @@ -129,7 +150,7 @@ @@ -138,20 +159,46 @@ - - + + + + + + + + @@ -173,9 +220,15 @@ - + + +