From 40630f96312eabcf9183915fcb158c1c3ba19041 Mon Sep 17 00:00:00 2001
From: "matt.todd" <matt.todd@asolutions.com>
Date: Mon, 28 Mar 2011 10:09:29 -0500
Subject: [PATCH] reorganized the project src files for a maven build and added
 sufficient build info in the project's pom file to create an OSGi bundle from
 the src

---
 .gitignore                                    |  1 +
 pom.xml                                       | 33 +++++++++++++++++++
 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 |  1 +
 18 files changed, 35 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 pom.xml
 rename CDL.java => src/main/java/org/json/CDL.java (100%)
 mode change 100755 => 100644
 rename Cookie.java => src/main/java/org/json/Cookie.java (100%)
 mode change 100755 => 100644
 rename CookieList.java => src/main/java/org/json/CookieList.java (100%)
 mode change 100755 => 100644
 rename HTTP.java => src/main/java/org/json/HTTP.java (100%)
 mode change 100755 => 100644
 rename HTTPTokener.java => src/main/java/org/json/HTTPTokener.java (100%)
 mode change 100755 => 100644
 rename JSONArray.java => src/main/java/org/json/JSONArray.java (100%)
 mode change 100755 => 100644
 rename JSONException.java => src/main/java/org/json/JSONException.java (100%)
 mode change 100755 => 100644
 rename JSONML.java => src/main/java/org/json/JSONML.java (100%)
 mode change 100755 => 100644
 rename JSONObject.java => src/main/java/org/json/JSONObject.java (100%)
 mode change 100755 => 100644
 rename JSONString.java => src/main/java/org/json/JSONString.java (100%)
 mode change 100755 => 100644
 rename JSONStringer.java => src/main/java/org/json/JSONStringer.java (100%)
 mode change 100755 => 100644
 rename JSONTokener.java => src/main/java/org/json/JSONTokener.java (100%)
 mode change 100755 => 100644
 rename JSONWriter.java => src/main/java/org/json/JSONWriter.java (100%)
 mode change 100755 => 100644
 rename XML.java => src/main/java/org/json/XML.java (100%)
 mode change 100755 => 100644
 rename XMLTokener.java => src/main/java/org/json/XMLTokener.java (100%)
 mode change 100755 => 100644
 rename Test.java => src/test/java/org/json/Test.java (99%)
 mode change 100755 => 100644

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..eb5a316cb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..f9bcd5811
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,33 @@
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.json</groupId>
+	<artifactId>json</artifactId>
+	<version>0.0.1</version>
+	<name>org.json</name>
+	<description>JSON reference implementation in Java</description>
+	<packaging>bundle</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>org.json-${project.version}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>org.json</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/CDL.java b/src/main/java/org/json/CDL.java
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
similarity index 99%
rename from Test.java
rename to src/test/java/org/json/Test.java
index 74ce63654..80a2a0cde
--- a/Test.java
+++ b/src/test/java/org/json/Test.java
@@ -1,5 +1,6 @@
 package org.json;
 
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;