You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/07/22 09:59:01 UTC
[sling-org-apache-sling-contentparser-xml-jcr] branch master
created (now f52a0be)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git.
at f52a0be SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
This branch includes the following new commits:
new 4fd5212 SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
new 9389411 SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
new 3f95309 SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
new cc6c4e3 SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
new f52a0be SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-contentparser-xml-jcr] 04/05: SLING-8570 -
Extract a generic Content Parser API from
org.apache.sling.jcr.contentparser with pluggable implementations
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git
commit cc6c4e337a6b157ba8f51ff27ccf1c4fd407934d
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Jul 22 09:39:40 2019 +0200
SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
* completely decoupled the API from implementations - the ContentParser API
doesn't suggest any content types any more
* removed JSON specific parser options from the ParserOptions class
* made the ParserOptions class extendable
* switched exported API packages to version 2.0.0, to eliminate all possible
confusion with the older org.apache.sling.jcr.contentparser API
---
README.md | 4 ++--
.../{JcrXmlContentParser.java => JCRXMLContentParser.java} | 6 +++---
...{JcrXmlContentParserTest.java => JCRXMLContentParserTest.java} | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 5bc2b92..52b05d0 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ This module is part of the [Apache Sling](https://sling.apache.org) project.
The Apache Sling Content Parser for JackRabbit FileVault XML provides support for parsing XML files into Apache Sling resource trees, by implementing the
API provided by the [`org.apache.sling.contentparser.api`](https://github.com/apache/sling-whiteboard/tree/master/contentparser/org-apache-sling-contentparser-api) bundle.
-To obtain a reference to the JackRabbit FileVault XMLL content parser just filter on the `ContentParser.SERVICE_PROPERTY_CONTENT_TYPE` service registration
+To obtain a reference to the JackRabbit FileVault XML content parser just filter on the `ContentParser.SERVICE_PROPERTY_CONTENT_TYPE` service registration
property:
```java
- @Reference(target = "(" + ContentParser.SERVICE_PROPERTY_CONTENT_TYPE + "=" + ContentParser.JCR_XML_CONTENT_TYPE + ")")
+ @Reference(target = "(" + ContentParser.SERVICE_PROPERTY_CONTENT_TYPE + "=jcr-xml)")
private ContentParser jcrXmlParser;
```
diff --git a/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParser.java b/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JCRXMLContentParser.java
similarity index 98%
rename from src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParser.java
rename to src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JCRXMLContentParser.java
index 1e01575..d402ac6 100644
--- a/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParser.java
+++ b/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JCRXMLContentParser.java
@@ -46,14 +46,14 @@ import org.xml.sax.helpers.DefaultHandler;
@Component(
service = ContentParser.class,
property = {
- ContentParser.SERVICE_PROPERTY_CONTENT_TYPE + "=" + ContentParser.JCR_XML_CONTENT_TYPE
+ ContentParser.SERVICE_PROPERTY_CONTENT_TYPE + "=jcr-xml"
}
)
-public final class JcrXmlContentParser implements ContentParser {
+public final class JCRXMLContentParser implements ContentParser {
private final SAXParserFactory saxParserFactory;
- public JcrXmlContentParser() {
+ public JCRXMLContentParser() {
saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
}
diff --git a/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParserTest.java b/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JCRXMLContentParserTest.java
similarity index 96%
rename from src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParserTest.java
rename to src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JCRXMLContentParserTest.java
index 0c2a826..349a991 100644
--- a/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParserTest.java
+++ b/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JCRXMLContentParserTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class JcrXmlContentParserTest {
+public class JCRXMLContentParserTest {
private File file;
private ContentParser underTest;
@@ -49,7 +49,7 @@ public class JcrXmlContentParserTest {
@Before
public void setUp() {
file = new File("src/test/resources/content-test/content.jcr.xml");
- underTest = new JcrXmlContentParser();
+ underTest = new JCRXMLContentParser();
}
@Test
@@ -96,8 +96,8 @@ public class JcrXmlContentParserTest {
@Test
public void testDecodeName() {
- assertEquals("jcr:title", JcrXmlContentParser.decodeName("jcr:" + ISO9075.encode("title")));
- assertEquals("sling:123", JcrXmlContentParser.decodeName("sling:" + ISO9075.encode("123")));
+ assertEquals("jcr:title", JCRXMLContentParser.decodeName("jcr:" + ISO9075.encode("title")));
+ assertEquals("sling:123", JCRXMLContentParser.decodeName("sling:" + ISO9075.encode("123")));
}
@Test
[sling-org-apache-sling-contentparser-xml-jcr] 03/05: SLING-8570 -
Extract a generic Content Parser API from
org.apache.sling.jcr.contentparser with pluggable implementations
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git
commit 3f9530908efb60cc691f30655fd05131d147c8cc
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Jul 17 09:59:05 2019 +0200
SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
* added README, CODE_OF_CONDUCT, CONTRIBUTING, LICENSE and .gitignore files
to each module
---
.gitignore | 17 +++++
CODE_OF_CONDUCT.md | 22 ++++++
CONTRIBUTING.md | 24 +++++++
LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++
README.md | 14 ++++
5 files changed, 279 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b783ed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+/target
+.idea
+.classpath
+.metadata
+.project
+.settings
+.externalToolBuilders
+maven-eclipse.xml
+*.swp
+*.iml
+*.ipr
+*.iws
+*.bak
+.vlt
+.DS_Store
+jcr.log
+atlassian-ide-plugin.xml
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..0fa18e5
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,22 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+Apache Software Foundation Code of Conduct
+====
+
+Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..ac82a1a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,24 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+Contributing
+====
+
+Thanks for choosing to contribute!
+
+You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5bc2b92
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+Apache Sling Content Parser for JackRabbit FileVault XML
+====
+This module is part of the [Apache Sling](https://sling.apache.org) project.
+
+The Apache Sling Content Parser for JackRabbit FileVault XML provides support for parsing XML files into Apache Sling resource trees, by implementing the
+API provided by the [`org.apache.sling.contentparser.api`](https://github.com/apache/sling-whiteboard/tree/master/contentparser/org-apache-sling-contentparser-api) bundle.
+
+To obtain a reference to the JackRabbit FileVault XMLL content parser just filter on the `ContentParser.SERVICE_PROPERTY_CONTENT_TYPE` service registration
+property:
+
+```java
+ @Reference(target = "(" + ContentParser.SERVICE_PROPERTY_CONTENT_TYPE + "=" + ContentParser.JCR_XML_CONTENT_TYPE + ")")
+ private ContentParser jcrXmlParser;
+```
[sling-org-apache-sling-contentparser-xml-jcr] 02/05: SLING-8570 -
Extract a generic Content Parser API from
org.apache.sling.jcr.contentparser with pluggable implementations
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git
commit 9389411a4e3e59dc2a045a8cb72a5d0eadbf3c41
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Jul 15 13:53:24 2019 +0200
SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
* configured bnd-baseline-maven-plugin to not fail the build when
there's no artifact available for the baseline analysis
---
pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/pom.xml b/pom.xml
index b671280..3e0e1c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,18 @@
<tag>HEAD</tag>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
[sling-org-apache-sling-contentparser-xml-jcr] 05/05: SLING-8570 -
Extract a generic Content Parser API from
org.apache.sling.jcr.contentparser with pluggable implementations
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git
commit f52a0bedd340c0cb967cd7425d2a3180f08d9666
Author: Radu Cotescu <co...@adobe.com>
AuthorDate: Mon Jul 22 11:58:43 2019 +0200
SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
* added Jenkinsfile and updated links in README
---
Jenkinsfile | 20 ++++++++++++++++++++
README.md | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..3882176
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,20 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+// please rebuild
+slingOsgiBundleBuild()
diff --git a/README.md b/README.md
index 52b05d0..a192a13 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Apache Sling Content Parser for JackRabbit FileVault XML
This module is part of the [Apache Sling](https://sling.apache.org) project.
The Apache Sling Content Parser for JackRabbit FileVault XML provides support for parsing XML files into Apache Sling resource trees, by implementing the
-API provided by the [`org.apache.sling.contentparser.api`](https://github.com/apache/sling-whiteboard/tree/master/contentparser/org-apache-sling-contentparser-api) bundle.
+API provided by the [`org.apache.sling.contentparser.api`](https://github.com/apache/sling-org-apache-sling-contentparser-api) bundle.
To obtain a reference to the JackRabbit FileVault XML content parser just filter on the `ContentParser.SERVICE_PROPERTY_CONTENT_TYPE` service registration
property:
[sling-org-apache-sling-contentparser-xml-jcr] 01/05: SLING-8570 -
Extract a generic Content Parser API from
org.apache.sling.jcr.contentparser with pluggable implementations
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git
commit 4fd521278eb4753a9b30e48292c7d6df67dcbba9
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Jul 15 12:02:03 2019 +0200
SLING-8570 - Extract a generic Content Parser API from org.apache.sling.jcr.contentparser with pluggable implementations
* added parser for JCR-flavoured XML
* made the ParserHelper compatible with both Java 8 and Java 11
* reduced the number of dependencies for all modules
---
pom.xml | 87 +++++++++
.../xml/jcr/internal/JcrXmlContentParser.java | 193 ++++++++++++++++++++
.../xml/jcr/internal/JcrXmlValueConverter.java | 149 ++++++++++++++++
.../xml/jcr/internal/JcrXmlContentParserTest.java | 146 ++++++++++++++++
.../xml/jcr/internal/JcrXmlValueConverterTest.java | 123 +++++++++++++
src/test/resources/content-test/content.jcr.xml | 194 +++++++++++++++++++++
src/test/resources/invalid-test/invalid.jcr.xml | 20 +++
7 files changed, 912 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..b671280
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.contentparser.xml-jcr</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+
+ <name>Apache Sling Content Parser for JackRabbit FileVault XML</name>
+ <description>
+ Apache Sling Content Parser for resource trees stored in JackRabbit FileVault XML files
+ </description>
+
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-xml-jcr.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-contentparser-xml-jcr.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.contentparser.api</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>3.1.18</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.contentparser.testutils</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParser.java b/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParser.java
new file mode 100644
index 0000000..1e01575
--- /dev/null
+++ b/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParser.java
@@ -0,0 +1,193 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.contentparser.xml.jcr.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.util.ISO9075;
+import org.apache.sling.contentparser.api.ContentHandler;
+import org.apache.sling.contentparser.api.ContentParser;
+import org.apache.sling.contentparser.api.ParseException;
+import org.apache.sling.contentparser.api.ParserOptions;
+import org.osgi.service.component.annotations.Component;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+@Component(
+ service = ContentParser.class,
+ property = {
+ ContentParser.SERVICE_PROPERTY_CONTENT_TYPE + "=" + ContentParser.JCR_XML_CONTENT_TYPE
+ }
+)
+public final class JcrXmlContentParser implements ContentParser {
+
+ private final SAXParserFactory saxParserFactory;
+
+ public JcrXmlContentParser() {
+ saxParserFactory = SAXParserFactory.newInstance();
+ saxParserFactory.setNamespaceAware(true);
+ }
+
+ @Override
+ public void parse(ContentHandler handler, InputStream is, ParserOptions parserOptions) throws IOException, ParseException {
+ try {
+ XmlHandler xmlHandler = new XmlHandler(handler, parserOptions);
+ SAXParser parser = saxParserFactory.newSAXParser();
+ parser.parse(is, xmlHandler);
+ if (xmlHandler.hasError()) {
+ throw xmlHandler.getError();
+ }
+ } catch (ParserConfigurationException | SAXException ex) {
+ throw new ParseException("Error parsing JCR XML content.", ex);
+ }
+ }
+
+ /**
+ * Decodes element or attribute names.
+ *
+ * @param qname qname
+ * @return Decoded name
+ */
+ static String decodeName(String qname) {
+ return ISO9075.decode(qname);
+ }
+
+ /**
+ * Parses XML stream to Map.
+ */
+ class XmlHandler extends DefaultHandler {
+ private final ContentHandler contentHandler;
+ private final ParserOptions parserOptions;
+ private final Deque<String> paths = new ArrayDeque<>();
+ private final Set<String> ignoredPaths = new HashSet<>();
+ private SAXParseException error;
+
+ XmlHandler(ContentHandler contentHandler, ParserOptions parserOptions) {
+ this.contentHandler = contentHandler;
+ this.parserOptions = parserOptions;
+ }
+
+ boolean hasError() {
+ return error != null;
+ }
+
+ SAXParseException getError() {
+ return error;
+ }
+
+ @Override
+ public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ String resourceName = decodeName(qName);
+
+ // generate path for element
+ String path;
+ if (paths.isEmpty()) {
+ path = "/";
+ } else {
+ String parentPath = paths.peek();
+ path = parentPath.endsWith("/") ? parentPath + resourceName : parentPath + "/" + resourceName;
+ if (parserOptions.getIgnoreResourceNames().contains(resourceName)) {
+ ignoredPaths.add(path);
+ }
+ }
+ paths.push(path);
+
+ // skip further processing if this path or a parent path is ignored
+ if (isIgnoredPath(path)) {
+ return;
+ }
+
+ // get properties
+ Map<String, Object> properties = new HashMap<>();
+ for (int i = 0; i < attributes.getLength(); i++) {
+ String propertyName = removePrefixFromPropertyName(parserOptions.getRemovePropertyNamePrefixes(),
+ decodeName(attributes.getQName(i)));
+ if (!parserOptions.getIgnorePropertyNames().contains(propertyName)) {
+ Object value = JcrXmlValueConverter.parseValue(propertyName, attributes.getValue(i));
+ if (value != null) {
+ properties.put(propertyName, value);
+ }
+ }
+ }
+ String defaultPrimaryType = parserOptions.getDefaultPrimaryType();
+ if (defaultPrimaryType != null) {
+ if (!properties.containsKey(JcrConstants.JCR_PRIMARYTYPE)) {
+ properties.put(JcrConstants.JCR_PRIMARYTYPE, defaultPrimaryType);
+ }
+ }
+ contentHandler.resource(path, properties);
+ }
+
+ @Override
+ public void endElement(String uri, String localName, String qName) {
+ paths.pop();
+ }
+
+ @Override
+ public void error(SAXParseException ex) {
+ this.error = ex;
+ }
+
+ @Override
+ public void fatalError(SAXParseException ex) {
+ this.error = ex;
+ }
+
+ private boolean isIgnoredPath(String path) {
+ if (path == null || path.isEmpty()) {
+ return false;
+ }
+ if (ignoredPaths.contains(path)) {
+ return true;
+ }
+ if (path.contains("/")) {
+ String parentPath = path.substring(0, path.lastIndexOf("/"));
+ return isIgnoredPath(parentPath);
+ } else {
+ return isIgnoredPath(path);
+ }
+
+ }
+
+ private String removePrefixFromPropertyName(Set<String> prefixes, String propertyName) {
+ for (String prefix : prefixes) {
+ if (propertyName.startsWith(prefix)) {
+ return propertyName.substring(prefix.length());
+ }
+ }
+ return propertyName;
+ }
+
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlValueConverter.java b/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlValueConverter.java
new file mode 100644
index 0000000..8d1695c
--- /dev/null
+++ b/src/main/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlValueConverter.java
@@ -0,0 +1,149 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.contentparser.xml.jcr.internal;
+
+import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Calendar;
+import java.util.UUID;
+
+import javax.jcr.PropertyType;
+
+import org.apache.jackrabbit.util.ISO8601;
+import org.apache.jackrabbit.vault.util.DocViewProperty;
+
+/**
+ * Parses JCR XML files that contains content fragments.
+ */
+class JcrXmlValueConverter {
+
+ private JcrXmlValueConverter() {
+ // static methods only
+ }
+
+ /**
+ * Parse value from XML Attribute.
+ *
+ * @param value XML attribute value
+ * @return value object
+ */
+ static Object parseValue(final String name, final String value) {
+ if (value == null) {
+ return null;
+ }
+ DocViewProperty prop = DocViewProperty.parse(name, value);
+
+ // convert values
+ if (prop.isMulti) {
+ Class<?> arrayType = getType(prop.type);
+ if (arrayType == null) {
+ return null;
+ }
+ Object result = Array.newInstance(arrayType, prop.values.length);
+ for (int i = 0; i < prop.values.length; i++) {
+ Array.set(result, i, convertValue(prop.values[i], prop.type));
+ }
+ return result;
+ } else {
+ return convertValue(prop.values[0], prop.type);
+ }
+ }
+
+ /**
+ * Parse value depending on type prefix.
+ *
+ * @param value Value
+ * @param type Type
+ * @return Value object
+ */
+ private static Object convertValue(final String value, final int type) {
+ switch (type) {
+ case PropertyType.UNDEFINED:
+ case PropertyType.STRING:
+ case PropertyType.NAME:
+ case PropertyType.PATH:
+ return value;
+ case PropertyType.BOOLEAN:
+ return Boolean.valueOf(value);
+ case PropertyType.LONG:
+ return Long.valueOf(value);
+ case PropertyType.DOUBLE:
+ return Double.valueOf(value);
+ case PropertyType.DECIMAL:
+ return new BigDecimal(value);
+ case PropertyType.DATE:
+ return ISO8601.parse(value);
+ case PropertyType.REFERENCE:
+ case PropertyType.WEAKREFERENCE:
+ return UUID.fromString(value);
+ case PropertyType.URI:
+ try {
+ return new URI(value);
+ } catch (URISyntaxException ex) {
+ throw new IllegalArgumentException("Unexpected URI syntax: " + value);
+ }
+ case PropertyType.BINARY:
+ // not supported - ignore value
+ return null;
+ default:
+ throw new IllegalArgumentException("Unexpected type: " + PropertyType.nameFromValue(type));
+
+ }
+ }
+
+ /**
+ * Get java type for given JCR type.
+ *
+ * @param type Type
+ * @return Type
+ */
+ private static Class<?> getType(final int type) {
+ switch (type) {
+ case PropertyType.UNDEFINED:
+ case PropertyType.STRING:
+ case PropertyType.NAME:
+ case PropertyType.PATH:
+ return String.class;
+ case PropertyType.BOOLEAN:
+ return Boolean.class;
+ case PropertyType.LONG:
+ return Long.class;
+ case PropertyType.DOUBLE:
+ return Double.class;
+ case PropertyType.DECIMAL:
+ return BigDecimal.class;
+ case PropertyType.DATE:
+ return Calendar.class;
+ case PropertyType.REFERENCE:
+ case PropertyType.WEAKREFERENCE:
+ return UUID.class;
+ case PropertyType.URI:
+ return URI.class;
+ case PropertyType.BINARY:
+ // not supported - ignore value
+ return null;
+ default:
+ throw new IllegalArgumentException("Unexpected type: " + PropertyType.nameFromValue(type));
+
+ }
+ }
+
+}
diff --git a/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParserTest.java b/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParserTest.java
new file mode 100644
index 0000000..0c2a826
--- /dev/null
+++ b/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlContentParserTest.java
@@ -0,0 +1,146 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.contentparser.xml.jcr.internal;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.apache.jackrabbit.util.ISO9075;
+import org.apache.sling.contentparser.api.ContentParser;
+import org.apache.sling.contentparser.api.ParseException;
+import org.apache.sling.contentparser.api.ParserOptions;
+import org.apache.sling.contentparser.testutils.mapsupport.ContentElement;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.sling.contentparser.testutils.TestUtils.parse;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class JcrXmlContentParserTest {
+
+ private File file;
+ private ContentParser underTest;
+
+ @Before
+ public void setUp() {
+ file = new File("src/test/resources/content-test/content.jcr.xml");
+ underTest = new JcrXmlContentParser();
+ }
+
+ @Test
+ public void testParseJcrXml() throws Exception {
+ ContentElement content = parse(underTest, file);
+ assertNotNull(content);
+ assertEquals("app:Page", content.getProperties().get("jcr:primaryType"));
+ ContentElement child = content.getChild("jcr:content");
+ assertNotNull("Expected child at jcr:content", child);
+ assertEquals("app:PageContent", child.getProperties().get("jcr:primaryType"));
+ }
+
+ @Test(expected= ParseException.class)
+ public void testParseInvalidJcrXml() throws Exception {
+ file = new File("src/test/resources/invalid-test/invalid.jcr.xml");
+ parse(underTest, file);
+ }
+
+ @Test
+ public void testDataTypes() throws Exception {
+ ContentElement content = parse(underTest, file);
+ ContentElement child = content.getChild("jcr:content");
+ assertNotNull("Expected child at jcr:content", child);
+ Map<String,Object> props = child.getProperties();
+
+ assertEquals("en", props.get("jcr:title"));
+ assertEquals(true, props.get("includeAside"));
+ assertEquals(1234567890123L, props.get("longProp"));
+ assertEquals(new BigDecimal("1.2345"), props.get("decimalProp"));
+
+ assertArrayEquals(new String[] { "aa", "bb", "cc" }, (String[])props.get("stringPropMulti"));
+ assertArrayEquals(new Long[] { 1234567890123L, 55L }, (Long[])props.get("longPropMulti"));
+
+ Calendar calendar = (Calendar)props.get("dateProp");
+ calendar.setTimeZone(TimeZone.getTimeZone("GMT+2"));
+ assertEquals(2014, calendar.get(Calendar.YEAR));
+ assertEquals(9, calendar.get(Calendar.MONTH) + 1);
+ assertEquals(19, calendar.get(Calendar.DAY_OF_MONTH));
+ assertEquals(21, calendar.get(Calendar.HOUR_OF_DAY));
+ assertEquals(20, calendar.get(Calendar.MINUTE));
+ assertEquals(26, calendar.get(Calendar.SECOND));
+ assertEquals(812, calendar.get(Calendar.MILLISECOND));
+ }
+
+ @Test
+ public void testDecodeName() {
+ assertEquals("jcr:title", JcrXmlContentParser.decodeName("jcr:" + ISO9075.encode("title")));
+ assertEquals("sling:123", JcrXmlContentParser.decodeName("sling:" + ISO9075.encode("123")));
+ }
+
+ @Test
+ public void testIgnoreResourcesProperties() throws Exception {
+ ContentElement content = parse(underTest,
+ new ParserOptions().ignoreResourceNames(Collections.unmodifiableSet(new HashSet<>(Arrays.asList("teaserbar", "aside"))))
+ .ignorePropertyNames(Collections.unmodifiableSet(new HashSet<>(Arrays.asList("longProp", "jcr:title")))), file);
+ ContentElement child = content.getChild("jcr:content");
+ assertNotNull("Expected child at jcr:content", child);
+ assertEquals("HOME", child.getProperties().get("navTitle"));
+ assertNull(child.getProperties().get("jcr:title"));
+ assertNull(child.getProperties().get("longProp"));
+
+ assertNull(child.getChildren().get("teaserbar"));
+ assertNull(child.getChildren().get("aside"));
+ assertNotNull(child.getChildren().get("content"));
+ }
+
+ @Test
+ public void testGetChild() throws Exception {
+ ContentElement content = parse(underTest, file);
+ assertNull(content.getName());
+
+ ContentElement deepChild = content.getChild("jcr:content/teaserbar/teaserbaritem");
+ assertNotNull("Expected child at jcr:content/teaserbar/teaserbaritem", deepChild);
+ assertEquals("teaserbaritem", deepChild.getName());
+ assertEquals("samples/sample-app/components/content/teaserbar/teaserbarItem", deepChild.getProperties().get("sling:resourceType"));
+
+ ContentElement invalidChild = content.getChild("non/existing/path");
+ assertNull(invalidChild);
+
+ invalidChild = content.getChild("/jcr:content");
+ assertNull(invalidChild);
+ }
+
+ @Test
+ public void testSameNamePropertyAndSubResource() throws Exception {
+ ContentElement content = parse(underTest, file);
+ ContentElement child = content.getChild("jcr:content/teaserbar");
+ assertNotNull("Expected child at jcr:content/teaserbar", child);
+ // teaserbaritem is a direct property as well as a sub resource
+ assertEquals("test", child.getProperties().get("teaserbaritem"));
+ assertNotNull(child.getChildren().get("teaserbaritem"));
+ }
+
+}
diff --git a/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlValueConverterTest.java b/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlValueConverterTest.java
new file mode 100644
index 0000000..f33b13c
--- /dev/null
+++ b/src/test/java/org/apache/sling/contentparser/xml/jcr/internal/JcrXmlValueConverterTest.java
@@ -0,0 +1,123 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.contentparser.xml.jcr.internal;
+
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.Calendar;
+import java.util.UUID;
+
+import org.junit.Test;
+
+import static org.apache.sling.contentparser.xml.jcr.internal.JcrXmlValueConverter.parseValue;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class JcrXmlValueConverterTest {
+
+ private static final String NAME = "prop1";
+
+ @Test
+ public void testNull() {
+ assertNull(parseValue(NAME, null));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testInvalid() {
+ parseValue(NAME, "{InvalidType}xyz");
+ }
+
+ @Test
+ public void testString() {
+ assertEquals("myString", parseValue(NAME, "myString"));
+ assertEquals("prop", "myString [ ] { } \\ ,", parseValue(NAME, "myString [ ] { } \\\\ ,"));
+ assertEquals("{myString}", parseValue(NAME, "\\{myString}"));
+ assertEquals("aaa{myString}", parseValue(NAME, "aaa{myString}"));
+ assertEquals("[myString]", parseValue(NAME, "\\[myString]"));
+ assertEquals("aaa[myString]", parseValue(NAME, "aaa[myString]"));
+ }
+
+ @Test
+ public void testStringArray() {
+ assertArrayEquals(new Object[] { "myString1", "myString2" }, (Object[]) parseValue(NAME, "[myString1,myString2]"));
+ assertArrayEquals(new Object[] { "myString1,[]\\äöü߀", "myString2", "myString3 [ ] { } \\ ,", "", "[myString5]", "{myString6}" },
+ (Object[]) parseValue(NAME, "[myString1\\,[]\\\\äöü߀,myString2,myString3 [ ] { } \\\\ \\,,,[myString5],{myString6}]"));
+ }
+
+ @Test
+ public void testBoolean() {
+ assertEquals(true, parseValue(NAME, "{Boolean}true"));
+ assertEquals(false, parseValue(NAME, "{Boolean}false"));
+ }
+
+ @Test
+ public void testBooleanArray() {
+ assertArrayEquals(new Object[] { true, false }, (Object[]) parseValue(NAME, "{Boolean}[true,false]"));
+ }
+
+ @Test
+ public void testLong() {
+ assertEquals(1L, parseValue(NAME, "{Long}1"));
+ assertEquals(10000000000L, parseValue(NAME, "{Long}10000000000"));
+ }
+
+ @Test
+ public void testLongArray() {
+ assertArrayEquals(new Object[] { 1L, 2L }, (Object[]) parseValue(NAME, "{Long}[1,2]"));
+ assertArrayEquals(new Object[] { 10000000000L, 20000000000L }, (Object[]) parseValue(NAME, "{Long}[10000000000,20000000000]"));
+ }
+
+ @Test
+ public void testDouble() {
+ assertEquals(new BigDecimal("1.234"), parseValue(NAME, "{Decimal}1.234"));
+ }
+
+ @Test
+ public void testDoubleArray() {
+ assertArrayEquals(new Object[] { new BigDecimal("1.234"), new BigDecimal("2.345") }, (Object[]) parseValue(NAME, "{Decimal}[1.234,2.345]"));
+ }
+
+ @Test
+ public void testCalendar() {
+ Calendar value = (Calendar)parseValue(NAME, "{Date}2010-09-05T15:10:20.000Z");
+ assertEquals(2010, value.get(Calendar.YEAR));
+ assertEquals(8, value.get(Calendar.MONTH));
+ assertEquals(5, value.get(Calendar.DAY_OF_MONTH));
+ }
+
+ @Test
+ public void testStringArrayRepPrivileges() {
+ assertArrayEquals(new Object[] { "rep:write", "crx:replicate", "jcr:read" }, (Object[]) parseValue(NAME, "{Name}[rep:write,crx:replicate,jcr:read]"));
+ }
+
+ @Test
+ public void testReference() {
+ UUID uuid = UUID.randomUUID();
+ UUID value = (UUID)parseValue(NAME, "{Reference}" + uuid.toString());
+ assertEquals(uuid, value);
+ }
+
+ @Test
+ public void testURI() {
+ URI value = (URI)parseValue(NAME, "{URI}http://www.jodelkaiser.de/");
+ assertEquals("http://www.jodelkaiser.de/", value.toString());
+ }
+
+}
diff --git a/src/test/resources/content-test/content.jcr.xml b/src/test/resources/content-test/content.jcr.xml
new file mode 100644
index 0000000..7d97cc0
--- /dev/null
+++ b/src/test/resources/content-test/content.jcr.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:app="http://sample.com/jcr/app/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="app:Page">
+ <jcr:content
+ jcr:primaryType="app:PageContent"
+ jcr:title="en"
+ sling:resourceType="samples/sample-app/components/content/page/homepage"
+ includeAside="{Boolean}true"
+ includeAsideBar="{Boolean}true"
+ includeTeaserBar="{Boolean}true"
+ includeTeaserbar="{Boolean}true"
+ inheritAside="{Boolean}false"
+ inheritTeaserbar="{Boolean}false"
+ longProp="{Long}1234567890123"
+ decimalProp="{Decimal}1.2345"
+ longPropMulti="{Long}[1234567890123,55]"
+ stringPropMulti="[aa,bb,cc]"
+ dateProp="{Date}2014-09-19T21:20:26.812+02:00"
+ navTitle="HOME"
+ pageTitle="Sample Site">
+ <teaserbar
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/teaserbar/teaserbarParsys"
+ teaserbaritem="test">
+ <teaserbaritem
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/teaserbar/teaserbarItem"
+ linkContentRef="/content/samples/en/conference"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="This should help you with your decision"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self"
+ mediaRef="/content/dam/samples/content/user.png"
+ teaserContent="Still not convinced to attend? Need persuasion? Facts for your boss?"
+ title="Why to attend" />
+ <teaserbaritem_0
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/teaserbar/teaserbarItem"
+ linkContentRef="/content/samples/en/venue"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="More information"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self"
+ mediaRef="/content/dam/samples/content/location.png"
+ teaserContent="Take a look at the new venue for 2013. The Kulturbrauerei in the Prenzlauer Berg district."
+ title="Location" />
+ <teaserbaritem_1
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/teaserbar/teaserbarItem"
+ linkContentRef="/content/samples/en/conference/call-for-papers"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="Submit your proposal here"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self"
+ mediaRef="/content/dam/samples/content/talk.png"
+ teaserContent="If you have insight and experiences with Apache Sling and want to share them? We are actually asking for your participation!"
+ title="Want to share?" />
+ <teaserbaritem_2
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/teaserbar/teaserbarItem"
+ linkContentRef="/content/samples/en/archive"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="Dive into the archive"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self"
+ mediaRef="/content/dam/samples/content/archive.png"
+ teaserContent="adaptTo() is not a new event. Take a look at what was said and done previously."
+ title="Take a look back" />
+ </teaserbar>
+ <aside
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideParsys">
+ <asidesponsorteaser
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideSponsorTeaser"
+ title="Sponsors">
+ <images
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideSponsorTeaserParsys">
+ <asidesponsorteaserit_0
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideSponsorTeaserItem"
+ imageHeight="41"
+ imageWidth="200"
+ linkExternalRef="http://www.pro-vision.de"
+ linkType="external"
+ linkWindowFeatures="default"
+ linkWindowTarget="_blank"
+ mediaRef="/content/dam/samples/content/provision-logo.png" />
+ </images>
+ </asidesponsorteaser>
+ <asidesocialteaser
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideSocialTeaser"
+ title="Follow us">
+ <images
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideSponsorTeaserParsys">
+ <asidesocialteaserite
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/aside/asideSocialTeaserItem"
+ linkExternalRef="http://twitter.com/adaptto"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="@adaptTo"
+ linkType="external"
+ linkWindowFeatures="default"
+ linkWindowTarget="_blank"
+ mediaRef="/content/dam/samples/content/twitter-icon.png"
+ title="on twitter" />
+ </images>
+ </asidesocialteaser>
+ </aside>
+ <content
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="sample/wcm/parsys/components/parsys">
+ <contentrichtext
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/common/contentRichText"
+ text="<p>adaptTo() is a meetup in Berlin focused on Apache Sling including Apache Jackrabbit and Apache Felix and is addressed to all using this stack or parts of it.</p>
<p><a data="{&quot;linkType&quot;:&quot;internal&quot;,&quot;linkContentRef&quot;:&quot;/content/samples/handler/en/conference&quot;,&quot;linkWindowTarget&quot;:&quot;_self&quot;,&quot;linkWindowFeatures&quot;:&quot;defa [...]
+ <contentheadline
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/common/contentHeadline"
+ headline="Extended Call for Papers"
+ smaller="{Boolean}true" />
+ <contentrichtext_0
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/common/contentRichText"
+ text="<p>Although we got some great submissions for adaptTo() 2013, we still have some slots for further sessions. Therefore we extend the timeslot for submissions to the call for papers and for feedback by two weeks. This means you still can submit you submissions till 06.05.2013. We're looking forward to get more of your great talks.</p>
<p><a data="{&quot;linkType&quot;:&quot;internal&quot;,&quot;linkContentRef&quot;:& [...]
+ </content>
+ <stage
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="sample/wcm/parsys/components/parsys">
+ <stageheader
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/stage/stageheader"
+ linkMediaDownload="{Boolean}false"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self"
+ mediaRef="/content/dam/samples/content/stageheader-outside2.jpg"
+ subtitle="23.–25. September 2013
Kulturbrauerei Berlin"
+ title="adaptTo() 2013">
+ <links
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/stage/stageheaderParsys">
+ <stageheaderlinkitem
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/stage/stageheaderLinkItem"
+ linkContentRef="/content/samples/en/tickets"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="Get tickets now"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self" />
+ <stageheaderlinkitem_0
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="samples/sample-app/components/content/stage/stageheaderLinkItem"
+ linkContentRef="/content/samples/en/conference/call-for-papers"
+ linkMediaDownload="{Boolean}false"
+ linkTitle="Submit paper"
+ linkType="internal"
+ linkWindowFeatures="default"
+ linkWindowTarget="_self" />
+ </links>
+ </stageheader>
+ </stage>
+ <image
+ jcr:primaryType="nt:unstructured" />
+ </jcr:content>
+ <tools />
+ <conference />
+</jcr:root>
diff --git a/src/test/resources/invalid-test/invalid.jcr.xml b/src/test/resources/invalid-test/invalid.jcr.xml
new file mode 100644
index 0000000..0149495
--- /dev/null
+++ b/src/test/resources/invalid-test/invalid.jcr.xml
@@ -0,0 +1,20 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+This is invalid xml.
+