renamed fleece to johnzon
diff --git a/DISCLAIMER b/DISCLAIMER
index 27d45d2..39e09ad 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,4 +1,4 @@
-Apache Fleece is an effort undergoing incubation at the Apache Software
+Apache Johnzon is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Apache Incubator PMC.
Incubation is required of all newly accepted projects until a further review
@@ -12,5 +12,5 @@
For more information about the incubation status of the Apache Sirona project you
can go to the following page:
-http://incubator.apache.org/projects/fleece.html
-http://fleece.incubator.apache.org
+http://incubator.apache.org/projects/johnzon.html
+http://johnzon.incubator.apache.org
diff --git a/fleece-core/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/fleece-core/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
deleted file mode 100644
index 0dbd3c3..0000000
--- a/fleece-core/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.fleece.core.JsonProviderImpl
diff --git a/fleece-core/pom.xml b/johnzon-core/pom.xml
similarity index 89%
rename from fleece-core/pom.xml
rename to johnzon-core/pom.xml
index 6fb26e9..06fb184 100644
--- a/fleece-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -21,14 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>fleece</artifactId>
- <groupId>org.apache.fleece</groupId>
+ <artifactId>johnzon</artifactId>
+ <groupId>org.apache.johnzon</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>fleece-core</artifactId>
- <name>Fleece :: Core</name>
+ <artifactId>johnzon-core</artifactId>
+ <name>Johnzon :: Core</name>
<properties>
<staging.directory>${project.parent.reporting.outputDirectory}</staging.directory>
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/BufferStrategy.java b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java
similarity index 99%
rename from fleece-core/src/main/java/org/apache/fleece/core/BufferStrategy.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java
index e80dd91..c37ecfb 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/BufferStrategy.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
index a92eede..5dfd839 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
index fa1e230..809d709 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
import java.util.AbstractList;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java
similarity index 97%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java
index 76b0455..e84a37d 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonBuilderFactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.util.Collections;
import java.util.HashMap;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonChars.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonChars.java
index b135886..1e36913 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonChars.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import javax.json.stream.JsonParser.Event;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonDoubleImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonDoubleImpl.java
index 4ff90f9..9ddfd58 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonDoubleImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
similarity index 96%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
index 573ca70..bdc19fb 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.OutputStream;
import java.io.Serializable;
@@ -32,7 +32,7 @@
import javax.json.stream.JsonGeneratorFactory;
public class JsonGeneratorFactoryImpl implements JsonGeneratorFactory, Serializable {
- public static final String BUFFER_LENGTH = "org.apache.fleece.default-char-buffer-generator";
+ public static final String BUFFER_LENGTH = "org.apache.johnzon.default-char-buffer-generator";
public static final int DEFAULT_BUFFER_LENGTH = Integer.getInteger(BUFFER_LENGTH, 1024); //TODO check default string length/buffer size
private final Map<String, Object> internalConfig = new HashMap<String, Object>();
private static final String[] SUPPORTED_CONFIG_KEYS = new String[] {
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
similarity index 99%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
index a1d0a53..6b539ad 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonInMemoryParser.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonInMemoryParser.java
index 038f3ae..b3709a8 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonInMemoryParser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.math.BigDecimal;
import java.util.Iterator;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonLocationImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonLocationImpl.java
index 5c36d58..0c9e37b 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonLocationImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonLongImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonLongImpl.java
index 9928a42..2f013f7 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonLongImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
index f1b388a..8b560ed 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
index a61c9a3..ea15a17 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
index a71e42c..863f173 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
import java.util.AbstractMap;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
similarity index 93%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
index f43ceee..85d09d2 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.InputStream;
import java.io.Reader;
@@ -33,9 +33,9 @@
import javax.json.stream.JsonParserFactory;
class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
- public static final String BUFFER_STRATEGY = "org.apache.fleece.buffer-strategy";
- public static final String MAX_STRING_LENGTH = "org.apache.fleece.max-string-length";
- public static final String BUFFER_LENGTH = "org.apache.fleece.default-char-buffer";
+ public static final String BUFFER_STRATEGY = "org.apache.johnzon.buffer-strategy";
+ public static final String MAX_STRING_LENGTH = "org.apache.johnzon.max-string-length";
+ public static final String BUFFER_LENGTH = "org.apache.johnzon.default-char-buffer";
public static final int DEFAULT_MAX_SIZE = Integer.getInteger(MAX_STRING_LENGTH, 8192*32); //TODO check default string length/buffer size
private final Map<String, Object> internalConfig = new HashMap<String, Object>();
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonPrettyGeneratorImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPrettyGeneratorImpl.java
similarity index 99%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonPrettyGeneratorImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonPrettyGeneratorImpl.java
index 2e72f20..9ec038e 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonPrettyGeneratorImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPrettyGeneratorImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.OutputStream;
import java.io.Writer;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonProviderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
similarity index 99%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonProviderImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
index 6245030..273d0db 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonProviderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
index 6f0e063..65549ac 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.InputStream;
import java.io.Reader;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderImpl.java
similarity index 99%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonReaderImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderImpl.java
index 3586bc5..86d7708 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
similarity index 99%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonStreamParserImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
index 8a69195..931f55f 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonStreamParserImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.IOException;
import java.io.InputStream;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonStringImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStringImpl.java
similarity index 97%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonStringImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonStringImpl.java
index fe16ce1..a7e8f29 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonStringImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStringImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import javax.json.JsonString;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonWriterFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonWriterFactoryImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
index 67a4b66..e7d30b8 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonWriterFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonWriterImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterImpl.java
similarity index 97%
rename from fleece-core/src/main/java/org/apache/fleece/core/JsonWriterImpl.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterImpl.java
index ef063b0..e012ae1 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonWriterImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/RFC4627AwareInputStreamReader.java b/johnzon-core/src/main/java/org/apache/johnzon/core/RFC4627AwareInputStreamReader.java
similarity index 98%
rename from fleece-core/src/main/java/org/apache/fleece/core/RFC4627AwareInputStreamReader.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/RFC4627AwareInputStreamReader.java
index 4abac6e..ceff1a9 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/RFC4627AwareInputStreamReader.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/RFC4627AwareInputStreamReader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.IOException;
import java.io.InputStream;
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/Strings.java b/johnzon-core/src/main/java/org/apache/johnzon/core/Strings.java
similarity index 95%
rename from fleece-core/src/main/java/org/apache/fleece/core/Strings.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/Strings.java
index e0c6c73..4ed4d9e 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/Strings.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/Strings.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -25,8 +25,8 @@
class Strings implements JsonChars {
private static final BufferStrategy.BufferProvider<StringBuilder> BUILDER_CACHE =
- BufferStrategy.valueOf(System.getProperty("fleece.string-builder.strategy", "QUEUE"))
- .newStringBuilderProvider(Integer.getInteger("org.apache.fleece.default-string-builder", 1024));
+ BufferStrategy.valueOf(System.getProperty("johnzon.string-builder.strategy", "QUEUE"))
+ .newStringBuilderProvider(Integer.getInteger("org.apache.johnzon.default-string-builder", 1024));
private static final String UNICODE_PREFIX = "\\u";
private static final String UNICODE_PREFIX_HELPER = "000";
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/ThreadLocalBufferCache.java b/johnzon-core/src/main/java/org/apache/johnzon/core/ThreadLocalBufferCache.java
similarity index 97%
rename from fleece-core/src/main/java/org/apache/fleece/core/ThreadLocalBufferCache.java
rename to johnzon-core/src/main/java/org/apache/johnzon/core/ThreadLocalBufferCache.java
index 14f4ed6..f973fcd 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/ThreadLocalBufferCache.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/ThreadLocalBufferCache.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.io.Serializable;
diff --git a/johnzon-core/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/johnzon-core/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
new file mode 100644
index 0000000..22e9dd7
--- /dev/null
+++ b/johnzon-core/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
@@ -0,0 +1 @@
+org.apache.johnzon.core.JsonProviderImpl
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonArrayBuilderImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayBuilderImplTest.java
similarity index 98%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonArrayBuilderImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayBuilderImplTest.java
index fd443c5..df7a1af 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonArrayBuilderImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayBuilderImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonArrayImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java
similarity index 97%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonArrayImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java
index c8863d4..b0918b1 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonArrayImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonArrayImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonGeneratorImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonGeneratorImplTest.java
similarity index 99%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonGeneratorImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonGeneratorImplTest.java
index 6f501f6..4f73aaa 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonGeneratorImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonGeneratorImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonNumberTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
similarity index 97%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonNumberTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
index 7c95827..b610995 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonNumberTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import java.math.BigInteger;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonObjectBuilderImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
similarity index 96%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonObjectBuilderImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
index 3462a41..098967e 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonObjectBuilderImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonObjectImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectImplTest.java
similarity index 96%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonObjectImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectImplTest.java
index 459ee57..6f4ba86 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonObjectImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonParserTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
similarity index 98%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonParserTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
index 8113b0d..745132b 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonParserTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonParserTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -882,7 +882,7 @@
// using a reader as wrapper of parser
Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.max-string-length", "5");
+ put("org.apache.johnzon.max-string-length", "5");
}
}).createReader(new ByteArrayInputStream("[\"abcde\"]".getBytes())).read();
@@ -893,7 +893,7 @@
// using a reader as wrapper of parser
Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.max-string-length", "5");
+ put("org.apache.johnzon.max-string-length", "5");
}
}).createReader(new ByteArrayInputStream("[\"abcdef\"]".getBytes())).read();
@@ -904,7 +904,7 @@
// using a reader as wrapper of parser
Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.max-string-length", "5");
+ put("org.apache.johnzon.max-string-length", "5");
}
}).createReader(new ByteArrayInputStream("[12.3]".getBytes())).read();
@@ -915,7 +915,7 @@
// using a reader as wrapper of parser
Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.max-string-length", "5");
+ put("org.apache.johnzon.max-string-length", "5");
}
}).createReader(new ByteArrayInputStream("[12.333]".getBytes())).read();
@@ -926,7 +926,7 @@
// using a reader as wrapper of parser
Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.max-string-length", "5");
+ put("org.apache.johnzon.max-string-length", "5");
}
}).createReader(new ByteArrayInputStream("[\"12\" ]".getBytes())).read();
@@ -1396,7 +1396,7 @@
final JsonParser parser = Json.createParserFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", value);
+ put("org.apache.johnzon.default-char-buffer", value);
}
}).createParser(new ByteArrayInputStream(s.getBytes()));
assertNotNull(parser);
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonReaderImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonReaderImplTest.java
similarity index 96%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonReaderImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonReaderImplTest.java
index a9ecac7..465945e 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonReaderImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonReaderImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertEquals;
@@ -327,7 +327,7 @@
public void simpleBadBufferSize8() {
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", "8");
+ put("org.apache.johnzon.default-char-buffer", "8");
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/simple.json"), utf8Charset);
assertNotNull(reader);
@@ -349,7 +349,7 @@
public void simple2BadBufferSize8() {
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", "8");
+ put("org.apache.johnzon.default-char-buffer", "8");
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/simple2.json"), utf8Charset);
assertNotNull(reader);
@@ -371,7 +371,7 @@
public void simpleBadBufferSize9() {
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", "9");
+ put("org.apache.johnzon.default-char-buffer", "9");
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/simple.json"), utf8Charset);
assertNotNull(reader);
@@ -393,7 +393,7 @@
public void emptyZeroCharBuffersize() {
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", "0");
+ put("org.apache.johnzon.default-char-buffer", "0");
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/empty.json"), utf8Charset);
assertNotNull(reader);
@@ -405,7 +405,7 @@
public void emptyOneCharBufferSize() {
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", "1");
+ put("org.apache.johnzon.default-char-buffer", "1");
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/empty.json"), utf8Charset);
assertNotNull(reader);
@@ -419,7 +419,7 @@
public void emptyArrayOneCharBufferSize() {
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", "1");
+ put("org.apache.johnzon.default-char-buffer", "1");
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/emptyarray.json"), utf8Charset);
assertNotNull(reader);
@@ -438,7 +438,7 @@
final String value = String.valueOf(buffersizes[i]);
final JsonReader reader = Json.createReaderFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", value);
+ put("org.apache.johnzon.default-char-buffer", value);
}
}).createReader(Thread.currentThread().getContextClassLoader().getResourceAsStream("json/stringescape.json"),
utf8Charset);
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/JsonWriterImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonWriterImplTest.java
similarity index 97%
rename from fleece-core/src/test/java/org/apache/fleece/core/JsonWriterImplTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/JsonWriterImplTest.java
index cf5d18c..d9b2ecd 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/JsonWriterImplTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonWriterImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
diff --git a/fleece-core/src/test/java/org/apache/fleece/core/LocationTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/LocationTest.java
similarity index 98%
rename from fleece-core/src/test/java/org/apache/fleece/core/LocationTest.java
rename to johnzon-core/src/test/java/org/apache/johnzon/core/LocationTest.java
index 313d56e..8bc2b60 100644
--- a/fleece-core/src/test/java/org/apache/fleece/core/LocationTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/LocationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.core;
+package org.apache.johnzon.core;
import static org.junit.Assert.assertEquals;
@@ -143,7 +143,7 @@
final String value = String.valueOf(i);
final JsonParser parser = Json.createParserFactory(new HashMap<String, Object>() {
{
- put("org.apache.fleece.default-char-buffer", value);
+ put("org.apache.johnzon.default-char-buffer", value);
}
}).createParser(new StringReader("{\n \"z a c\": null ,\n \"test\" :\"testval\",\n \"num\": 45.1e-12 \n}"));
diff --git a/fleece-core/src/test/resources/bench/big_600kb.json b/johnzon-core/src/test/resources/bench/big_600kb.json
similarity index 100%
rename from fleece-core/src/test/resources/bench/big_600kb.json
rename to johnzon-core/src/test/resources/bench/big_600kb.json
diff --git a/fleece-core/src/test/resources/bench/huge_1mb.json b/johnzon-core/src/test/resources/bench/huge_1mb.json
similarity index 100%
rename from fleece-core/src/test/resources/bench/huge_1mb.json
rename to johnzon-core/src/test/resources/bench/huge_1mb.json
Binary files differ
diff --git a/fleece-core/src/test/resources/bench/large_130kb.json b/johnzon-core/src/test/resources/bench/large_130kb.json
similarity index 100%
rename from fleece-core/src/test/resources/bench/large_130kb.json
rename to johnzon-core/src/test/resources/bench/large_130kb.json
diff --git a/fleece-core/src/test/resources/bench/medium_11kb.json b/johnzon-core/src/test/resources/bench/medium_11kb.json
similarity index 100%
rename from fleece-core/src/test/resources/bench/medium_11kb.json
rename to johnzon-core/src/test/resources/bench/medium_11kb.json
Binary files differ
diff --git a/fleece-core/src/test/resources/bench/small_3kb.json b/johnzon-core/src/test/resources/bench/small_3kb.json
similarity index 100%
rename from fleece-core/src/test/resources/bench/small_3kb.json
rename to johnzon-core/src/test/resources/bench/small_3kb.json
diff --git a/fleece-core/src/test/resources/bench/tiny_50b.json b/johnzon-core/src/test/resources/bench/tiny_50b.json
similarity index 100%
rename from fleece-core/src/test/resources/bench/tiny_50b.json
rename to johnzon-core/src/test/resources/bench/tiny_50b.json
diff --git a/fleece-core/src/test/resources/bench/unicode_chars_1400kb.txt b/johnzon-core/src/test/resources/bench/unicode_chars_1400kb.txt
similarity index 100%
rename from fleece-core/src/test/resources/bench/unicode_chars_1400kb.txt
rename to johnzon-core/src/test/resources/bench/unicode_chars_1400kb.txt
Binary files differ
diff --git a/fleece-core/src/test/resources/bench/unicode_chars_170kb.txt b/johnzon-core/src/test/resources/bench/unicode_chars_170kb.txt
similarity index 100%
rename from fleece-core/src/test/resources/bench/unicode_chars_170kb.txt
rename to johnzon-core/src/test/resources/bench/unicode_chars_170kb.txt
Binary files differ
diff --git a/fleece-core/src/test/resources/json/array.json b/johnzon-core/src/test/resources/json/array.json
similarity index 100%
rename from fleece-core/src/test/resources/json/array.json
rename to johnzon-core/src/test/resources/json/array.json
diff --git a/fleece-core/src/test/resources/json/bigdecimal.json b/johnzon-core/src/test/resources/json/bigdecimal.json
similarity index 100%
rename from fleece-core/src/test/resources/json/bigdecimal.json
rename to johnzon-core/src/test/resources/json/bigdecimal.json
diff --git a/fleece-core/src/test/resources/json/empty.json b/johnzon-core/src/test/resources/json/empty.json
similarity index 100%
rename from fleece-core/src/test/resources/json/empty.json
rename to johnzon-core/src/test/resources/json/empty.json
diff --git a/fleece-core/src/test/resources/json/emptyarray.json b/johnzon-core/src/test/resources/json/emptyarray.json
similarity index 100%
rename from fleece-core/src/test/resources/json/emptyarray.json
rename to johnzon-core/src/test/resources/json/emptyarray.json
diff --git a/fleece-core/src/test/resources/json/escaping.json b/johnzon-core/src/test/resources/json/escaping.json
similarity index 100%
rename from fleece-core/src/test/resources/json/escaping.json
rename to johnzon-core/src/test/resources/json/escaping.json
diff --git a/fleece-core/src/test/resources/json/fails/fail1.json b/johnzon-core/src/test/resources/json/fails/fail1.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail1.json
rename to johnzon-core/src/test/resources/json/fails/fail1.json
diff --git a/fleece-core/src/test/resources/json/fails/fail10.json b/johnzon-core/src/test/resources/json/fails/fail10.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail10.json
rename to johnzon-core/src/test/resources/json/fails/fail10.json
diff --git a/fleece-core/src/test/resources/json/fails/fail11.json b/johnzon-core/src/test/resources/json/fails/fail11.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail11.json
rename to johnzon-core/src/test/resources/json/fails/fail11.json
diff --git a/fleece-core/src/test/resources/json/fails/fail12.json b/johnzon-core/src/test/resources/json/fails/fail12.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail12.json
rename to johnzon-core/src/test/resources/json/fails/fail12.json
diff --git a/fleece-core/src/test/resources/json/fails/fail13.json b/johnzon-core/src/test/resources/json/fails/fail13.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail13.json
rename to johnzon-core/src/test/resources/json/fails/fail13.json
diff --git a/fleece-core/src/test/resources/json/fails/fail14.json b/johnzon-core/src/test/resources/json/fails/fail14.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail14.json
rename to johnzon-core/src/test/resources/json/fails/fail14.json
diff --git a/fleece-core/src/test/resources/json/fails/fail15.json b/johnzon-core/src/test/resources/json/fails/fail15.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail15.json
rename to johnzon-core/src/test/resources/json/fails/fail15.json
diff --git a/fleece-core/src/test/resources/json/fails/fail16.json b/johnzon-core/src/test/resources/json/fails/fail16.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail16.json
rename to johnzon-core/src/test/resources/json/fails/fail16.json
diff --git a/fleece-core/src/test/resources/json/fails/fail17.json b/johnzon-core/src/test/resources/json/fails/fail17.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail17.json
rename to johnzon-core/src/test/resources/json/fails/fail17.json
diff --git a/fleece-core/src/test/resources/json/fails/fail18.json b/johnzon-core/src/test/resources/json/fails/fail18.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail18.json
rename to johnzon-core/src/test/resources/json/fails/fail18.json
diff --git a/fleece-core/src/test/resources/json/fails/fail19.json b/johnzon-core/src/test/resources/json/fails/fail19.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail19.json
rename to johnzon-core/src/test/resources/json/fails/fail19.json
diff --git a/fleece-core/src/test/resources/json/fails/fail2.json b/johnzon-core/src/test/resources/json/fails/fail2.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail2.json
rename to johnzon-core/src/test/resources/json/fails/fail2.json
diff --git a/fleece-core/src/test/resources/json/fails/fail20.json b/johnzon-core/src/test/resources/json/fails/fail20.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail20.json
rename to johnzon-core/src/test/resources/json/fails/fail20.json
diff --git a/fleece-core/src/test/resources/json/fails/fail21.json b/johnzon-core/src/test/resources/json/fails/fail21.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail21.json
rename to johnzon-core/src/test/resources/json/fails/fail21.json
diff --git a/fleece-core/src/test/resources/json/fails/fail22.json b/johnzon-core/src/test/resources/json/fails/fail22.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail22.json
rename to johnzon-core/src/test/resources/json/fails/fail22.json
diff --git a/fleece-core/src/test/resources/json/fails/fail23.json b/johnzon-core/src/test/resources/json/fails/fail23.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail23.json
rename to johnzon-core/src/test/resources/json/fails/fail23.json
diff --git a/fleece-core/src/test/resources/json/fails/fail24.json b/johnzon-core/src/test/resources/json/fails/fail24.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail24.json
rename to johnzon-core/src/test/resources/json/fails/fail24.json
diff --git a/fleece-core/src/test/resources/json/fails/fail25.json b/johnzon-core/src/test/resources/json/fails/fail25.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail25.json
rename to johnzon-core/src/test/resources/json/fails/fail25.json
diff --git a/fleece-core/src/test/resources/json/fails/fail26.json b/johnzon-core/src/test/resources/json/fails/fail26.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail26.json
rename to johnzon-core/src/test/resources/json/fails/fail26.json
diff --git a/fleece-core/src/test/resources/json/fails/fail27.json b/johnzon-core/src/test/resources/json/fails/fail27.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail27.json
rename to johnzon-core/src/test/resources/json/fails/fail27.json
diff --git a/fleece-core/src/test/resources/json/fails/fail28.json b/johnzon-core/src/test/resources/json/fails/fail28.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail28.json
rename to johnzon-core/src/test/resources/json/fails/fail28.json
diff --git a/fleece-core/src/test/resources/json/fails/fail29.json b/johnzon-core/src/test/resources/json/fails/fail29.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail29.json
rename to johnzon-core/src/test/resources/json/fails/fail29.json
diff --git a/fleece-core/src/test/resources/json/fails/fail3.json b/johnzon-core/src/test/resources/json/fails/fail3.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail3.json
rename to johnzon-core/src/test/resources/json/fails/fail3.json
diff --git a/fleece-core/src/test/resources/json/fails/fail30.json b/johnzon-core/src/test/resources/json/fails/fail30.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail30.json
rename to johnzon-core/src/test/resources/json/fails/fail30.json
diff --git a/fleece-core/src/test/resources/json/fails/fail31.json b/johnzon-core/src/test/resources/json/fails/fail31.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail31.json
rename to johnzon-core/src/test/resources/json/fails/fail31.json
diff --git a/fleece-core/src/test/resources/json/fails/fail32.json b/johnzon-core/src/test/resources/json/fails/fail32.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail32.json
rename to johnzon-core/src/test/resources/json/fails/fail32.json
diff --git a/fleece-core/src/test/resources/json/fails/fail33.json b/johnzon-core/src/test/resources/json/fails/fail33.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail33.json
rename to johnzon-core/src/test/resources/json/fails/fail33.json
diff --git a/fleece-core/src/test/resources/json/fails/fail34.json b/johnzon-core/src/test/resources/json/fails/fail34.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail34.json
rename to johnzon-core/src/test/resources/json/fails/fail34.json
diff --git a/fleece-core/src/test/resources/json/fails/fail35.json b/johnzon-core/src/test/resources/json/fails/fail35.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail35.json
rename to johnzon-core/src/test/resources/json/fails/fail35.json
diff --git a/fleece-core/src/test/resources/json/fails/fail36.json b/johnzon-core/src/test/resources/json/fails/fail36.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail36.json
rename to johnzon-core/src/test/resources/json/fails/fail36.json
diff --git a/fleece-core/src/test/resources/json/fails/fail37.json b/johnzon-core/src/test/resources/json/fails/fail37.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail37.json
rename to johnzon-core/src/test/resources/json/fails/fail37.json
diff --git a/fleece-core/src/test/resources/json/fails/fail38.json b/johnzon-core/src/test/resources/json/fails/fail38.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail38.json
rename to johnzon-core/src/test/resources/json/fails/fail38.json
diff --git a/fleece-core/src/test/resources/json/fails/fail39.json b/johnzon-core/src/test/resources/json/fails/fail39.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail39.json
rename to johnzon-core/src/test/resources/json/fails/fail39.json
diff --git a/fleece-core/src/test/resources/json/fails/fail4.json b/johnzon-core/src/test/resources/json/fails/fail4.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail4.json
rename to johnzon-core/src/test/resources/json/fails/fail4.json
diff --git a/fleece-core/src/test/resources/json/fails/fail40.json b/johnzon-core/src/test/resources/json/fails/fail40.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail40.json
rename to johnzon-core/src/test/resources/json/fails/fail40.json
diff --git a/fleece-core/src/test/resources/json/fails/fail41.json b/johnzon-core/src/test/resources/json/fails/fail41.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail41.json
rename to johnzon-core/src/test/resources/json/fails/fail41.json
diff --git a/fleece-core/src/test/resources/json/fails/fail42.json b/johnzon-core/src/test/resources/json/fails/fail42.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail42.json
rename to johnzon-core/src/test/resources/json/fails/fail42.json
diff --git a/fleece-core/src/test/resources/json/fails/fail43.json b/johnzon-core/src/test/resources/json/fails/fail43.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail43.json
rename to johnzon-core/src/test/resources/json/fails/fail43.json
diff --git a/fleece-core/src/test/resources/json/fails/fail44.json b/johnzon-core/src/test/resources/json/fails/fail44.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail44.json
rename to johnzon-core/src/test/resources/json/fails/fail44.json
diff --git a/fleece-core/src/test/resources/json/fails/fail45.json b/johnzon-core/src/test/resources/json/fails/fail45.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail45.json
rename to johnzon-core/src/test/resources/json/fails/fail45.json
diff --git a/fleece-core/src/test/resources/json/fails/fail46.json b/johnzon-core/src/test/resources/json/fails/fail46.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail46.json
rename to johnzon-core/src/test/resources/json/fails/fail46.json
diff --git a/fleece-core/src/test/resources/json/fails/fail47.json b/johnzon-core/src/test/resources/json/fails/fail47.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail47.json
rename to johnzon-core/src/test/resources/json/fails/fail47.json
diff --git a/fleece-core/src/test/resources/json/fails/fail48.json b/johnzon-core/src/test/resources/json/fails/fail48.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail48.json
rename to johnzon-core/src/test/resources/json/fails/fail48.json
diff --git a/fleece-core/src/test/resources/json/fails/fail49.json b/johnzon-core/src/test/resources/json/fails/fail49.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail49.json
rename to johnzon-core/src/test/resources/json/fails/fail49.json
diff --git a/fleece-core/src/test/resources/json/fails/fail5.json b/johnzon-core/src/test/resources/json/fails/fail5.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail5.json
rename to johnzon-core/src/test/resources/json/fails/fail5.json
diff --git a/fleece-core/src/test/resources/json/fails/fail50.json b/johnzon-core/src/test/resources/json/fails/fail50.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail50.json
rename to johnzon-core/src/test/resources/json/fails/fail50.json
diff --git a/fleece-core/src/test/resources/json/fails/fail51.json b/johnzon-core/src/test/resources/json/fails/fail51.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail51.json
rename to johnzon-core/src/test/resources/json/fails/fail51.json
diff --git a/fleece-core/src/test/resources/json/fails/fail52.json b/johnzon-core/src/test/resources/json/fails/fail52.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail52.json
rename to johnzon-core/src/test/resources/json/fails/fail52.json
diff --git a/fleece-core/src/test/resources/json/fails/fail53.json b/johnzon-core/src/test/resources/json/fails/fail53.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail53.json
rename to johnzon-core/src/test/resources/json/fails/fail53.json
diff --git a/fleece-core/src/test/resources/json/fails/fail54.json b/johnzon-core/src/test/resources/json/fails/fail54.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail54.json
rename to johnzon-core/src/test/resources/json/fails/fail54.json
diff --git a/fleece-core/src/test/resources/json/fails/fail55.json b/johnzon-core/src/test/resources/json/fails/fail55.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail55.json
rename to johnzon-core/src/test/resources/json/fails/fail55.json
diff --git a/fleece-core/src/test/resources/json/fails/fail56.json b/johnzon-core/src/test/resources/json/fails/fail56.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail56.json
rename to johnzon-core/src/test/resources/json/fails/fail56.json
diff --git a/fleece-core/src/test/resources/json/fails/fail57.json b/johnzon-core/src/test/resources/json/fails/fail57.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail57.json
rename to johnzon-core/src/test/resources/json/fails/fail57.json
diff --git a/fleece-core/src/test/resources/json/fails/fail58.json b/johnzon-core/src/test/resources/json/fails/fail58.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail58.json
rename to johnzon-core/src/test/resources/json/fails/fail58.json
diff --git a/fleece-core/src/test/resources/json/fails/fail59.json b/johnzon-core/src/test/resources/json/fails/fail59.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail59.json
rename to johnzon-core/src/test/resources/json/fails/fail59.json
diff --git a/fleece-core/src/test/resources/json/fails/fail6.json b/johnzon-core/src/test/resources/json/fails/fail6.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail6.json
rename to johnzon-core/src/test/resources/json/fails/fail6.json
diff --git a/fleece-core/src/test/resources/json/fails/fail60.json b/johnzon-core/src/test/resources/json/fails/fail60.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail60.json
rename to johnzon-core/src/test/resources/json/fails/fail60.json
diff --git a/fleece-core/src/test/resources/json/fails/fail61.json b/johnzon-core/src/test/resources/json/fails/fail61.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail61.json
rename to johnzon-core/src/test/resources/json/fails/fail61.json
diff --git a/fleece-core/src/test/resources/json/fails/fail62.json b/johnzon-core/src/test/resources/json/fails/fail62.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail62.json
rename to johnzon-core/src/test/resources/json/fails/fail62.json
diff --git a/fleece-core/src/test/resources/json/fails/fail63.json b/johnzon-core/src/test/resources/json/fails/fail63.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail63.json
rename to johnzon-core/src/test/resources/json/fails/fail63.json
diff --git a/fleece-core/src/test/resources/json/fails/fail64.json b/johnzon-core/src/test/resources/json/fails/fail64.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail64.json
rename to johnzon-core/src/test/resources/json/fails/fail64.json
diff --git a/fleece-core/src/test/resources/json/fails/fail65.json b/johnzon-core/src/test/resources/json/fails/fail65.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail65.json
rename to johnzon-core/src/test/resources/json/fails/fail65.json
diff --git a/fleece-core/src/test/resources/json/fails/fail66.json b/johnzon-core/src/test/resources/json/fails/fail66.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail66.json
rename to johnzon-core/src/test/resources/json/fails/fail66.json
diff --git a/fleece-core/src/test/resources/json/fails/fail67.json b/johnzon-core/src/test/resources/json/fails/fail67.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail67.json
rename to johnzon-core/src/test/resources/json/fails/fail67.json
diff --git a/fleece-core/src/test/resources/json/fails/fail68.json b/johnzon-core/src/test/resources/json/fails/fail68.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail68.json
rename to johnzon-core/src/test/resources/json/fails/fail68.json
diff --git a/fleece-core/src/test/resources/json/fails/fail69.json b/johnzon-core/src/test/resources/json/fails/fail69.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail69.json
rename to johnzon-core/src/test/resources/json/fails/fail69.json
diff --git a/fleece-core/src/test/resources/json/fails/fail7.json b/johnzon-core/src/test/resources/json/fails/fail7.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail7.json
rename to johnzon-core/src/test/resources/json/fails/fail7.json
diff --git a/fleece-core/src/test/resources/json/fails/fail70.json b/johnzon-core/src/test/resources/json/fails/fail70.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail70.json
rename to johnzon-core/src/test/resources/json/fails/fail70.json
diff --git a/fleece-core/src/test/resources/json/fails/fail71.json b/johnzon-core/src/test/resources/json/fails/fail71.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail71.json
rename to johnzon-core/src/test/resources/json/fails/fail71.json
diff --git a/fleece-core/src/test/resources/json/fails/fail72.json b/johnzon-core/src/test/resources/json/fails/fail72.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail72.json
rename to johnzon-core/src/test/resources/json/fails/fail72.json
diff --git a/fleece-core/src/test/resources/json/fails/fail8.json b/johnzon-core/src/test/resources/json/fails/fail8.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail8.json
rename to johnzon-core/src/test/resources/json/fails/fail8.json
diff --git a/fleece-core/src/test/resources/json/fails/fail9.json b/johnzon-core/src/test/resources/json/fails/fail9.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/fail9.json
rename to johnzon-core/src/test/resources/json/fails/fail9.json
diff --git a/fleece-core/src/test/resources/json/fails/numbers.json b/johnzon-core/src/test/resources/json/fails/numbers.json
similarity index 100%
rename from fleece-core/src/test/resources/json/fails/numbers.json
rename to johnzon-core/src/test/resources/json/fails/numbers.json
diff --git a/fleece-core/src/test/resources/json/nested.json b/johnzon-core/src/test/resources/json/nested.json
similarity index 100%
rename from fleece-core/src/test/resources/json/nested.json
rename to johnzon-core/src/test/resources/json/nested.json
diff --git a/fleece-core/src/test/resources/json/numbers.json b/johnzon-core/src/test/resources/json/numbers.json
similarity index 100%
rename from fleece-core/src/test/resources/json/numbers.json
rename to johnzon-core/src/test/resources/json/numbers.json
diff --git a/fleece-core/src/test/resources/json/simple.json b/johnzon-core/src/test/resources/json/simple.json
similarity index 100%
rename from fleece-core/src/test/resources/json/simple.json
rename to johnzon-core/src/test/resources/json/simple.json
diff --git a/fleece-core/src/test/resources/json/simple2.json b/johnzon-core/src/test/resources/json/simple2.json
similarity index 100%
rename from fleece-core/src/test/resources/json/simple2.json
rename to johnzon-core/src/test/resources/json/simple2.json
diff --git a/fleece-core/src/test/resources/json/simple_utf16le.json b/johnzon-core/src/test/resources/json/simple_utf16le.json
similarity index 100%
rename from fleece-core/src/test/resources/json/simple_utf16le.json
rename to johnzon-core/src/test/resources/json/simple_utf16le.json
Binary files differ
diff --git a/fleece-core/src/test/resources/json/special.json b/johnzon-core/src/test/resources/json/special.json
similarity index 100%
rename from fleece-core/src/test/resources/json/special.json
rename to johnzon-core/src/test/resources/json/special.json
diff --git a/fleece-core/src/test/resources/json/stringescape.json b/johnzon-core/src/test/resources/json/stringescape.json
similarity index 100%
rename from fleece-core/src/test/resources/json/stringescape.json
rename to johnzon-core/src/test/resources/json/stringescape.json
diff --git a/fleece-core/src/test/resources/json/unicode.json b/johnzon-core/src/test/resources/json/unicode.json
similarity index 100%
rename from fleece-core/src/test/resources/json/unicode.json
rename to johnzon-core/src/test/resources/json/unicode.json
diff --git a/fleece-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml
similarity index 89%
rename from fleece-jaxrs/pom.xml
rename to johnzon-jaxrs/pom.xml
index 00cdf69..a328c08 100644
--- a/fleece-jaxrs/pom.xml
+++ b/johnzon-jaxrs/pom.xml
@@ -21,14 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>fleece</artifactId>
- <groupId>org.apache.fleece</groupId>
+ <artifactId>johnzon</artifactId>
+ <groupId>org.apache.johnzon</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>fleece-jaxrs</artifactId>
- <name>Fleece :: JAX-RS</name>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <name>Johnzon :: JAX-RS</name>
<dependencies>
<dependency>
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>org.apache.fleece</groupId>
- <artifactId>fleece-mapper</artifactId>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-mapper</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/DelegateProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java
similarity index 98%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/DelegateProvider.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java
index 12bcc80..aee0790 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/DelegateProvider.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceMessageBodyReader.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java
similarity index 87%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceMessageBodyReader.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java
index c34727a..ad55a4d 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceMessageBodyReader.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
-import org.apache.fleece.mapper.Mapper;
-import org.apache.fleece.mapper.MapperBuilder;
+import org.apache.johnzon.mapper.Mapper;
+import org.apache.johnzon.mapper.MapperBuilder;
import javax.json.JsonStructure;
import javax.ws.rs.Consumes;
@@ -36,18 +36,18 @@
import java.util.Collection;
import static javax.ws.rs.core.MediaType.WILDCARD;
-import static org.apache.fleece.jaxrs.Jsons.isJson;
+import static org.apache.johnzon.jaxrs.Jsons.isJson;
@Provider
@Consumes(WILDCARD)
-public class FleeceMessageBodyReader<T> implements MessageBodyReader<T> {
+public class JohnzonMessageBodyReader<T> implements MessageBodyReader<T> {
private final Mapper mapper;
- public FleeceMessageBodyReader() {
+ public JohnzonMessageBodyReader() {
this(new MapperBuilder().setDoCloseOnStreams(false).build());
}
- public FleeceMessageBodyReader(final Mapper mapper) {
+ public JohnzonMessageBodyReader(final Mapper mapper) {
this.mapper = mapper;
}
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceMessageBodyWriter.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java
similarity index 90%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceMessageBodyWriter.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java
index b893222..a540d6d 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceMessageBodyWriter.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
-import org.apache.fleece.mapper.Mapper;
-import org.apache.fleece.mapper.MapperBuilder;
+import org.apache.johnzon.mapper.Mapper;
+import org.apache.johnzon.mapper.MapperBuilder;
import javax.json.JsonStructure;
import javax.ws.rs.Produces;
@@ -42,14 +42,14 @@
@Provider
@Produces(WILDCARD)
-public class FleeceMessageBodyWriter<T> implements MessageBodyWriter<T> {
+public class JohnzonMessageBodyWriter<T> implements MessageBodyWriter<T> {
private final Mapper mapper;
- public FleeceMessageBodyWriter() {
+ public JohnzonMessageBodyWriter() {
this(new MapperBuilder().setDoCloseOnStreams(false).build());
}
- public FleeceMessageBodyWriter(final Mapper mapper) {
+ public JohnzonMessageBodyWriter(final Mapper mapper) {
this.mapper = mapper;
}
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java
similarity index 74%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceProvider.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java
index 6f1beba..a72e9f1 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/FleeceProvider.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
-import org.apache.fleece.mapper.Mapper;
-import org.apache.fleece.mapper.MapperBuilder;
+import org.apache.johnzon.mapper.Mapper;
+import org.apache.johnzon.mapper.MapperBuilder;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
@@ -30,12 +30,12 @@
@Provider
@Produces(WILDCARD)
@Consumes(WILDCARD)
-public class FleeceProvider<T> extends DelegateProvider<T> {
- public FleeceProvider(final Mapper mapper) {
- super(new FleeceMessageBodyReader<T>(mapper), new FleeceMessageBodyWriter<T>(mapper));
+public class JohnzonProvider<T> extends DelegateProvider<T> {
+ public JohnzonProvider(final Mapper mapper) {
+ super(new JohnzonMessageBodyReader<T>(mapper), new JohnzonMessageBodyWriter<T>(mapper));
}
- public FleeceProvider() {
+ public JohnzonProvider() {
this(new MapperBuilder().setDoCloseOnStreams(false).build());
}
}
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/Jsons.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/Jsons.java
similarity index 97%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/Jsons.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/Jsons.java
index 7872d28..542347e 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/Jsons.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/Jsons.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import javax.ws.rs.core.MediaType;
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrMessageBodyReader.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java
similarity index 98%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrMessageBodyReader.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java
index f9a9e1c..b4e70f7 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrMessageBodyReader.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import javax.json.Json;
import javax.json.JsonReader;
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrMessageBodyWriter.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java
similarity index 98%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrMessageBodyWriter.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java
index dc77a30..a6acfbe 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrMessageBodyWriter.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import javax.json.Json;
import javax.json.JsonStructure;
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java
similarity index 96%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrProvider.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java
index 22a2996..70a0791 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/JsrProvider.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import javax.json.JsonStructure;
import javax.ws.rs.Consumes;
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/WadlDocumentMessageBodyWriter.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WadlDocumentMessageBodyWriter.java
similarity index 93%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/WadlDocumentMessageBodyWriter.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WadlDocumentMessageBodyWriter.java
index 55f1dd3..5adab66 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/WadlDocumentMessageBodyWriter.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WadlDocumentMessageBodyWriter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
-import org.apache.fleece.jaxrs.xml.WadlDocumentToJson;
+import org.apache.johnzon.jaxrs.xml.WadlDocumentToJson;
import org.w3c.dom.Document;
import javax.ws.rs.WebApplicationException;
@@ -31,7 +31,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import static org.apache.fleece.jaxrs.Jsons.isJson;
+import static org.apache.johnzon.jaxrs.Jsons.isJson;
public class WadlDocumentMessageBodyWriter implements MessageBodyWriter<Document> {
private final WadlDocumentToJson converter = new WadlDocumentToJson();
diff --git a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/xml/WadlDocumentToJson.java
similarity index 98%
rename from fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java
rename to johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/xml/WadlDocumentToJson.java
index 74d70d6..0768e09 100644
--- a/fleece-jaxrs/src/main/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJson.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/xml/WadlDocumentToJson.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs.xml;
+package org.apache.johnzon.jaxrs.xml;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
diff --git a/fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/FleeceProviderTest.java b/johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/JohnzonProviderTest.java
similarity index 64%
rename from fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/FleeceProviderTest.java
rename to johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/JohnzonProviderTest.java
index 4493b91..3cccf83 100644
--- a/fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/FleeceProviderTest.java
+++ b/johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/JohnzonProviderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
@@ -40,16 +40,16 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class FleeceProviderTest {
- private final static String ENDPOINT_ADDRESS = "local://fleece";
+public class JohnzonProviderTest {
+ private final static String ENDPOINT_ADDRESS = "local://johnzon";
private static Server server;
@BeforeClass
public static void bindEndpoint() throws Exception {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
- sf.setResourceClasses(FleeceResource.class);
- sf.setProviders(asList(new FleeceProvider<Object>()));
- sf.setResourceProvider(FleeceResource.class, new SingletonResourceProvider(new FleeceResource(), false));
+ sf.setResourceClasses(JohnzonResource.class);
+ sf.setProviders(asList(new JohnzonProvider<Object>()));
+ sf.setResourceProvider(JohnzonResource.class, new SingletonResourceProvider(new JohnzonResource(), false));
sf.setAddress(ENDPOINT_ADDRESS);
server = sf.create();
}
@@ -62,22 +62,22 @@
@Test
public void asParam() {
- final String result = client().path("fleece").type(MediaType.APPLICATION_JSON_TYPE).post(new Fleece("client")).readEntity(String.class);
+ final String result = client().path("johnzon").type(MediaType.APPLICATION_JSON_TYPE).post(new Johnzon("client")).readEntity(String.class);
assertTrue(Boolean.parseBoolean(result));
}
@Test
public void object() {
- final Fleece fleece = client().path("fleece").get(Fleece.class);
- assertEquals("fleece", fleece.getName());
+ final Johnzon johnzon = client().path("johnzon").get(Johnzon.class);
+ assertEquals("johnzon", johnzon.getName());
}
@Test
public void array() {
- final Fleece[] fleece = client().path("fleece/all1").get(Fleece[].class);
- assertEquals(2, fleece.length);
- for (int i = 0; i < fleece.length; i++) {
- assertEquals("fleece" + (i + 1), fleece[i].getName());
+ final Johnzon[] johnzon = client().path("johnzon/all1").get(Johnzon[].class);
+ assertEquals(2, johnzon.length);
+ for (int i = 0; i < johnzon.length; i++) {
+ assertEquals("johnzon" + (i + 1), johnzon[i].getName());
}
}
@@ -86,7 +86,7 @@
final ParameterizedType list = new ParameterizedType() {
@Override
public Type[] getActualTypeArguments() {
- return new Type[]{Fleece.class};
+ return new Type[]{Johnzon.class};
}
@Override
@@ -99,29 +99,29 @@
return null;
}
};
- final List<Fleece> fleeces = client().path("fleece/all2").get(new GenericType<List<Fleece>>(list));
- assertEquals(2, fleeces.size());
+ final List<Johnzon> johnzons = client().path("johnzon/all2").get(new GenericType<List<Johnzon>>(list));
+ assertEquals(2, johnzons.size());
int i = 1;
- for (final Fleece f : fleeces) {
- assertEquals("fleece" + i, f.getName());
+ for (final Johnzon f : johnzons) {
+ assertEquals("johnzon" + i, f.getName());
i++;
}
}
private static WebClient client() {
- final WebClient client = WebClient.create(ENDPOINT_ADDRESS, asList(new FleeceProvider<Object>())).accept(MediaType.APPLICATION_JSON_TYPE);
+ final WebClient client = WebClient.create(ENDPOINT_ADDRESS, asList(new JohnzonProvider<Object>())).accept(MediaType.APPLICATION_JSON_TYPE);
WebClient.getConfig(client).getRequestContext().put(LocalConduit.DIRECT_DISPATCH, Boolean.TRUE);
return client;
}
- public static class Fleece {
+ public static class Johnzon {
private String name;
- public Fleece(final String name) {
+ public Johnzon(final String name) {
this.name = name;
}
- public Fleece() {
+ public Johnzon() {
// no-op
}
@@ -134,27 +134,27 @@
}
}
- @Path("fleece")
- public static class FleeceResource {
+ @Path("johnzon")
+ public static class JohnzonResource {
@GET
- public Fleece fleece() {
- return new Fleece("fleece");
+ public Johnzon johnzon() {
+ return new Johnzon("johnzon");
}
@GET
@Path("all1")
- public Fleece[] fleeces1() {
- return new Fleece[] { new Fleece("fleece1"), new Fleece("fleece2") };
+ public Johnzon[] johnzons1() {
+ return new Johnzon[] { new Johnzon("johnzon1"), new Johnzon("johnzon2") };
}
@GET
@Path("all2")
- public List<Fleece> fleeces2() {
- return asList(fleeces1());
+ public List<Johnzon> johnzons2() {
+ return asList(johnzons1());
}
@POST
- public String asParam(final Fleece f) {
+ public String asParam(final Johnzon f) {
return Boolean.toString("client".equals(f.getName()));
}
}
diff --git a/fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/JsrProviderTest.java b/johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/JsrProviderTest.java
similarity index 85%
rename from fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/JsrProviderTest.java
rename to johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/JsrProviderTest.java
index 04419a4..9954cbb 100644
--- a/fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/JsrProviderTest.java
+++ b/johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/JsrProviderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs;
+package org.apache.johnzon.jaxrs;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
@@ -41,15 +41,15 @@
import static org.junit.Assert.assertEquals;
public class JsrProviderTest {
- private final static String ENDPOINT_ADDRESS = "local://fleece";
+ private final static String ENDPOINT_ADDRESS = "local://johnzon";
private static Server server;
@BeforeClass
public static void bindEndpoint() throws Exception {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
- sf.setResourceClasses(FleeceResource.class);
+ sf.setResourceClasses(JohnzonResource.class);
sf.setProviders(asList(new JsrProvider()));
- sf.setResourceProvider(FleeceResource.class, new SingletonResourceProvider(new FleeceResource(), false));
+ sf.setResourceProvider(JohnzonResource.class, new SingletonResourceProvider(new JohnzonResource(), false));
sf.setAddress(ENDPOINT_ADDRESS);
server = sf.create();
}
@@ -62,7 +62,7 @@
@Test
public void object() {
- final JsonObject object = client().path("fleece/object").get(JsonObject.class);
+ final JsonObject object = client().path("johnzon/object").get(JsonObject.class);
assertEquals(2, object.size());
for (int i = 1; i <= 2; i++) {
assertEquals(i, object.getInt(Character.toString((char) ('a' + i - 1))));
@@ -71,7 +71,7 @@
@Test
public void array() {
- final JsonArray array = client().path("fleece/array").get(JsonArray.class);
+ final JsonArray array = client().path("johnzon/array").get(JsonArray.class);
assertEquals(2, array.size());
final Iterator<JsonValue> ints = array.iterator();
for (int i = 1; i <= 2; i++) {
@@ -87,8 +87,8 @@
return client;
}
- @Path("fleece")
- public static class FleeceResource {
+ @Path("johnzon")
+ public static class JohnzonResource {
@GET
@Path("array")
public JsonArray array() {
diff --git a/fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJsonTest.java b/johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/xml/WadlDocumentToJsonTest.java
similarity index 98%
rename from fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJsonTest.java
rename to johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/xml/WadlDocumentToJsonTest.java
index efab474..ba19b0d 100644
--- a/fleece-jaxrs/src/test/java/org/apache/fleece/jaxrs/xml/WadlDocumentToJsonTest.java
+++ b/johnzon-jaxrs/src/test/java/org/apache/johnzon/jaxrs/xml/WadlDocumentToJsonTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.jaxrs.xml;
+package org.apache.johnzon.jaxrs.xml;
import org.junit.Test;
import org.w3c.dom.Document;
diff --git a/fleece-mapper/pom.xml b/johnzon-mapper/pom.xml
similarity index 84%
rename from fleece-mapper/pom.xml
rename to johnzon-mapper/pom.xml
index d7e4789..31d5007 100644
--- a/fleece-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -21,19 +21,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>fleece</artifactId>
- <groupId>org.apache.fleece</groupId>
+ <artifactId>johnzon</artifactId>
+ <groupId>org.apache.johnzon</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>fleece-mapper</artifactId>
- <name>Fleece :: Mapper</name>
+ <artifactId>johnzon-mapper</artifactId>
+ <name>Johnzon :: Mapper</name>
<dependencies>
<dependency>
- <groupId>org.apache.fleece</groupId>
- <artifactId>fleece-core</artifactId>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/Converter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Converter.java
similarity index 95%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/Converter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Converter.java
index fbed98c..3c36273 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/Converter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Converter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
public interface Converter<T> {
String toString(T instance);
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/FleeceConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonConverter.java
similarity index 93%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/FleeceConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonConverter.java
index 726afa1..1c1a01d 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/FleeceConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -26,6 +26,6 @@
@Target(METHOD)
@Retention(RUNTIME)
-public @interface FleeceConverter {
+public @interface JohnzonConverter {
Class<? extends Converter<?>> value();
}
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/FleeceIgnore.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonIgnore.java
similarity index 86%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/FleeceIgnore.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonIgnore.java
index 6f8e545..6b75dc5 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/FleeceIgnore.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonIgnore.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -26,9 +26,9 @@
@Target(METHOD)
@Retention(RUNTIME)
-public @interface FleeceIgnore {
+public @interface JohnzonIgnore {
/**
- * Example: @FleeceIgnore(minVersion = 2) will ignore the value until version is set to 2, 3, ...
+ * Example: @JohnzonIgnore(minVersion = 2) will ignore the value until version is set to 2, 3, ...
*
* @return the first version the decorated field is not ignored.
*/
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
similarity index 99%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
index 2186b4d..1367a65 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/Mapper.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
-import org.apache.fleece.mapper.converter.EnumConverter;
-import org.apache.fleece.mapper.reflection.Mappings;
+import org.apache.johnzon.mapper.converter.EnumConverter;
+import org.apache.johnzon.mapper.reflection.Mappings;
import javax.json.Json;
import javax.json.JsonArray;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/MapperBuilder.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
similarity index 84%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/MapperBuilder.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
index 7ec07bd..e31aab6 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/MapperBuilder.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
-import org.apache.fleece.mapper.converter.BigDecimalConverter;
-import org.apache.fleece.mapper.converter.BigIntegerConverter;
-import org.apache.fleece.mapper.converter.BooleanConverter;
-import org.apache.fleece.mapper.converter.ByteConverter;
-import org.apache.fleece.mapper.converter.CachedDelegateConverter;
-import org.apache.fleece.mapper.converter.CharacterConverter;
-import org.apache.fleece.mapper.converter.ClassConverter;
-import org.apache.fleece.mapper.converter.DateConverter;
-import org.apache.fleece.mapper.converter.DoubleConverter;
-import org.apache.fleece.mapper.converter.FloatConverter;
-import org.apache.fleece.mapper.converter.IntegerConverter;
-import org.apache.fleece.mapper.converter.LongConverter;
-import org.apache.fleece.mapper.converter.ShortConverter;
-import org.apache.fleece.mapper.converter.StringConverter;
+import org.apache.johnzon.mapper.converter.BigDecimalConverter;
+import org.apache.johnzon.mapper.converter.BigIntegerConverter;
+import org.apache.johnzon.mapper.converter.BooleanConverter;
+import org.apache.johnzon.mapper.converter.ByteConverter;
+import org.apache.johnzon.mapper.converter.CachedDelegateConverter;
+import org.apache.johnzon.mapper.converter.CharacterConverter;
+import org.apache.johnzon.mapper.converter.ClassConverter;
+import org.apache.johnzon.mapper.converter.DateConverter;
+import org.apache.johnzon.mapper.converter.DoubleConverter;
+import org.apache.johnzon.mapper.converter.FloatConverter;
+import org.apache.johnzon.mapper.converter.IntegerConverter;
+import org.apache.johnzon.mapper.converter.LongConverter;
+import org.apache.johnzon.mapper.converter.ShortConverter;
+import org.apache.johnzon.mapper.converter.StringConverter;
import javax.json.JsonReaderFactory;
import javax.json.spi.JsonProvider;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/MapperException.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperException.java
similarity index 96%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/MapperException.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperException.java
index e882c2a..6b5f00a 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/MapperException.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import javax.json.JsonException;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BigDecimalConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BigDecimalConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BigDecimalConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BigDecimalConverter.java
index f5828b1..b5864e0 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BigDecimalConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BigDecimalConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
import java.math.BigDecimal;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BigIntegerConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BigIntegerConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BigIntegerConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BigIntegerConverter.java
index eb3f0d7..16710dd 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BigIntegerConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BigIntegerConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
import java.math.BigInteger;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BooleanConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BooleanConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BooleanConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BooleanConverter.java
index ee51806..668b7df 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/BooleanConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/BooleanConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class BooleanConverter implements Converter<Boolean> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ByteConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ByteConverter.java
similarity index 91%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ByteConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ByteConverter.java
index 32edd86..f4d7991 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ByteConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ByteConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class ByteConverter implements Converter<Byte> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/CachedDelegateConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/CachedDelegateConverter.java
similarity index 94%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/CachedDelegateConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/CachedDelegateConverter.java
index 9d36701..e1babff 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/CachedDelegateConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/CachedDelegateConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/CharacterConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/CharacterConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/CharacterConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/CharacterConverter.java
index 6117b07..d028eb6 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/CharacterConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/CharacterConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class CharacterConverter implements Converter<Character> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ClassConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ClassConverter.java
similarity index 93%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ClassConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ClassConverter.java
index 0214c51..31e0f2c 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ClassConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ClassConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class ClassConverter implements Converter<Class<?>> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/DateConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
similarity index 94%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/DateConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
index fa8831b..00af32a 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/DateConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
import java.text.DateFormat;
import java.text.ParseException;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/DoubleConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DoubleConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/DoubleConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DoubleConverter.java
index 6faf015..ac73684 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/DoubleConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DoubleConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class DoubleConverter implements Converter<Double> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/EnumConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/EnumConverter.java
similarity index 93%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/EnumConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/EnumConverter.java
index 56aadcb..793356d 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/EnumConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/EnumConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
import java.util.HashMap;
import java.util.Map;
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/FloatConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/FloatConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/FloatConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/FloatConverter.java
index 7e6fb1e..feba890 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/FloatConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/FloatConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class FloatConverter implements Converter<Float> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/IntegerConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/IntegerConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/IntegerConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/IntegerConverter.java
index 8677b3e..faaea1c 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/IntegerConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/IntegerConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class IntegerConverter implements Converter<Integer> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/LongConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LongConverter.java
similarity index 91%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/LongConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LongConverter.java
index 62b17ec..6a8037b 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/LongConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LongConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class LongConverter implements Converter<Long> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ShortConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ShortConverter.java
similarity index 92%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ShortConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ShortConverter.java
index e9c48ec..93bac0f 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/ShortConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/ShortConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class ShortConverter implements Converter<Short> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/StringConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/StringConverter.java
similarity index 91%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/StringConverter.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/StringConverter.java
index 713702f..2e78bcf 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/converter/StringConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/StringConverter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
-import org.apache.fleece.mapper.Converter;
+import org.apache.johnzon.mapper.Converter;
public class StringConverter implements Converter<String> {
@Override
diff --git a/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
similarity index 93%
rename from fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
rename to johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
index 4006515..5baae6b 100644
--- a/fleece-mapper/src/main/java/org/apache/fleece/mapper/reflection/Mappings.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.reflection;
+package org.apache.johnzon.mapper.reflection;
-import org.apache.fleece.mapper.Converter;
-import org.apache.fleece.mapper.FleeceConverter;
-import org.apache.fleece.mapper.FleeceIgnore;
-import org.apache.fleece.mapper.MapperException;
+import org.apache.johnzon.mapper.Converter;
+import org.apache.johnzon.mapper.JohnzonConverter;
+import org.apache.johnzon.mapper.JohnzonIgnore;
+import org.apache.johnzon.mapper.MapperException;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -211,7 +211,7 @@
final PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(clazz).getPropertyDescriptors();
for (final PropertyDescriptor descriptor : propertyDescriptors) {
final Method writeMethod = descriptor.getWriteMethod();
- final FleeceIgnore writeIgnore = writeMethod != null ? writeMethod.getAnnotation(FleeceIgnore.class) : null;
+ final JohnzonIgnore writeIgnore = writeMethod != null ? writeMethod.getAnnotation(JohnzonIgnore.class) : null;
if (writeMethod != null && writeMethod.getDeclaringClass() != Object.class
&& (writeIgnore == null || writeIgnore.minVersion() >= 0)) {
if (descriptor.getName().equals("metaClass")) {
@@ -227,7 +227,7 @@
}
final Method readMethod = descriptor.getReadMethod();
- final FleeceIgnore readIgnore = readMethod != null ? readMethod.getAnnotation(FleeceIgnore.class) : null;
+ final JohnzonIgnore readIgnore = readMethod != null ? readMethod.getAnnotation(JohnzonIgnore.class) : null;
if (readMethod != null && readMethod.getDeclaringClass() != Object.class
&& (readIgnore == null || readIgnore.minVersion() >= 0)) {
if (descriptor.getName().equals("metaClass")) {
@@ -254,9 +254,9 @@
private static Converter findConverter(final Method method) {
Converter converter = null;
- if (method.getAnnotation(FleeceConverter.class) != null) {
+ if (method.getAnnotation(JohnzonConverter.class) != null) {
try {
- converter = method.getAnnotation(FleeceConverter.class).value().newInstance();
+ converter = method.getAnnotation(JohnzonConverter.class).value().newInstance();
} catch (final Exception e) {
throw new IllegalArgumentException(e);
}
diff --git a/fleece-mapper/src/test/java/org/apache/fleece/mapper/LiteralTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
similarity index 99%
rename from fleece-mapper/src/test/java/org/apache/fleece/mapper/LiteralTest.java
rename to johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
index 9ba12d9..4423559 100644
--- a/fleece-mapper/src/test/java/org/apache/fleece/mapper/LiteralTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import org.junit.Test;
diff --git a/fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperEnhancedTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperEnhancedTest.java
similarity index 99%
rename from fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperEnhancedTest.java
rename to johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperEnhancedTest.java
index 4f020e6..12401f0 100644
--- a/fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperEnhancedTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperEnhancedTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import org.junit.Assert;
import org.junit.Test;
diff --git a/fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
similarity index 98%
rename from fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperTest.java
rename to johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
index 6779f0b..fa58a1f 100644
--- a/fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import junit.framework.AssertionFailedError;
@@ -285,9 +285,9 @@
@Test
public void converters() {
- final String json = "{\"s\":\"eceelf\"}";
+ final String json = "{\"s\":\"noznhoj\"}";
final Converted v = new MapperBuilder().build().readObject(new ByteArrayInputStream(json.getBytes()), Converted.class);
- assertEquals("fleece", v.getS());
+ assertEquals("johnzon", v.getS());
final StringWriter stream = new StringWriter();
new MapperBuilder().build().writeObject(v, stream);
assertEquals(json, stream.toString());
@@ -480,12 +480,12 @@
public static class Converted {
private String s;
- @FleeceConverter(ReverseConverter.class)
+ @JohnzonConverter(ReverseConverter.class)
public String getS() {
return s;
}
- @FleeceConverter(ReverseConverter.class)
+ @JohnzonConverter(ReverseConverter.class)
public void setS(String v) {
s = v;
}
diff --git a/fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperVersionTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
similarity index 96%
rename from fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperVersionTest.java
rename to johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
index 05e3ebb..aab6355 100644
--- a/fleece-mapper/src/test/java/org/apache/fleece/mapper/MapperVersionTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper;
+package org.apache.johnzon.mapper;
import org.junit.Test;
@@ -60,7 +60,7 @@
public static class Versioned {
private String name;
- @FleeceIgnore(minVersion = 2)
+ @JohnzonIgnore(minVersion = 2)
public String getName() {
return name;
}
diff --git a/fleece-mapper/src/test/java/org/apache/fleece/mapper/converter/EnumConverterTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/converter/EnumConverterTest.java
similarity index 96%
rename from fleece-mapper/src/test/java/org/apache/fleece/mapper/converter/EnumConverterTest.java
rename to johnzon-mapper/src/test/java/org/apache/johnzon/mapper/converter/EnumConverterTest.java
index 501599c..64a4633 100644
--- a/fleece-mapper/src/test/java/org/apache/fleece/mapper/converter/EnumConverterTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/converter/EnumConverterTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fleece.mapper.converter;
+package org.apache.johnzon.mapper.converter;
import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index 61e531b..b19b0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,19 +31,19 @@
<version>14</version>
</parent>
- <groupId>org.apache.fleece</groupId>
- <artifactId>fleece</artifactId>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Fleece</name>
- <description>Apache Fleece is an implementation of JSR-353 (JavaTM API for JSON Processing).</description>
+ <name>Johnzon</name>
+ <description>Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing).</description>
<inceptionYear>2014</inceptionYear>
- <url>http://incubator.apache.org/projects/fleece.html</url>
+ <url>http://incubator.apache.org/projects/johnzon.html</url>
<modules>
- <module>fleece-core</module>
- <module>fleece-mapper</module>
- <module>fleece-jaxrs</module>
+ <module>johnzon-core</module>
+ <module>johnzon-mapper</module>
+ <module>johnzon-jaxrs</module>
</modules>
<dependencies>
@@ -245,7 +245,7 @@
<issueManagement>
<system>jira</system>
- <url>https://issues.apache.org/jira/browse/FLEECE</url>
+ <url>https://issues.apache.org/jira/browse/JOHNZON</url>
</issueManagement>
<distributionManagement>
@@ -257,8 +257,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <fleece.site.url>https://svn.apache.org/repos/asf/incubator/fleece/site/publish/</fleece.site.url>
- <pubsub.url>scm:svn:${fleece.site.url}</pubsub.url>
+ <johnzon.site.url>https://svn.apache.org/repos/asf/incubator/johnzon/site/publish/</johnzon.site.url>
+ <pubsub.url>scm:svn:${johnzon.site.url}</pubsub.url>
<staging.directory>${project.build.directory}/site</staging.directory>
</properties>
@@ -323,18 +323,18 @@
<mailingLists>
<mailingList>
- <name>Fleece Commits List</name>
- <subscribe>commits-subscribe@fleece.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@fleece.incubator.apache.org</unsubscribe>
- <post>commits@fleece.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-fleece-commits/</archive>
+ <name>Johnzon Commits List</name>
+ <subscribe>commits-subscribe@johnzon.incubator.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@johnzon.incubator.apache.org</unsubscribe>
+ <post>commits@johnzon.incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-johnzon-commits/</archive>
</mailingList>
<mailingList>
- <name>Fleece Developer List</name>
- <subscribe>dev-subscribe@fleece.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@fleece.incubator.apache.org</unsubscribe>
- <post>dev@fleece.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-fleece-dev/</archive>
+ <name>Johnzon Developer List</name>
+ <subscribe>dev-subscribe@johnzon.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@johnzon.incubator.apache.org</unsubscribe>
+ <post>dev@johnzon.incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-johnzon-dev/</archive>
</mailingList>
</mailingLists>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index cb8090e..978a077 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -16,22 +16,22 @@
specific language governing permissions and limitations
under the License.
-->
-# Apache fleece
+# Apache johnzon
-Apache Fleece is a project providing an implementation of JsonProcessing (aka jsr-353) and a set of useful extension
+Apache Johnzon is a project providing an implementation of JsonProcessing (aka jsr-353) and a set of useful extension
for this specification like an Object mapper and some JAX-RS providers.
## Get started
-Fleece comes with three main modules.
+Johnzon comes with three main modules.
### Core
<pre class="prettyprint linenums"><![CDATA[
<dependency>
- <groupId>org.apache.fleece</groupId>
- <artifactId>fleece-core</artifactId>
- <version>${fleece.version}</version>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>${johnzon.version}</version>
</dependency>
]]></pre>
@@ -50,9 +50,9 @@
<pre class="prettyprint linenums"><![CDATA[
<dependency>
- <groupId>org.apache.fleece</groupId>
- <artifactId>fleece-mapper</artifactId>
- <version>${fleece.version}</version>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-mapper</artifactId>
+ <version>${johnzon.version}</version>
</dependency>
]]></pre>
@@ -72,14 +72,14 @@
<pre class="prettyprint linenums"><![CDATA[
<dependency>
- <groupId>org.apache.fleece</groupId>
- <artifactId>fleece-jaxrs</artifactId>
- <version>${fleece.version}</version>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <version>${johnzon.version}</version>
</dependency>
]]></pre>
JAX-RS module provides two providers (and underlying MessageBodyReaders and MessageBodyWriters):
-* org.apache.fleece.jaxrs.FleeceProvider.FleeceProvider: use Fleece Mapper to map Object to Json and the opposite
-* org.apache.fleece.jaxrs.JsrProvider: allows you to use JsrArray, JsrObject (more generally JsonStructure)
+* org.apache.johnzon.jaxrs.JohnzonProvider.JohnzonProvider: use Johnzon Mapper to map Object to Json and the opposite
+* org.apache.johnzon.jaxrs.JsrProvider: allows you to use JsrArray, JsrObject (more generally JsonStructure)
diff --git a/src/site/site.xml b/src/site/site.xml
index 75cfd61..9adf8e6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Fleece"
+<project name="Apache Johnzon"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/DECORATION/1.0.1"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.1
http://maven.apache.org/xsd/decoration-1.0.1.xsd">
<bannerLeft>
- <name>Apache Fleece</name>
- <alt>Apache Fleece logo</alt>
+ <name>Apache Johnzon</name>
+ <alt>Apache Johnzon logo</alt>
<href>/index.html</href>
</bannerLeft>
<bannerRight>
@@ -36,7 +36,7 @@
<sideBarEnabled>true</sideBarEnabled>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<ohloh>
- <projectId>apache-fleece</projectId>
+ <projectId>apache-johnzon</projectId>
<widget>stats</widget>
</ohloh>
</fluidoSkin>
@@ -80,7 +80,7 @@
</menu>
<footer>
- <div class="row span16"><div>Apache Fleece, Apache, the Apache feather logo, and the Apache Fleece project logos are trademarks of The Apache Software Foundation.
+ <div class="row span16"><div>Apache Johnzon, Apache, the Apache feather logo, and the Apache Johnzon project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<a href="${project.url}/privacy-policy.html">Privacy Policy</a>
</div>
