Merge pull request #74 from DerGuteMoritz/master

Maven build support for Java client
pubnub · Mar 8, 2012 · 32e583e · 32e583e
2 parents d310279 + 9deb5f6
commit 32e583e
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 2 deletions.
diff --git a/java/.gitignore b/java/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/java/java-build b/java/java-build
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo -e "Building..."
-javac -Xlint:deprecation PubnubTest.java
+javac -cp src/:. -Xlint:deprecation PubnubTest.java
 
 echo -e "Running:"
-java PubnubTest
+java -cp src/:. PubnubTest
diff --git a/java/org/json/.gitignore b/java/org/json/.gitignore
@@ -0,0 +1 @@
+*.class
diff --git a/java/org/json/JSONArray.class b/java/org/json/JSONArray.class
diff --git a/java/org/json/JSONException.class b/java/org/json/JSONException.class
diff --git a/java/org/json/JSONObject$1.class b/java/org/json/JSONObject$1.class
diff --git a/java/org/json/JSONObject$Null.class b/java/org/json/JSONObject$Null.class
diff --git a/java/org/json/JSONObject.class b/java/org/json/JSONObject.class
diff --git a/java/org/json/JSONString.class b/java/org/json/JSONString.class
diff --git a/java/org/json/JSONTokener.class b/java/org/json/JSONTokener.class
diff --git a/java/pom.xml b/java/pom.xml
@@ -0,0 +1,20 @@
+<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>pubnub</groupId>
+  <artifactId>pubnub</artifactId>
+  <packaging>jar</packaging>
+  <version>3.0</version>
+  <name>pubnub</name>
+  <url>https://github.com/pubnub/pubnub-api/</url>
+  <build>
+    <sourceDirectory>${basedir}/src/</sourceDirectory>
+  </build>
+  <dependencies>
+    <dependency>
+	<groupId>org.json</groupId>
+	<artifactId>json</artifactId>
+	<version>20090211</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/java/pubnub/Callback.java → java/src/pubnub/Callback.java b/java/pubnub/Callback.java → java/src/pubnub/Callback.java
diff --git a/java/pubnub/MD5.java → java/src/pubnub/MD5.java b/java/pubnub/MD5.java → java/src/pubnub/MD5.java
diff --git a/java/pubnub/Pubnub.java → java/src/pubnub/Pubnub.java b/java/pubnub/Pubnub.java → java/src/pubnub/Pubnub.java