Author: sseifert
Date: Tue Mar 14 10:41:47 2017
New Revision: 1786869
URL: http://svn.apache.org/viewvc?rev=1786869&view=rev
Log:
SLING-6592 move and rename to jcr/contentparser, change java package and class
names accordingly
Added:
sling/trunk/bundles/jcr/contentparser/
- copied from r1786868, sling/trunk/bundles/commons/fscontentparser/
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileType.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParseException.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParserOptions.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/
- copied from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/package-info.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/package-info.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/
- copied from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
- copied, changed from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java
Removed:
sling/trunk/bundles/commons/fscontentparser/
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/fscontentparser/
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentFileParser.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentFileParser.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/fscontentparser/
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentFileParserTest.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentFileParserTest.java
Modified:
sling/trunk/bundles/jcr/contentparser/pom.xml
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java
sling/trunk/tooling/jenkins/create_jobs.groovy
Modified: sling/trunk/bundles/jcr/contentparser/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/pom.xml?rev=1786869&r1=1786868&r2=1786869&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentparser/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentparser/pom.xml Tue Mar 14 10:41:47 2017
@@ -26,19 +26,19 @@
<relativePath />
</parent>
- <artifactId>org.apache.sling.commons.fscontentparser</artifactId>
+ <artifactId>org.apache.sling.jcr.contentparser</artifactId>
<packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Apache Sling File System Content File Parser</name>
+ <name>Apache Sling Content Parser</name>
<description>
- Parser for repository content stored in files (e.g. JSON, JCR XML).
+ Parser for JCR repository content stored in files (e.g. JSON,
FileVault XML).
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/fscontentparser</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/fscontentparser</developerConnection>
-
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/fscontentparser</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser</url>
</scm>
<build>
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser;
+package org.apache.sling.jcr.contentparser;
import java.io.File;
import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.Map;
* Parses repository content from a file.
* Implementations have to be thread-safe.
*/
-public interface ContentFileParser {
+public interface ContentParser {
/**
* Parse content file.
@@ -39,9 +39,9 @@ public interface ContentFileParser {
Map<String,Object> parse(File file) throws IOException, ParseException;
/**
- * Parse content file.
- * @param file File
- * @return Content
+ * Parse content.
+ * @param is Stream with serialized content
+ * @return Content as Map
* @throws IOException When I/O error occurs.
* @throws ParseException When parsing error occurs.
*/
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java
Tue Mar 14 10:41:47 2017
@@ -16,43 +16,43 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser;
+package org.apache.sling.jcr.contentparser;
-import org.apache.sling.fscontentparser.impl.JcrXmlContentFileParser;
-import org.apache.sling.fscontentparser.impl.JsonContentFileParser;
+import org.apache.sling.jcr.contentparser.impl.JcrXmlContentParser;
+import org.apache.sling.jcr.contentparser.impl.JsonContentParser;
/**
* Factory for content file parsers.
*/
-public final class ContentFileParserFactory {
+public final class ContentParserFactory {
- private ContentFileParserFactory() {
+ private ContentParserFactory() {
// static methods only
}
/**
- * Create content file parser.
- * @param type Content file type
- * @return Content file parser
+ * Create content parser.
+ * @param type Content type
+ * @return Content parser
*/
- public static ContentFileParser create(ContentFileType type) {
+ public static ContentParser create(ContentType type) {
return create(type, new ParserOptions());
}
/**
- * Create content file parser.
- * @param type Content file type
+ * Create content parser.
+ * @param type Content type
* @param options Parser options
- * @return Content file parser
+ * @return Content parser
*/
- public static ContentFileParser create(ContentFileType type, ParserOptions
options) {
+ public static ContentParser create(ContentType type, ParserOptions
options) {
switch (type) {
case JSON:
- return new JsonContentFileParser(options);
+ return new JsonContentParser(options);
case JCR_XML:
- return new JcrXmlContentFileParser(options);
+ return new JcrXmlContentParser(options);
default:
- throw new IllegalArgumentException("Unsupported file
extension: " + type);
+ throw new IllegalArgumentException("Unsupported type: " +
type);
}
}
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileType.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileType.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ContentFileType.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java
Tue Mar 14 10:41:47 2017
@@ -16,27 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser;
+package org.apache.sling.jcr.contentparser;
/**
- * Content file types.
+ * Content types.
*/
-public enum ContentFileType {
+public enum ContentType {
/**
- * JSON content files.
+ * JSON content.
*/
JSON("json"),
/**
- * JCR XML content files.
+ * JCR XML content.
*/
JCR_XML("jcr.xml");
private final String extension;
- private ContentFileType(String extension) {
+ private ContentType(String extension) {
this.extension = extension;
}
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParseException.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParseException.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParseException.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser;
+package org.apache.sling.jcr.contentparser;
/**
* Parsing exception.
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParserOptions.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParserOptions.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/ParserOptions.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser;
+package org.apache.sling.jcr.contentparser;
import java.util.Arrays;
import java.util.Collections;
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -32,9 +32,9 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.jackrabbit.util.ISO9075;
-import org.apache.sling.fscontentparser.ContentFileParser;
-import org.apache.sling.fscontentparser.ParseException;
-import org.apache.sling.fscontentparser.ParserOptions;
+import org.apache.sling.jcr.contentparser.ContentParser;
+import org.apache.sling.jcr.contentparser.ParseException;
+import org.apache.sling.jcr.contentparser.ParserOptions;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -44,12 +44,12 @@ import org.xml.sax.helpers.DefaultHandle
* Parses JCR XML files that contains content fragments.
* Instance of this class is thread-safe.
*/
-public final class JcrXmlContentFileParser implements ContentFileParser {
+public final class JcrXmlContentParser implements ContentParser {
private final ParserHelper helper;
private final SAXParserFactory saxParserFactory;
- public JcrXmlContentFileParser(ParserOptions options) {
+ public JcrXmlContentParser(ParserOptions options) {
this.helper = new ParserHelper(options);
saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
Modified:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java?rev=1786869&r1=1786852&r2=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
import java.lang.reflect.Array;
import java.math.BigDecimal;
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -37,20 +37,20 @@ import javax.json.JsonString;
import javax.json.JsonValue;
import javax.json.stream.JsonParsingException;
-import org.apache.sling.fscontentparser.ContentFileParser;
-import org.apache.sling.fscontentparser.ParseException;
-import org.apache.sling.fscontentparser.ParserOptions;
+import org.apache.sling.jcr.contentparser.ContentParser;
+import org.apache.sling.jcr.contentparser.ParseException;
+import org.apache.sling.jcr.contentparser.ParserOptions;
/**
* Parses JSON files that contains content fragments.
* Instance of this class is thread-safe.
*/
-public final class JsonContentFileParser implements ContentFileParser {
+public final class JsonContentParser implements ContentParser {
private final ParserHelper helper;
private final JsonReaderFactory jsonReaderFactory;
- public JsonContentFileParser(ParserOptions options) {
+ public JsonContentParser(ParserOptions options) {
this.helper = new ParserHelper(options);
// allow comments in JSON files
Map<String,Object> jsonReaderFactoryConfig = new HashMap<>();
Modified:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java?rev=1786869&r1=1786852&r2=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
import java.lang.reflect.Array;
import java.text.DateFormat;
@@ -28,8 +28,8 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.fscontentparser.ParseException;
-import org.apache.sling.fscontentparser.ParserOptions;
+import org.apache.sling.jcr.contentparser.ParseException;
+import org.apache.sling.jcr.contentparser.ParserOptions;
/**
* Helper parsing logic based on parser options.
Copied:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/package-info.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/package-info.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/package-info.java?p2=sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/package-info.java&p1=sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/package-info.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/main/java/org/apache/sling/fscontentparser/package-info.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/package-info.java
Tue Mar 14 10:41:47 2017
@@ -20,4 +20,4 @@
* Parser for repository content stored in files (e.g. JSON, JCR XML).
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.fscontentparser;
+package org.apache.sling.jcr.contentparser;
Copied:
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java?p2=sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java&p1=sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java
Tue Mar 14 10:41:47 2017
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
-import static org.apache.sling.fscontentparser.impl.TestUtils.getDeep;
+import static org.apache.sling.jcr.contentparser.impl.TestUtils.getDeep;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -31,18 +31,18 @@ import java.util.Map;
import java.util.TimeZone;
import org.apache.jackrabbit.util.ISO9075;
-import org.apache.sling.fscontentparser.ContentFileType;
-import org.apache.sling.fscontentparser.ContentFileParser;
-import org.apache.sling.fscontentparser.ContentFileParserFactory;
-import org.apache.sling.fscontentparser.ParseException;
-import org.apache.sling.fscontentparser.ParserOptions;
+import org.apache.sling.jcr.contentparser.ContentParser;
+import org.apache.sling.jcr.contentparser.ContentParserFactory;
+import org.apache.sling.jcr.contentparser.ContentType;
+import org.apache.sling.jcr.contentparser.ParseException;
+import org.apache.sling.jcr.contentparser.ParserOptions;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
-public class JcrXmlContentFileParserTest {
+public class JcrXmlContentParserTest {
private File file;
@@ -54,7 +54,7 @@ public class JcrXmlContentFileParserTest
@SuppressWarnings("unchecked")
@Test
public void testParseJcrXml() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JCR_XML);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JCR_XML);
Map<String,Object> content = underTest.parse(file);
assertNotNull(content);
assertEquals("app:Page", content.get("jcr:primaryType"));
@@ -64,13 +64,13 @@ public class JcrXmlContentFileParserTest
@Test(expected=ParseException.class)
public void testParseInvalidJcrXml() throws Exception {
file = new File("src/test/resources/invalid-test/invalid.jcr.xml");
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JCR_XML);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JCR_XML);
underTest.parse(file);
}
@Test
public void testDataTypes() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JCR_XML);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JCR_XML);
Map<String,Object> content = underTest.parse(file);
Map<String,Object> props = getDeep(content, "jcr:content");
@@ -95,13 +95,13 @@ public class JcrXmlContentFileParserTest
@Test
public void testDecodeName() {
- assertEquals("jcr:title", JcrXmlContentFileParser.decodeName("jcr:" +
ISO9075.encode("title")));
- assertEquals("sling:123", JcrXmlContentFileParser.decodeName("sling:"
+ ISO9075.encode("123")));
+ assertEquals("jcr:title", JcrXmlContentParser.decodeName("jcr:" +
ISO9075.encode("title")));
+ assertEquals("sling:123", JcrXmlContentParser.decodeName("sling:" +
ISO9075.encode("123")));
}
@Test
public void testIgnoreResourcesProperties() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JCR_XML, new ParserOptions()
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JCR_XML, new ParserOptions()
.ignoreResourceNames(ImmutableSet.of("teaserbar", "aside"))
.ignorePropertyNames(ImmutableSet.of("longProp",
"jcr:title")));
Map<String,Object> content = underTest.parse(file);
@@ -119,7 +119,7 @@ public class JcrXmlContentFileParserTest
@Test
@Ignore
public void testSameNamePropertyAndSubResource() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JCR_XML);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JCR_XML);
Map<String,Object> content = underTest.parse(file);
Map<String,Object> props = getDeep(content, "jcr:content/teaserbar");
// teaserbaritem is a direct property as well as a sub resource
Modified:
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java?rev=1786869&r1=1786852&r2=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java
Tue Mar 14 10:41:47 2017
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
-import static
org.apache.sling.fscontentparser.impl.JcrXmlValueConverter.parseValue;
+import static
org.apache.sling.jcr.contentparser.impl.JcrXmlValueConverter.parseValue;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Copied:
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
(from r1786852,
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java?p2=sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java&p1=sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java&r1=1786852&r2=1786869&rev=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/commons/fscontentparser/src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java
Tue Mar 14 10:41:47 2017
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
-import static org.apache.sling.fscontentparser.impl.TestUtils.getDeep;
+import static org.apache.sling.jcr.contentparser.impl.TestUtils.getDeep;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -30,17 +30,17 @@ import java.util.Calendar;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.sling.fscontentparser.ContentFileType;
-import org.apache.sling.fscontentparser.ContentFileParser;
-import org.apache.sling.fscontentparser.ContentFileParserFactory;
-import org.apache.sling.fscontentparser.ParseException;
-import org.apache.sling.fscontentparser.ParserOptions;
+import org.apache.sling.jcr.contentparser.ContentParser;
+import org.apache.sling.jcr.contentparser.ContentParserFactory;
+import org.apache.sling.jcr.contentparser.ContentType;
+import org.apache.sling.jcr.contentparser.ParseException;
+import org.apache.sling.jcr.contentparser.ParserOptions;
import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
-public class JsonContentFileParserTest {
+public class JsonContentParserTest {
private File file;
@@ -51,7 +51,7 @@ public class JsonContentFileParserTest {
@Test
public void testPageJcrPrimaryType() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JSON);
Map<String, Object> content = underTest.parse(file);
assertEquals("app:Page", content.get("jcr:primaryType"));
@@ -59,7 +59,7 @@ public class JsonContentFileParserTest {
@Test
public void testDataTypes() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JSON);
Map<String, Object> content = underTest.parse(file);
Map<String, Object> props = getDeep(content,
"toolbar/profiles/jcr:content");
@@ -76,7 +76,7 @@ public class JsonContentFileParserTest {
@Test
public void testContentProperties() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JSON);
Map<String, Object> content = underTest.parse(file);
Map<String, Object> props = getDeep(content, "jcr:content/header");
@@ -85,7 +85,7 @@ public class JsonContentFileParserTest {
@Test
public void testCalendar() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON,
+ ContentParser underTest = ContentParserFactory.create(ContentType.JSON,
new ParserOptions().detectCalendarValues(true));
Map<String, Object> content = underTest.parse(file);
@@ -107,7 +107,7 @@ public class JsonContentFileParserTest {
@Test
public void testUTF8Chars() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JSON);
Map<String, Object> content = underTest.parse(file);
Map<String, Object> props = getDeep(content, "jcr:content");
@@ -118,7 +118,7 @@ public class JsonContentFileParserTest {
@Test(expected = ParseException.class)
public void testParseInvalidJson() throws Exception {
file = new File("src/test/resources/invalid-test/invalid.json");
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JSON);
Map<String, Object> content = underTest.parse(file);
assertNull(content);
}
@@ -126,14 +126,14 @@ public class JsonContentFileParserTest {
@Test(expected = ParseException.class)
public void testParseInvalidJsonWithObjectList() throws Exception {
file = new
File("src/test/resources/invalid-test/contentWithObjectList.json");
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON);
+ ContentParser underTest =
ContentParserFactory.create(ContentType.JSON);
Map<String, Object> content = underTest.parse(file);
assertNull(content);
}
@Test
public void testIgnoreResourcesProperties() throws Exception {
- ContentFileParser underTest =
ContentFileParserFactory.create(ContentFileType.JSON,
+ ContentParser underTest = ContentParserFactory.create(ContentType.JSON,
new
ParserOptions().ignoreResourceNames(ImmutableSet.of("header", "newslist"))
.ignorePropertyNames(ImmutableSet.of("jcr:title")));
Map<String, Object> content = underTest.parse(file);
Modified:
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java?rev=1786869&r1=1786852&r2=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java
Tue Mar 14 10:41:47 2017
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
-import static
org.apache.sling.fscontentparser.ParserOptions.DEFAULT_PRIMARY_TYPE;
-import static
org.apache.sling.fscontentparser.impl.ParserHelper.JCR_PRIMARYTYPE;
+import static
org.apache.sling.jcr.contentparser.ParserOptions.DEFAULT_PRIMARY_TYPE;
+import static
org.apache.sling.jcr.contentparser.impl.ParserHelper.JCR_PRIMARYTYPE;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -32,8 +32,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.sling.fscontentparser.ParseException;
-import org.apache.sling.fscontentparser.ParserOptions;
+import org.apache.sling.jcr.contentparser.ParseException;
+import org.apache.sling.jcr.contentparser.ParserOptions;
import org.junit.Test;
import com.google.common.collect.ImmutableMap;
Modified:
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java?rev=1786869&r1=1786852&r2=1786869&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java
(original)
+++
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java
Tue Mar 14 10:41:47 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.fscontentparser.impl;
+package org.apache.sling.jcr.contentparser.impl;
import java.util.Map;
Modified: sling/trunk/tooling/jenkins/create_jobs.groovy
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/create_jobs.groovy?rev=1786869&r1=1786868&r2=1786869&view=diff
==============================================================================
--- sling/trunk/tooling/jenkins/create_jobs.groovy (original)
+++ sling/trunk/tooling/jenkins/create_jobs.groovy Tue Mar 14 10:41:47 2017
@@ -58,9 +58,6 @@ def modules = [
location: 'bundles/commons/fsclassloader'
],
[
- location: 'bundles/commons/fscontentparser'
- ],
- [
location: 'bundles/commons/contentdetection'
],
[
@@ -244,6 +241,9 @@ def modules = [
location: 'bundles/jcr/contentloader'
],
[
+ location: 'bundles/jcr/contentparser'
+ ],
+ [
location: 'bundles/jcr/davex'
],
[
