Merged mavenization branch into trunk.

.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>

.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>

.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

AUTHORS.txt

@@ -1,2 +1,3 @@
 Yidong Fang
-Chris Nokleberg
+Chris Nokleberg
+Dave Hughes

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

VERSION.txt

@@ -1 +1 @@
-1.1
+1.1.1

build.xml

@@ -1,32 +1,41 @@
 <project name="json-simple" default="main" basedir=".">
-	<property name="current-version" value="1.1"/>
-	<property name="jar-name" value="json_simple-${current-version}.jar"/>
-	
-	<target name="main" depends="jar">
-	</target>
+	<property name="current-version" value="1.1.1"/>
+	<property name="targetDir" value="target"/>
+	<property name="javaSourceDir" value="src/main/java"/>
+	<property name="javaTargetDir" value="target/classes"/>
+
+	<target name="main" depends="jar"></target>
 	
 	<target name="clean">
 		<delete includeemptydirs="true">
-			<fileset dir="build/main" includes="**/*"/>
-		 </delete>
-		<delete file="lib/${jar-name}"/>
+			<fileset dir="${targetDir}" includes="**/*"/>
+		</delete>
 	</target>
 	
 	<target name="mkdir">
-	    <mkdir dir="build/main"/>
+	    <mkdir dir="${javaTargetDir}"/>
 	</target>
 	
 	<target name="compile" depends="mkdir">
-		<javac 	srcdir="src" 
-				destdir="build/main"
+		<javac 	srcdir="${javaSourceDir}" 
+				destdir="${javaTargetDir}"
 				includes="**/*.java"
 				target="1.2"
 				source="1.2"/>
 	</target>
 	
 	<target name="jar" depends="compile">
-		<jar	destfile="lib/${jar-name}"
-				basedir="build/main"
-				includes="**/*.class"/>
+		<jar	destfile="${targetDir}/json-simple-${current-version}.jar"
+				basedir="${javaTargetDir}"
+				includes="**/*.class">
+			<manifest>
+				<attribute name="Bundle-Name" value="JSON.simple"/>
+				<attribute name="Bundle-SymbolicName" value="com.googlecode.json-simple.json-simple"/>
+				<attribute name="Bundle-Version" value="${current-version}"/>
+				<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+				<attribute name="Bundle-Description" value="A simple Java toolkit for JSON"/>
+				<attribute name="Export-Package" value="org.json.simple, org.json.simple.parser"/>
+			</manifest>
+		</jar>
 	</target>
 </project>

pom.xml

@@ -0,0 +1,56 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.googlecode.json-simple</groupId>
+    <artifactId>json-simple</artifactId>
+    <packaging>bundle</packaging>
+    <name>JSON.simple</name>
+    <version>1.1.1</version>
+    <description>A simple Java toolkit for JSON</description>
+    <url>http://code.google.com/p/json-simple/</url>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <id>Yidong</id>
+            <name>Yidong Fang</name>
+            <roles>
+                <role>architect</role>
+                <role>developer</role>
+            </roles>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:svn:http://json-simple.googlecode.com/svn/trunk/</connection>
+        <developerConnection>scm:svn:http://json-simple.googlecode.com/svn/trunk/</developerConnection>
+        <url>http://json-simple.googlecode.com/svn/trunk/</url>
+    </scm>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.6</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+