Rename package

wanglingsong · Mar 30, 2015 · 708eeb2 · 708eeb2
1 parent 0125816
commit 708eeb2
Show file tree

Hide file tree

Showing 36 changed files with 67 additions and 69 deletions.
diff --git 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">
     <parent>
         <artifactId>jsurfer</artifactId>
-        <groupId>org.leo.json</groupId>
+        <groupId>org.jsfr</groupId>
         <version>1.1</version>
     </parent>
 
@@ -27,12 +27,12 @@
             <version>2.3.1</version>
         </dependency>
         <dependency>
-            <groupId>org.leo.json</groupId>
+            <groupId>org.jsfr</groupId>
             <artifactId>jsurfer-simple</artifactId>
             <version>1.1</version>
         </dependency>
         <dependency>
-            <groupId>org.leo.json</groupId>
+            <groupId>org.jsfr</groupId>
             <artifactId>jsurfer-simple</artifactId>
             <version>1.1</version>
             <scope>test</scope>

diff --git a/...rc/main/java/org/leo/json/GsonSurfer.java → ...c/main/java/org/jsfr/json/GsonSurfer.java b/...rc/main/java/org/leo/json/GsonSurfer.java → ...c/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/...java/org/leo/json/parse/GsonProvider.java → ...ava/org/jsfr/json/parse/GsonProvider.java b/...java/org/leo/json/parse/GsonProvider.java → ...ava/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
@@ -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
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jsurfer</artifactId>
-        <groupId>org.leo.json</groupId>
+        <groupId>org.jsfr</groupId>
         <version>1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,12 +13,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.leo.json</groupId>
+            <groupId>org.jsfr</groupId>
             <artifactId>jsurfer-simple</artifactId>
             <version>1.1</version>
         </dependency>
         <dependency>
-            <groupId>org.leo.json</groupId>
+            <groupId>org.jsfr</groupId>
             <artifactId>jsurfer-simple</artifactId>
             <version>1.1</version>
             <scope>test</scope>

diff --git a/...main/java/org/leo/json/JacksonSurfer.java → ...ain/java/org/jsfr/json/JacksonSurfer.java b/...main/java/org/leo/json/JacksonSurfer.java → ...ain/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/...a/org/leo/json/parse/JacksonProvider.java → .../org/jsfr/json/parse/JacksonProvider.java b/...a/org/leo/json/parse/JacksonProvider.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
@@ -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
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jsurfer</artifactId>
-        <groupId>org.leo.json</groupId>
+        <groupId>org.jsfr</groupId>
         <version>1.1</version>
     </parent>
 

diff --git a/...ain/java/org/leo/json/BuilderFactory.java → ...in/java/org/jsfr/json/BuilderFactory.java b/...ain/java/org/leo/json/BuilderFactory.java → ...in/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/...n/java/org/leo/json/JsonSimpleSurfer.java → .../java/org/jsfr/json/JsonSimpleSurfer.java b/...n/java/org/leo/json/JsonSimpleSurfer.java → .../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/...rc/main/java/org/leo/json/JsonSurfer.java → ...c/main/java/org/jsfr/json/JsonSurfer.java b/...rc/main/java/org/leo/json/JsonSurfer.java → ...c/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/.../json/exception/JsonSurfingException.java → .../json/exception/JsonSurfingException.java b/.../json/exception/JsonSurfingException.java → .../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/...org/leo/json/parse/ContentDispatcher.java → ...rg/jsfr/json/parse/ContentDispatcher.java b/...org/leo/json/parse/ContentDispatcher.java → ...rg/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/...eo/json/parse/JavaCollectionProvider.java → ...fr/json/parse/JavaCollectionProvider.java b/...eo/json/parse/JavaCollectionProvider.java → ...fr/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/...ava/org/leo/json/parse/JsonCollector.java → ...va/org/jsfr/json/parse/JsonCollector.java b/...ava/org/leo/json/parse/JsonCollector.java → ...va/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/...ava/org/leo/json/parse/JsonGenerator.java → ...va/org/jsfr/json/parse/JsonGenerator.java b/...ava/org/leo/json/parse/JsonGenerator.java → ...va/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/.../org/leo/json/parse/JsonPathListener.java → ...org/jsfr/json/parse/JsonPathListener.java b/.../org/leo/json/parse/JsonPathListener.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/...java/org/leo/json/parse/JsonPosition.java → ...ava/org/jsfr/json/parse/JsonPosition.java b/...java/org/leo/json/parse/JsonPosition.java → ...ava/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/...java/org/leo/json/parse/JsonProvider.java → ...ava/org/jsfr/json/parse/JsonProvider.java b/...java/org/leo/json/parse/JsonProvider.java → ...ava/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/...rg/leo/json/parse/JsonSimpleProvider.java → ...g/jsfr/json/parse/JsonSimpleProvider.java b/...rg/leo/json/parse/JsonSimpleProvider.java → ...g/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/...va/org/leo/json/parse/ParsingContext.java → ...a/org/jsfr/json/parse/ParsingContext.java b/...va/org/leo/json/parse/ParsingContext.java → ...a/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/...va/org/leo/json/parse/SurfingContext.java → ...a/org/jsfr/json/parse/SurfingContext.java b/...va/org/leo/json/parse/SurfingContext.java → ...a/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/...main/java/org/leo/json/path/AnyChild.java → ...ain/java/org/jsfr/json/path/AnyChild.java b/...main/java/org/leo/json/path/AnyChild.java → ...ain/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/...main/java/org/leo/json/path/AnyIndex.java → ...ain/java/org/jsfr/json/path/AnyIndex.java b/...main/java/org/leo/json/path/AnyIndex.java → ...ain/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/...in/java/org/leo/json/path/ArrayIndex.java → ...n/java/org/jsfr/json/path/ArrayIndex.java b/...in/java/org/leo/json/path/ArrayIndex.java → ...n/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/.../java/org/leo/json/path/ArrayIndexes.java → ...java/org/jsfr/json/path/ArrayIndexes.java b/.../java/org/leo/json/path/ArrayIndexes.java → ...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/...ain/java/org/leo/json/path/ChildNode.java → ...in/java/org/jsfr/json/path/ChildNode.java b/...ain/java/org/leo/json/path/ChildNode.java → ...in/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/.../java/org/leo/json/path/ChildrenNode.java → ...java/org/jsfr/json/path/ChildrenNode.java b/.../java/org/leo/json/path/ChildrenNode.java → ...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/...main/java/org/leo/json/path/DeepScan.java → ...ain/java/org/jsfr/json/path/DeepScan.java b/...main/java/org/leo/json/path/DeepScan.java → ...ain/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/...main/java/org/leo/json/path/JsonPath.java → ...ain/java/org/jsfr/json/path/JsonPath.java b/...main/java/org/leo/json/path/JsonPath.java → ...ain/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/.../java/org/leo/json/path/PathOperator.java → ...java/org/jsfr/json/path/PathOperator.java b/.../java/org/leo/json/path/PathOperator.java → ...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/...src/main/java/org/leo/json/path/Root.java → ...rc/main/java/org/jsfr/json/path/Root.java b/...src/main/java/org/leo/json/path/Root.java → ...rc/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/...main/java/org/leo/json/path/Wildcard.java → ...ain/java/org/jsfr/json/path/Wildcard.java b/...main/java/org/leo/json/path/Wildcard.java → ...ain/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.