You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2018/09/05 02:28:13 UTC
svn commit: r1840077 - in /jackrabbit/commons/filevault/trunk:
vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/
vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/tes...
Author: tripod
Date: Wed Sep 5 02:28:13 2018
New Revision: 1840077
URL: http://svn.apache.org/viewvc?rev=1840077&view=rev
Log:
JCRVLT-317 Aggregate not recognized as XML if root element name followed by a newline
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/XmlAnalyzer.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml
jackrabbit/commons/filevault/trunk/vault-sync/src/main/java/org/apache/jackrabbit/vault/sync/impl/XmlAnalyzer.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/XmlAnalyzer.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/XmlAnalyzer.java?rev=1840077&r1=1840076&r2=1840077&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/XmlAnalyzer.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/XmlAnalyzer.java Wed Sep 5 02:28:13 2018
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.vault.fs.i
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.SerializationType;
@@ -79,7 +80,7 @@ public class XmlAnalyzer {
}
String str = new String(buffer, 0, pos);
// check for docview
- if (str.contains("<jcr:root ") && str.contains("\"http://www.jcp.org/jcr/1.0\"")) {
+ if (str.contains("<jcr:root") && str.contains("\"http://www.jcp.org/jcr/1.0\"")) {
type = SerializationType.XML_DOCVIEW;
} else if (str.contains("<?xml ")) {
type = SerializationType.XML_GENERIC;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml?rev=1840077&r1=1840076&r2=1840077&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/mode_ac_test_a.zip/jcr_root/testroot/secured/_rep_policy.xml Wed Sep 5 02:28:13 2018
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+<jcr:root
+ xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
jcr:primaryType="rep:ACL">
<deny
jcr:primaryType="rep:DenyACE"
Modified: jackrabbit/commons/filevault/trunk/vault-sync/src/main/java/org/apache/jackrabbit/vault/sync/impl/XmlAnalyzer.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-sync/src/main/java/org/apache/jackrabbit/vault/sync/impl/XmlAnalyzer.java?rev=1840077&r1=1840076&r2=1840077&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-sync/src/main/java/org/apache/jackrabbit/vault/sync/impl/XmlAnalyzer.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-sync/src/main/java/org/apache/jackrabbit/vault/sync/impl/XmlAnalyzer.java Wed Sep 5 02:28:13 2018
@@ -80,7 +80,7 @@ public class XmlAnalyzer {
}
String str = new String(buffer, 0, pos);
// check for docview
- if (str.contains("<jcr:root ") && str.contains("\"http://www.jcp.org/jcr/1.0\"")) {
+ if (str.contains("<jcr:root") && str.contains("\"http://www.jcp.org/jcr/1.0\"")) {
type = SerializationType.XML_DOCVIEW;
} else if (str.contains("<?xml ")) {
type = SerializationType.XML_GENERIC;