From 8ebc972cb45eb5efaf3bd952ee4f320d2a525536 Mon Sep 17 00:00:00 2001
From: mung3r <rodney@bighatchet.com>
Date: Sun, 10 Apr 2011 22:13:49 -0700
Subject: [PATCH 1/2] reorganized into maven project

---
 .gitignore                                    |  4 +++
 pom.xml                                       | 32 +++++++++++++++++++
 CDL.java => src/main/java/org/json/CDL.java   |  0
 .../main/java/org/json/Cookie.java            |  0
 .../main/java/org/json/CookieList.java        |  0
 HTTP.java => src/main/java/org/json/HTTP.java |  0
 .../main/java/org/json/HTTPTokener.java       |  0
 .../main/java/org/json/JSONArray.java         |  0
 .../main/java/org/json/JSONException.java     |  0
 .../main/java/org/json/JSONML.java            |  0
 .../main/java/org/json/JSONObject.java        |  0
 .../main/java/org/json/JSONString.java        |  0
 .../main/java/org/json/JSONStringer.java      |  0
 .../main/java/org/json/JSONTokener.java       |  0
 .../main/java/org/json/JSONWriter.java        |  0
 XML.java => src/main/java/org/json/XML.java   |  0
 .../main/java/org/json/XMLTokener.java        |  0
 Test.java => src/test/java/org/json/Test.java |  0
 18 files changed, 36 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 pom.xml
 rename CDL.java => src/main/java/org/json/CDL.java (100%)
 rename Cookie.java => src/main/java/org/json/Cookie.java (100%)
 rename CookieList.java => src/main/java/org/json/CookieList.java (100%)
 rename HTTP.java => src/main/java/org/json/HTTP.java (100%)
 rename HTTPTokener.java => src/main/java/org/json/HTTPTokener.java (100%)
 rename JSONArray.java => src/main/java/org/json/JSONArray.java (100%)
 rename JSONException.java => src/main/java/org/json/JSONException.java (100%)
 rename JSONML.java => src/main/java/org/json/JSONML.java (100%)
 rename JSONObject.java => src/main/java/org/json/JSONObject.java (100%)
 rename JSONString.java => src/main/java/org/json/JSONString.java (100%)
 rename JSONStringer.java => src/main/java/org/json/JSONStringer.java (100%)
 rename JSONTokener.java => src/main/java/org/json/JSONTokener.java (100%)
 rename JSONWriter.java => src/main/java/org/json/JSONWriter.java (100%)
 rename XML.java => src/main/java/org/json/XML.java (100%)
 rename XMLTokener.java => src/main/java/org/json/XMLTokener.java (100%)
 rename Test.java => src/test/java/org/json/Test.java (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..1898b99dc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.project
+/.settings
+/target
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..095a66455
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>JSON-java</groupId>
+  <artifactId>JSON-java</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <properties>
+  	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+  	<dependency>
+  		<groupId>junit</groupId>
+  		<artifactId>junit</artifactId>
+  		<version>4.0</version>
+  		<type>jar</type>
+		<scope>test</scope>
+		<optional>true</optional>
+  	</dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/CDL.java b/src/main/java/org/json/CDL.java
similarity index 100%
rename from CDL.java
rename to src/main/java/org/json/CDL.java
diff --git a/Cookie.java b/src/main/java/org/json/Cookie.java
similarity index 100%
rename from Cookie.java
rename to src/main/java/org/json/Cookie.java
diff --git a/CookieList.java b/src/main/java/org/json/CookieList.java
similarity index 100%
rename from CookieList.java
rename to src/main/java/org/json/CookieList.java
diff --git a/HTTP.java b/src/main/java/org/json/HTTP.java
similarity index 100%
rename from HTTP.java
rename to src/main/java/org/json/HTTP.java
diff --git a/HTTPTokener.java b/src/main/java/org/json/HTTPTokener.java
similarity index 100%
rename from HTTPTokener.java
rename to src/main/java/org/json/HTTPTokener.java
diff --git a/JSONArray.java b/src/main/java/org/json/JSONArray.java
similarity index 100%
rename from JSONArray.java
rename to src/main/java/org/json/JSONArray.java
diff --git a/JSONException.java b/src/main/java/org/json/JSONException.java
similarity index 100%
rename from JSONException.java
rename to src/main/java/org/json/JSONException.java
diff --git a/JSONML.java b/src/main/java/org/json/JSONML.java
similarity index 100%
rename from JSONML.java
rename to src/main/java/org/json/JSONML.java
diff --git a/JSONObject.java b/src/main/java/org/json/JSONObject.java
similarity index 100%
rename from JSONObject.java
rename to src/main/java/org/json/JSONObject.java
diff --git a/JSONString.java b/src/main/java/org/json/JSONString.java
similarity index 100%
rename from JSONString.java
rename to src/main/java/org/json/JSONString.java
diff --git a/JSONStringer.java b/src/main/java/org/json/JSONStringer.java
similarity index 100%
rename from JSONStringer.java
rename to src/main/java/org/json/JSONStringer.java
diff --git a/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
similarity index 100%
rename from JSONTokener.java
rename to src/main/java/org/json/JSONTokener.java
diff --git a/JSONWriter.java b/src/main/java/org/json/JSONWriter.java
similarity index 100%
rename from JSONWriter.java
rename to src/main/java/org/json/JSONWriter.java
diff --git a/XML.java b/src/main/java/org/json/XML.java
similarity index 100%
rename from XML.java
rename to src/main/java/org/json/XML.java
diff --git a/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
similarity index 100%
rename from XMLTokener.java
rename to src/main/java/org/json/XMLTokener.java
diff --git a/Test.java b/src/test/java/org/json/Test.java
similarity index 100%
rename from Test.java
rename to src/test/java/org/json/Test.java

From 922b12303f2215e88ec6fb0d016cf1fb2963f902 Mon Sep 17 00:00:00 2001
From: rramos <rramos@10.142.53.213>
Date: Mon, 23 May 2011 16:54:26 -0700
Subject: [PATCH 2/2] fixed pom.xml groupId namespace

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 095a66455..1dbda29be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>JSON-java</groupId>
+  <groupId>org.json</groupId>
   <artifactId>JSON-java</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <properties>