diff --git a/.classpath b/.classpath index bddcb9d..41c3da1 100644 --- a/.classpath +++ b/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/.project b/.project index 6715d34..b1980df 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - json.simple - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + json-simple + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f707871 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Mon Feb 06 00:32:07 CST 2012 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/AUTHORS.txt b/AUTHORS.txt index 9fda0a2..8f2b7cb 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,2 +1,3 @@ Yidong Fang -Chris Nokleberg \ No newline at end of file +Chris Nokleberg +Dave Hughes diff --git a/ChangeLog.txt b/ChangeLog.txt index e6eb6ab..481db74 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ ChangeLog +Version 1.1.1 (2012/01/29) +* Supports OSGi +* Accepts a java.util.Map parameter in constructor of JSONObject + Version 1.1 (2009/01/23) * Supports stoppable SAX-like content handler for streaming of JSON text * Added JSONStreamAware to support streaming JSON text diff --git a/VERSION.txt b/VERSION.txt index b123147..524cb55 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.1 \ No newline at end of file +1.1.1 diff --git a/build.xml b/build.xml index a14dcb0..ff49be5 100644 --- a/build.xml +++ b/build.xml @@ -1,32 +1,41 @@ - - - - - + + + + + + - - - + + - + - - + + + + + + + + + + diff --git a/lib/json_simple-1.1.jar b/lib/json_simple-1.1.jar deleted file mode 100644 index f395f41..0000000 Binary files a/lib/json_simple-1.1.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..41aa395 --- /dev/null +++ b/pom.xml @@ -0,0 +1,56 @@ + + 4.0.0 + com.googlecode.json-simple + json-simple + bundle + JSON.simple + 1.1.1 + A simple Java toolkit for JSON + http://code.google.com/p/json-simple/ + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Yidong + Yidong Fang + + architect + developer + + +8 + + + + scm:svn:http://json-simple.googlecode.com/svn/trunk/ + scm:svn:http://json-simple.googlecode.com/svn/trunk/ + http://json-simple.googlecode.com/svn/trunk/ + + + + UTF-8 + + + + + junit + junit + 4.10 + + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + + diff --git a/src/org/json/simple/ItemList.java b/src/main/java/org/json/simple/ItemList.java similarity index 100% rename from src/org/json/simple/ItemList.java rename to src/main/java/org/json/simple/ItemList.java diff --git a/src/org/json/simple/JSONArray.java b/src/main/java/org/json/simple/JSONArray.java similarity index 100% rename from src/org/json/simple/JSONArray.java rename to src/main/java/org/json/simple/JSONArray.java diff --git a/src/org/json/simple/JSONAware.java b/src/main/java/org/json/simple/JSONAware.java similarity index 100% rename from src/org/json/simple/JSONAware.java rename to src/main/java/org/json/simple/JSONAware.java diff --git a/src/org/json/simple/JSONObject.java b/src/main/java/org/json/simple/JSONObject.java similarity index 100% rename from src/org/json/simple/JSONObject.java rename to src/main/java/org/json/simple/JSONObject.java diff --git a/src/org/json/simple/JSONStreamAware.java b/src/main/java/org/json/simple/JSONStreamAware.java similarity index 100% rename from src/org/json/simple/JSONStreamAware.java rename to src/main/java/org/json/simple/JSONStreamAware.java diff --git a/src/org/json/simple/JSONValue.java b/src/main/java/org/json/simple/JSONValue.java similarity index 100% rename from src/org/json/simple/JSONValue.java rename to src/main/java/org/json/simple/JSONValue.java diff --git a/src/org/json/simple/parser/ContainerFactory.java b/src/main/java/org/json/simple/parser/ContainerFactory.java similarity index 100% rename from src/org/json/simple/parser/ContainerFactory.java rename to src/main/java/org/json/simple/parser/ContainerFactory.java diff --git a/src/org/json/simple/parser/ContentHandler.java b/src/main/java/org/json/simple/parser/ContentHandler.java similarity index 100% rename from src/org/json/simple/parser/ContentHandler.java rename to src/main/java/org/json/simple/parser/ContentHandler.java diff --git a/src/org/json/simple/parser/JSONParser.java b/src/main/java/org/json/simple/parser/JSONParser.java similarity index 100% rename from src/org/json/simple/parser/JSONParser.java rename to src/main/java/org/json/simple/parser/JSONParser.java diff --git a/src/org/json/simple/parser/ParseException.java b/src/main/java/org/json/simple/parser/ParseException.java similarity index 100% rename from src/org/json/simple/parser/ParseException.java rename to src/main/java/org/json/simple/parser/ParseException.java diff --git a/src/org/json/simple/parser/Yylex.java b/src/main/java/org/json/simple/parser/Yylex.java similarity index 100% rename from src/org/json/simple/parser/Yylex.java rename to src/main/java/org/json/simple/parser/Yylex.java diff --git a/src/org/json/simple/parser/Yytoken.java b/src/main/java/org/json/simple/parser/Yytoken.java similarity index 100% rename from src/org/json/simple/parser/Yytoken.java rename to src/main/java/org/json/simple/parser/Yytoken.java diff --git a/test/org/json/simple/Test.java b/src/test/java/org/json/simple/Test.java similarity index 100% rename from test/org/json/simple/Test.java rename to src/test/java/org/json/simple/Test.java diff --git a/test/org/json/simple/parser/YylexTest.java b/src/test/java/org/json/simple/parser/YylexTest.java similarity index 100% rename from test/org/json/simple/parser/YylexTest.java rename to src/test/java/org/json/simple/parser/YylexTest.java