Skip to content

Commit 40691af

Browse files
robertoandraderobertoandrade
committed
Mavenizing project and moving it to custom package name to avoid conflicts in environments that already have org.json in class path
1 parent 4d86b05 commit 40691af

36 files changed

Lines changed: 160 additions & 41 deletions

‎.classpath‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
5+
<attributes>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry kind="output" path="target/classes"/>
15+
</classpath>

‎.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>json-java</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21+
<nature>org.eclipse.jdt.core.javanature</nature>
22+
</natures>
23+
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
3+
org.eclipse.jdt.core.compiler.compliance=1.5
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.5

‎.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎pom.xml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.json</groupId>
4+
<artifactId>json</artifactId>
5+
<version>0.0.1-SNAPSHOT</version>
6+
7+
<name>JSON (JavaScript Object Notation)</name>
8+
<description>
9+
JSON (JavaScript Object Notation) is a lightweight data-interchange format.
10+
It is easy for humans to read and write. It is easy for machines to parse and generate.
11+
It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition
12+
- December 1999. JSON is a text format that is completely language independent but uses
13+
conventions that are familiar to programmers of the C-family of languages, including C, C++, C#,
14+
Java, JavaScript, Perl, Python, and many others.
15+
These properties make JSON an ideal data-interchange language.
16+
</description>
17+
<url>http://www.json.org/java/index.html</url>
18+
<licenses>
19+
<license>
20+
<name>provided without support or warranty</name>
21+
<url>http://www.json.org/license.html</url>
22+
<distribution>repo</distribution>
23+
</license>
24+
</licenses>
25+
26+
<organization>
27+
<name>JSON</name>
28+
<url>http://json.org/</url>
29+
</organization>
30+
31+
<distributionManagement>
32+
<repository>
33+
<id>cloud.archiva.internal</id>
34+
<url>http://archiva.cliff.cloudburrito.com:8080/archiva/repository/internal/</url>
35+
</repository>
36+
<snapshotRepository>
37+
<id>cloud.archiva.snapshots</id>
38+
<url>http://archiva.cliff.cloudburrito.com:8080/archiva/repository/snapshots/</url>
39+
</snapshotRepository>
40+
</distributionManagement>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>3.1</version>
47+
<configuration>
48+
<source>1.3</source>
49+
<target>1.3</target>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
55+
</project>

CDL.java renamed to src/main/java/com/cloud/internal/json/CDL.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package org.json;
1+
package com.cloud.internal.json;
2+
23

34
/*
45
Copyright (c) 2002 JSON.org

Cookie.java renamed to src/main/java/com/cloud/internal/json/Cookie.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package org.json;
1+
package com.cloud.internal.json;
2+
23

34
/*
45
Copyright (c) 2002 JSON.org

CookieList.java renamed to src/main/java/com/cloud/internal/json/CookieList.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package org.json;
1+
package com.cloud.internal.json;
2+
23

34
/*
45
Copyright (c) 2002 JSON.org

HTTP.java renamed to src/main/java/com/cloud/internal/json/HTTP.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package org.json;
1+
package com.cloud.internal.json;
2+
23

34
/*
45
Copyright (c) 2002 JSON.org

HTTPTokener.java renamed to src/main/java/com/cloud/internal/json/HTTPTokener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package org.json;
1+
package com.cloud.internal.json;
2+
23

34
/*
45
Copyright (c) 2002 JSON.org

0 commit comments

Comments
 (0)