From f3dabf2a92d8e900c61073d371b9fb21af6a55e1 Mon Sep 17 00:00:00 2001
From: fangyidong <fangyidong@b68fe964-5755-0410-a06c-9fee2ea08261>
Date: Mon, 6 Feb 2012 01:46:05 +0000
Subject: [PATCH] Made it work with Eclipse and updated relevant info

---
 .classpath                                 | 16 +++++-----
 .project                                   | 34 +++++++++++-----------
 .settings/org.eclipse.core.resources.prefs |  3 ++
 AUTHORS.txt                                |  3 +-
 ChangeLog.txt                              |  4 +++
 VERSION.txt                                |  2 +-
 6 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 .settings/org.eclipse.core.resources.prefs

diff --git a/.classpath b/.classpath
index bddcb9d..41c3da1 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn|**/.svn/**/*" kind="src" output="build/main" path="src"/>
-	<classpathentry excluding="**/.svn|**/.svn/**/*" kind="src" output="build/test" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry kind="output" path="build/main"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
index 6715d34..b1980df 100644
--- a/.project
+++ b/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>json.simple</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>json-simple</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
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/<project>=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