From 708eeb25367dba5d8ba2552c601dd2299205803c Mon Sep 17 00:00:00 2001 From: lwang Date: Mon, 30 Mar 2015 21:48:36 +0800 Subject: [PATCH] Rename package --- jsurfer-gson/pom.xml | 6 +++--- .../org/{leo => jsfr}/json/GsonSurfer.java | 8 ++++---- .../json/parse/GsonProvider.java | 2 +- .../src/test/java/GsonSurferTest.java | 4 ++-- jsurfer-jackson/pom.xml | 6 +++--- .../org/{leo => jsfr}/json/JacksonSurfer.java | 8 ++++---- .../json/parse/JacksonProvider.java | 3 +-- .../src/test/java/JacksonSurferTest.java | 5 ++--- jsurfer-simple/pom.xml | 2 +- .../{leo => jsfr}/json/BuilderFactory.java | 6 +++--- .../{leo => jsfr}/json/JsonSimpleSurfer.java | 6 +++--- .../org/{leo => jsfr}/json/JsonSurfer.java | 4 ++-- .../json/exception/JsonSurfingException.java | 2 +- .../json/parse/ContentDispatcher.java | 2 +- .../json/parse/JavaCollectionProvider.java | 2 +- .../json/parse/JsonCollector.java | 2 +- .../json/parse/JsonGenerator.java | 2 +- .../json/parse/JsonPathListener.java | 2 +- .../json/parse/JsonPosition.java | 4 ++-- .../json/parse/JsonProvider.java | 2 +- .../json/parse/JsonSimpleProvider.java | 2 +- .../json/parse/ParsingContext.java | 2 +- .../json/parse/SurfingContext.java | 10 +++++----- .../org/{leo => jsfr}/json/path/AnyChild.java | 2 +- .../org/{leo => jsfr}/json/path/AnyIndex.java | 2 +- .../{leo => jsfr}/json/path/ArrayIndex.java | 2 +- .../{leo => jsfr}/json/path/ArrayIndexes.java | 2 +- .../{leo => jsfr}/json/path/ChildNode.java | 2 +- .../{leo => jsfr}/json/path/ChildrenNode.java | 2 +- .../org/{leo => jsfr}/json/path/DeepScan.java | 2 +- .../org/{leo => jsfr}/json/path/JsonPath.java | 2 +- .../{leo => jsfr}/json/path/PathOperator.java | 2 +- .../org/{leo => jsfr}/json/path/Root.java | 2 +- .../org/{leo => jsfr}/json/path/Wildcard.java | 2 +- .../src/test/java/JsonSurferTest.java | 20 +++++++++---------- pom.xml | 2 +- 36 files changed, 67 insertions(+), 69 deletions(-) rename jsurfer-gson/src/main/java/org/{leo => jsfr}/json/GsonSurfer.java (97%) rename jsurfer-gson/src/main/java/org/{leo => jsfr}/json/parse/GsonProvider.java (98%) rename jsurfer-jackson/src/main/java/org/{leo => jsfr}/json/JacksonSurfer.java (97%) rename jsurfer-jackson/src/main/java/org/{leo => jsfr}/json/parse/JacksonProvider.java (97%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/BuilderFactory.java (93%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/JsonSimpleSurfer.java (93%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/JsonSurfer.java (95%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/exception/JsonSurfingException.java (97%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/ContentDispatcher.java (99%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JavaCollectionProvider.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JsonCollector.java (99%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JsonGenerator.java (99%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JsonPathListener.java (97%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JsonPosition.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JsonProvider.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/JsonSimpleProvider.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/ParsingContext.java (97%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/parse/SurfingContext.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/AnyChild.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/AnyIndex.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/ArrayIndex.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/ArrayIndexes.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/ChildNode.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/ChildrenNode.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/DeepScan.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/JsonPath.java (99%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/PathOperator.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/Root.java (98%) rename jsurfer-simple/src/main/java/org/{leo => jsfr}/json/path/Wildcard.java (98%) diff --git a/jsurfer-gson/pom.xml b/jsurfer-gson/pom.xml index b0a2e4d..71994c6 100644 --- a/jsurfer-gson/pom.xml +++ b/jsurfer-gson/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> jsurfer - org.leo.json + org.jsfr 1.1 @@ -27,12 +27,12 @@ 2.3.1 - org.leo.json + org.jsfr jsurfer-simple 1.1 - org.leo.json + org.jsfr jsurfer-simple 1.1 test diff --git a/jsurfer-gson/src/main/java/org/leo/json/GsonSurfer.java b/jsurfer-gson/src/main/java/org/jsfr/json/GsonSurfer.java similarity index 97% rename from jsurfer-gson/src/main/java/org/leo/json/GsonSurfer.java rename to jsurfer-gson/src/main/java/org/jsfr/json/GsonSurfer.java index 92ee224..678a815 100644 --- a/jsurfer-gson/src/main/java/org/leo/json/GsonSurfer.java +++ b/jsurfer-gson/src/main/java/org/jsfr/json/GsonSurfer.java @@ -22,14 +22,14 @@ * THE SOFTWARE. */ -package org.leo.json; +package org.jsfr.json; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; +import org.jsfr.json.parse.SurfingContext; import org.json.simple.parser.ParseException; -import org.leo.json.exception.JsonSurfingException; -import org.leo.json.parse.JsonProvider; -import org.leo.json.parse.SurfingContext; +import org.jsfr.json.exception.JsonSurfingException; +import org.jsfr.json.parse.JsonProvider; import java.io.IOException; import java.io.Reader; diff --git a/jsurfer-gson/src/main/java/org/leo/json/parse/GsonProvider.java b/jsurfer-gson/src/main/java/org/jsfr/json/parse/GsonProvider.java similarity index 98% rename from jsurfer-gson/src/main/java/org/leo/json/parse/GsonProvider.java rename to jsurfer-gson/src/main/java/org/jsfr/json/parse/GsonProvider.java index 56f1d35..5e0cf0d 100644 --- a/jsurfer-gson/src/main/java/org/leo/json/parse/GsonProvider.java +++ b/jsurfer-gson/src/main/java/org/jsfr/json/parse/GsonProvider.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import com.google.gson.*; diff --git a/jsurfer-gson/src/test/java/GsonSurferTest.java b/jsurfer-gson/src/test/java/GsonSurferTest.java index 37b645c..a17b6eb 100644 --- a/jsurfer-gson/src/test/java/GsonSurferTest.java +++ b/jsurfer-gson/src/test/java/GsonSurferTest.java @@ -27,8 +27,8 @@ import com.google.gson.stream.JsonReader; import org.junit.Before; import org.junit.Test; -import org.leo.json.GsonSurfer; -import org.leo.json.parse.GsonProvider; +import org.jsfr.json.GsonSurfer; +import org.jsfr.json.parse.GsonProvider; import java.io.InputStreamReader; import java.util.Map; diff --git a/jsurfer-jackson/pom.xml b/jsurfer-jackson/pom.xml index 6547f60..35dcb44 100644 --- a/jsurfer-jackson/pom.xml +++ b/jsurfer-jackson/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> jsurfer - org.leo.json + org.jsfr 1.1 4.0.0 @@ -13,12 +13,12 @@ - org.leo.json + org.jsfr jsurfer-simple 1.1 - org.leo.json + org.jsfr jsurfer-simple 1.1 test diff --git a/jsurfer-jackson/src/main/java/org/leo/json/JacksonSurfer.java b/jsurfer-jackson/src/main/java/org/jsfr/json/JacksonSurfer.java similarity index 97% rename from jsurfer-jackson/src/main/java/org/leo/json/JacksonSurfer.java rename to jsurfer-jackson/src/main/java/org/jsfr/json/JacksonSurfer.java index 58994c4..b4bce2e 100644 --- a/jsurfer-jackson/src/main/java/org/leo/json/JacksonSurfer.java +++ b/jsurfer-jackson/src/main/java/org/jsfr/json/JacksonSurfer.java @@ -22,15 +22,15 @@ * THE SOFTWARE. */ -package org.leo.json; +package org.jsfr.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import org.jsfr.json.parse.SurfingContext; import org.json.simple.parser.ParseException; -import org.leo.json.exception.JsonSurfingException; -import org.leo.json.parse.JsonProvider; -import org.leo.json.parse.SurfingContext; +import org.jsfr.json.exception.JsonSurfingException; +import org.jsfr.json.parse.JsonProvider; import java.io.IOException; import java.io.Reader; diff --git a/jsurfer-jackson/src/main/java/org/leo/json/parse/JacksonProvider.java b/jsurfer-jackson/src/main/java/org/jsfr/json/parse/JacksonProvider.java similarity index 97% rename from jsurfer-jackson/src/main/java/org/leo/json/parse/JacksonProvider.java rename to jsurfer-jackson/src/main/java/org/jsfr/json/parse/JacksonProvider.java index b62a4e3..88867e1 100644 --- a/jsurfer-jackson/src/main/java/org/leo/json/parse/JacksonProvider.java +++ b/jsurfer-jackson/src/main/java/org/jsfr/json/parse/JacksonProvider.java @@ -22,9 +22,8 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; -import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/jsurfer-jackson/src/test/java/JacksonSurferTest.java b/jsurfer-jackson/src/test/java/JacksonSurferTest.java index 6b31be1..48cb280 100644 --- a/jsurfer-jackson/src/test/java/JacksonSurferTest.java +++ b/jsurfer-jackson/src/test/java/JacksonSurferTest.java @@ -30,9 +30,8 @@ import com.google.common.io.Resources; import org.junit.Before; import org.junit.Test; -import org.leo.json.JacksonSurfer; -import org.leo.json.parse.JacksonProvider; -import org.leo.json.parse.JsonSimpleProvider; +import org.jsfr.json.JacksonSurfer; +import org.jsfr.json.parse.JacksonProvider; import java.util.concurrent.atomic.AtomicLong; diff --git a/jsurfer-simple/pom.xml b/jsurfer-simple/pom.xml index f8e3877..5cd7336 100644 --- a/jsurfer-simple/pom.xml +++ b/jsurfer-simple/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> jsurfer - org.leo.json + org.jsfr 1.1 diff --git a/jsurfer-simple/src/main/java/org/leo/json/BuilderFactory.java b/jsurfer-simple/src/main/java/org/jsfr/json/BuilderFactory.java similarity index 93% rename from jsurfer-simple/src/main/java/org/leo/json/BuilderFactory.java rename to jsurfer-simple/src/main/java/org/jsfr/json/BuilderFactory.java index 651405a..413fc64 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/BuilderFactory.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/BuilderFactory.java @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -package org.leo.json; +package org.jsfr.json; -import org.leo.json.parse.SurfingContext; -import org.leo.json.path.JsonPath; +import org.jsfr.json.parse.SurfingContext; +import org.jsfr.json.path.JsonPath; public class BuilderFactory { diff --git a/jsurfer-simple/src/main/java/org/leo/json/JsonSimpleSurfer.java b/jsurfer-simple/src/main/java/org/jsfr/json/JsonSimpleSurfer.java similarity index 93% rename from jsurfer-simple/src/main/java/org/leo/json/JsonSimpleSurfer.java rename to jsurfer-simple/src/main/java/org/jsfr/json/JsonSimpleSurfer.java index c54875e..80fc010 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/JsonSimpleSurfer.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/JsonSimpleSurfer.java @@ -22,12 +22,12 @@ * THE SOFTWARE. */ -package org.leo.json; +package org.jsfr.json; +import org.jsfr.json.parse.SurfingContext; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.leo.json.exception.JsonSurfingException; -import org.leo.json.parse.SurfingContext; +import org.jsfr.json.exception.JsonSurfingException; import java.io.IOException; import java.io.Reader; diff --git a/jsurfer-simple/src/main/java/org/leo/json/JsonSurfer.java b/jsurfer-simple/src/main/java/org/jsfr/json/JsonSurfer.java similarity index 95% rename from jsurfer-simple/src/main/java/org/leo/json/JsonSurfer.java rename to jsurfer-simple/src/main/java/org/jsfr/json/JsonSurfer.java index c67f856..6460be3 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/JsonSurfer.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/JsonSurfer.java @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -package org.leo.json; +package org.jsfr.json; -import org.leo.json.parse.SurfingContext; +import org.jsfr.json.parse.SurfingContext; import java.io.Reader; diff --git a/jsurfer-simple/src/main/java/org/leo/json/exception/JsonSurfingException.java b/jsurfer-simple/src/main/java/org/jsfr/json/exception/JsonSurfingException.java similarity index 97% rename from jsurfer-simple/src/main/java/org/leo/json/exception/JsonSurfingException.java rename to jsurfer-simple/src/main/java/org/jsfr/json/exception/JsonSurfingException.java index 79d8e0e..01a3d11 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/exception/JsonSurfingException.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/exception/JsonSurfingException.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.exception; +package org.jsfr.json.exception; /** * Created by Administrator on 2015/3/25. diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/ContentDispatcher.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/ContentDispatcher.java similarity index 99% rename from jsurfer-simple/src/main/java/org/leo/json/parse/ContentDispatcher.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/ContentDispatcher.java index 9635e80..c5b596c 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/ContentDispatcher.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/ContentDispatcher.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import org.json.simple.parser.ContentHandler; import org.json.simple.parser.ParseException; diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JavaCollectionProvider.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JavaCollectionProvider.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JavaCollectionProvider.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JavaCollectionProvider.java index 1db507e..d355bed 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JavaCollectionProvider.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JavaCollectionProvider.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import java.util.ArrayList; import java.util.Map; diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonCollector.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonCollector.java similarity index 99% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JsonCollector.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonCollector.java index b810226..43ccfec 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonCollector.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonCollector.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import org.json.simple.parser.ParseException; diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonGenerator.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonGenerator.java similarity index 99% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JsonGenerator.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonGenerator.java index adcfb62..95313d2 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonGenerator.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonGenerator.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import org.json.simple.parser.ContentHandler; import org.json.simple.parser.ParseException; diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonPathListener.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonPathListener.java similarity index 97% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JsonPathListener.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonPathListener.java index 0a9a649..fcf14e1 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonPathListener.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonPathListener.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; public interface JsonPathListener { diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonPosition.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonPosition.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JsonPosition.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonPosition.java index 5e3067d..10df896 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonPosition.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonPosition.java @@ -22,9 +22,9 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; -import org.leo.json.path.*; +import org.jsfr.json.path.*; import java.lang.ref.SoftReference; import java.util.Stack; diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonProvider.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonProvider.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JsonProvider.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonProvider.java index 81cb0f2..1176f4d 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonProvider.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonProvider.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; /** * Created by Administrator on 2015/3/25. diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonSimpleProvider.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonSimpleProvider.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/parse/JsonSimpleProvider.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonSimpleProvider.java index 3ee9664..9dd13bd 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/JsonSimpleProvider.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/JsonSimpleProvider.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/ParsingContext.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/ParsingContext.java similarity index 97% rename from jsurfer-simple/src/main/java/org/leo/json/parse/ParsingContext.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/ParsingContext.java index 8090ce0..a68f5af 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/ParsingContext.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/ParsingContext.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; /** * Created by Leo on 2015/3/22. diff --git a/jsurfer-simple/src/main/java/org/leo/json/parse/SurfingContext.java b/jsurfer-simple/src/main/java/org/jsfr/json/parse/SurfingContext.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/parse/SurfingContext.java rename to jsurfer-simple/src/main/java/org/jsfr/json/parse/SurfingContext.java index f55194d..be33517 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/parse/SurfingContext.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/parse/SurfingContext.java @@ -22,14 +22,14 @@ * THE SOFTWARE. */ -package org.leo.json.parse; +package org.jsfr.json.parse; import org.json.simple.parser.ContentHandler; import org.json.simple.parser.ParseException; -import org.leo.json.path.ArrayIndex; -import org.leo.json.path.JsonPath; -import org.leo.json.path.PathOperator; -import org.leo.json.path.PathOperator.Type; +import org.jsfr.json.path.ArrayIndex; +import org.jsfr.json.path.JsonPath; +import org.jsfr.json.path.PathOperator; +import org.jsfr.json.path.PathOperator.Type; import java.io.IOException; import java.util.*; diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/AnyChild.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/AnyChild.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/AnyChild.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/AnyChild.java index f684df7..97855ac 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/AnyChild.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/AnyChild.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; /** * Created by Administrator on 2015/3/22. diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/AnyIndex.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/AnyIndex.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/AnyIndex.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/AnyIndex.java index 9d1707e..4d1889d 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/AnyIndex.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/AnyIndex.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; /** * Created by Administrator on 2015/3/22. diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/ArrayIndex.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/ArrayIndex.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/ArrayIndex.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/ArrayIndex.java index 3ded845..dc77458 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/ArrayIndex.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/ArrayIndex.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; /** * Created by Administrator on 2015/3/22. diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/ArrayIndexes.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/ArrayIndexes.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/ArrayIndexes.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/ArrayIndexes.java index 371c6d9..4fe366d 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/ArrayIndexes.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/ArrayIndexes.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; import java.util.HashSet; diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/ChildNode.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/ChildNode.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/ChildNode.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/ChildNode.java index 15a5114..c8a090a 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/ChildNode.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/ChildNode.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; import java.util.Objects; diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/ChildrenNode.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/ChildrenNode.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/ChildrenNode.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/ChildrenNode.java index 580333c..41fd7fe 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/ChildrenNode.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/ChildrenNode.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; import java.util.HashSet; diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/DeepScan.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/DeepScan.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/DeepScan.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/DeepScan.java index 523bc88..229d0d1 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/DeepScan.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/DeepScan.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; /** * Created by Administrator on 2015/3/25. diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/JsonPath.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/JsonPath.java similarity index 99% rename from jsurfer-simple/src/main/java/org/leo/json/path/JsonPath.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/JsonPath.java index fcd922f..1bf3db2 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/JsonPath.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/JsonPath.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; import java.util.*; diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/PathOperator.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/PathOperator.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/PathOperator.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/PathOperator.java index aa9a459..2e9454b 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/PathOperator.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/PathOperator.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; public class PathOperator { diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/Root.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/Root.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/Root.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/Root.java index b68037d..877f378 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/Root.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/Root.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; public class Root extends PathOperator { diff --git a/jsurfer-simple/src/main/java/org/leo/json/path/Wildcard.java b/jsurfer-simple/src/main/java/org/jsfr/json/path/Wildcard.java similarity index 98% rename from jsurfer-simple/src/main/java/org/leo/json/path/Wildcard.java rename to jsurfer-simple/src/main/java/org/jsfr/json/path/Wildcard.java index 7f62d39..e056bef 100644 --- a/jsurfer-simple/src/main/java/org/leo/json/path/Wildcard.java +++ b/jsurfer-simple/src/main/java/org/jsfr/json/path/Wildcard.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -package org.leo.json.path; +package org.jsfr.json.path; /** * Created by Administrator on 2015/3/25. diff --git a/jsurfer-simple/src/test/java/JsonSurferTest.java b/jsurfer-simple/src/test/java/JsonSurferTest.java index 58b04cd..db50257 100644 --- a/jsurfer-simple/src/test/java/JsonSurferTest.java +++ b/jsurfer-simple/src/test/java/JsonSurferTest.java @@ -27,22 +27,22 @@ import org.hamcrest.TypeSafeMatcher; import org.junit.Before; import org.junit.Test; -import org.leo.json.BuilderFactory; -import org.leo.json.JsonSimpleSurfer; -import org.leo.json.JsonSurfer; -import org.leo.json.parse.JsonPathListener; -import org.leo.json.parse.JsonProvider; -import org.leo.json.parse.JsonSimpleProvider; -import org.leo.json.parse.ParsingContext; -import org.leo.json.parse.SurfingContext.Builder; +import org.jsfr.json.BuilderFactory; +import org.jsfr.json.JsonSimpleSurfer; +import org.jsfr.json.JsonSurfer; +import org.jsfr.json.parse.JsonPathListener; +import org.jsfr.json.parse.JsonProvider; +import org.jsfr.json.parse.JsonSimpleProvider; +import org.jsfr.json.parse.ParsingContext; +import org.jsfr.json.parse.SurfingContext.Builder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicLong; -import static org.leo.json.BuilderFactory.context; -import static org.leo.json.BuilderFactory.root; +import static org.jsfr.json.BuilderFactory.context; +import static org.jsfr.json.BuilderFactory.root; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.argThat; diff --git a/pom.xml b/pom.xml index d441eea..4ca287c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.leo.json + org.jsfr jsurfer 1.1 pom