Author: thomasm
Date: Wed Sep 2 11:34:21 2015
New Revision: 1700767
URL: http://svn.apache.org/r1700767
Log:
OAK-3265 Test failures: NodeLocalNameTest, NodeNameTest
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/pom.xml
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
jackrabbit/oak/branches/1.2/oak-jcr/pom.xml
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java?rev=1700767&r1=1700766&r2=1700767&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
Wed Sep 2 11:34:21 2015
@@ -129,8 +129,13 @@ public class NodeNameImpl extends Dynami
name = ISO9075.decode(name);
// normalize paths (./name > name)
name = PropertyValues.getOakPath(name, query.getNamePathMapper());
-
- if (name.startsWith("[") && !name.endsWith("]")) {
+ if (PathUtils.isAbsolute(name)) {
+ throw new IllegalArgumentException("Not a valid JCR name: "
+ + name + " (absolute paths are not names)");
+ } else if (PathUtils.getDepth(name) > 1) {
+ throw new IllegalArgumentException("Not a valid JCR name: "
+ + name + " (relative path with depth > 1 are not names)");
+ } else if (name.startsWith("[") && !name.endsWith("]")) {
return null;
} else if (!JcrNameParser.validate(name)) {
return null;
Modified: jackrabbit/oak/branches/1.0/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/pom.xml?rev=1700767&r1=1700766&r2=1700767&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/pom.xml Wed Sep 2 11:34:21 2015
@@ -107,8 +107,8 @@
org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType
<!-- OAK-474 -->
org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS
<!-- OAK-474 -->
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testStringLiteralInvalidName
<!-- OAK-3265 -->
+
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testPathLiteral
<!-- OAK-3265 -->
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
<!-- OAK-3265 -->
- org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testPathLiteral
<!-- OAK-3265 -->
org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtEnd
<!-- OAK-318 -->
org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtStart
<!-- OAK-318 -->
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java?rev=1700767&r1=1700766&r2=1700767&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
Wed Sep 2 11:34:21 2015
@@ -129,8 +129,13 @@ public class NodeNameImpl extends Dynami
name = ISO9075.decode(name);
// normalize paths (./name > name)
name = PropertyValues.getOakPath(name, query.getNamePathMapper());
-
- if (name.startsWith("[") && !name.endsWith("]")) {
+ if (PathUtils.isAbsolute(name)) {
+ throw new IllegalArgumentException("Not a valid JCR name: "
+ + name + " (absolute paths are not names)");
+ } else if (PathUtils.getDepth(name) > 1) {
+ throw new IllegalArgumentException("Not a valid JCR name: "
+ + name + " (relative path with depth > 1 are not names)");
+ } else if (name.startsWith("[") && !name.endsWith("]")) {
return null;
} else if (!JcrNameParser.validate(name)) {
return null;
Modified: jackrabbit/oak/branches/1.2/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/pom.xml?rev=1700767&r1=1700766&r2=1700767&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/pom.xml Wed Sep 2 11:34:21 2015
@@ -107,8 +107,8 @@
org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType
<!-- OAK-474 -->
org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS
<!-- OAK-474 -->
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testStringLiteralInvalidName
<!-- OAK-3265 -->
+
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testPathLiteral
<!-- OAK-3265 -->
org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
<!-- OAK-3265 -->
- org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testPathLiteral
<!-- OAK-3265 -->
org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtEnd
<!-- OAK-318 -->
org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtStart
<!-- OAK-318 -->
