TeleSign · dleblanc · Feb 13, 2014 · Feb 24, 2014
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,9 @@
 # Build & Release Folders.
-bin/
-doc/
-# Package Files
-.war
-.ear
-.swp
-
-# Compiled Java files.
-.class
-
-# Experimental Bits
-# The output from an XML Doclet.
-jel/
+target/
+.idea/
+*.iml
 
 # Properties File for Tests
 test.properties
+src/test/resources/test.properties
+
diff --git a/.project b/.project
diff --git a/README.rst b/README.rst
@@ -2,6 +2,10 @@
 TeleSign
 ========
 
+WARNING (DML): After looking at the quality of this code, you should stay far, far away from this codebase and/or SDK. This is not idiomatic Java, and it violates a whole variety of quality practices on virtually every page (muting exceptions, printing stacktraces to STDOUT, returnning null in arbitrary places, etc). It's probably better to see how the Ruby/Python stuff is approached, and just code up a Java version from that instead (assuming those are better).
+
+NOTE: This is a forked version from Telesign to support building in Maven and creating an OSGi bundle. The tests are also run using failsafe as integration tests.
+
 :Info:
     For more information, visit the `TeleSign web site <http://www.TeleSign.com>`_.
     For the latest source code, visit the `TeleSign github repository <http://github.com/TeleSign/java_telesign/tree>`_.
@@ -99,29 +103,23 @@ Here's a basic code example.
 
 Builds
 -------------
-Build the jar using **ant jar**. Generated jar
-can be found in the *build/jar/* directory.
+This is a standard Maven build - you can create a jar with the 'package' goal.
 
 Documentation
 -------------
 
-Documentation can be generated by running **ant
-doc**. Generated documentation can be found in the
-*doc/build/* directory.
+Documentation can be generated by running **mvn
+javadoc:javadoc**. Generated documentation can be found in the
+*target/apidocs/* directory.
 
 Detailed documentation for TeleSign™ REST APIs is available in the
 `Client Portal <https://portal.telesign.com>`_
 
 Testing
 -------
 
-You will need junit_ installed to generate run
-the tests. You can execute the test by running **ant
-junit**. 
+You can execute the test by running **mvn integration-test**.
 
-The easiest way to run the tests is to install `junit
-<http://junit.org/>`_ Tests are located in the *test/* directory.
-
 Support and Feedback
 --------------------
 

diff --git a/ant.properties b/ant.properties
diff --git a/build.xml b/build.xml
diff --git a/libs/commons-codec-1.7.jar b/libs/commons-codec-1.7.jar
diff --git a/libs/gson-2.2.1.jar b/libs/gson-2.2.1.jar
diff --git a/libs/hamcrest-core-1.3.jar b/libs/hamcrest-core-1.3.jar
diff --git a/libs/junit-4.11.jar b/libs/junit-4.11.jar
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,84 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.telesign</groupId>
+  <artifactId>java-telesign-client</artifactId>
+  <packaging>bundle</packaging>
+  <name>Telesign Java REST Client SDK</name>
+  <version>1.0</version>
+
+  <description>
+    This is a bundle that provides the Telesign Java SDK client, usable in OSGi and standalone.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package><![CDATA[
+            *
+            ]]>
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/com/telesign/phoneid/package.html b/src/com/telesign/phoneid/package.html
diff --git a/src/com/telesign/phoneid/response/package.html b/src/com/telesign/phoneid/response/package.html
diff --git a/src/com/telesign/util/package.html b/src/com/telesign/util/package.html
diff --git a/src/com/telesign/verify/package.html b/src/com/telesign/verify/package.html
diff --git a/src/com/telesign/verify/response/package.html b/src/com/telesign/verify/response/package.html
diff --git a/src/com/telesign/phoneid/PhoneId.java → ...in/java/com/telesign/phoneid/PhoneId.java b/src/com/telesign/phoneid/PhoneId.java → ...in/java/com/telesign/phoneid/PhoneId.java
diff --git a/...neid/response/PhoneIdContactResponse.java → ...neid/response/PhoneIdContactResponse.java b/...neid/response/PhoneIdContactResponse.java → ...neid/response/PhoneIdContactResponse.java
diff --git a/...phoneid/response/PhoneIdLiveResponse.java → ...phoneid/response/PhoneIdLiveResponse.java b/...phoneid/response/PhoneIdLiveResponse.java → ...phoneid/response/PhoneIdLiveResponse.java
diff --git a/...honeid/response/PhoneIdScoreResponse.java → ...honeid/response/PhoneIdScoreResponse.java b/...honeid/response/PhoneIdScoreResponse.java → ...honeid/response/PhoneIdScoreResponse.java
diff --git a/...eid/response/PhoneIdStandardResponse.java → ...eid/response/PhoneIdStandardResponse.java b/...eid/response/PhoneIdStandardResponse.java → ...eid/response/PhoneIdStandardResponse.java
diff --git a/src/com/telesign/util/AuthMethod.java → ...in/java/com/telesign/util/AuthMethod.java b/src/com/telesign/util/AuthMethod.java → ...in/java/com/telesign/util/AuthMethod.java
diff --git a/src/com/telesign/util/TeleSignRequest.java → ...va/com/telesign/util/TeleSignRequest.java b/src/com/telesign/util/TeleSignRequest.java → ...va/com/telesign/util/TeleSignRequest.java
diff --git a/src/com/telesign/verify/Verify.java → ...main/java/com/telesign/verify/Verify.java b/src/com/telesign/verify/Verify.java → ...main/java/com/telesign/verify/Verify.java
diff --git a/...esign/verify/response/VerifyResponse.java → ...esign/verify/response/VerifyResponse.java b/...esign/verify/response/VerifyResponse.java → ...esign/verify/response/VerifyResponse.java
diff --git a/bin/com/telesign/phoneid/package.html → ...javadoc/com/telesign/phoneid/package.html b/bin/com/telesign/phoneid/package.html → ...javadoc/com/telesign/phoneid/package.html
diff --git a/...om/telesign/phoneid/response/package.html → ...om/telesign/phoneid/response/package.html b/...om/telesign/phoneid/response/package.html → ...om/telesign/phoneid/response/package.html
diff --git a/bin/com/telesign/util/package.html → ...in/javadoc/com/telesign/util/package.html b/bin/com/telesign/util/package.html → ...in/javadoc/com/telesign/util/package.html
diff --git a/bin/com/telesign/verify/package.html → .../javadoc/com/telesign/verify/package.html b/bin/com/telesign/verify/package.html → .../javadoc/com/telesign/verify/package.html
diff --git a/...com/telesign/verify/response/package.html → ...com/telesign/verify/response/package.html b/...com/telesign/verify/response/package.html → ...com/telesign/verify/response/package.html
diff --git a/overview.html → src/main/javadoc/overview.html b/overview.html → src/main/javadoc/overview.html
diff --git a/test/com/telesign/PhoneIdTest.java → src/test/java/com/telesign/PhoneIdIT.java b/test/com/telesign/PhoneIdTest.java → src/test/java/com/telesign/PhoneIdIT.java
@@ -22,7 +22,7 @@
  *	Support email address "support@telesign.com"
  *	Author: jweatherford
  */
-public class PhoneIdTest {
+public class PhoneIdIT {
 	public static String CUSTOMER_ID;
 	public static String SECRET_KEY;
 	public static String PHONE_NUMBER;

diff --git a/test/com/telesign/TeleSignRequestTest.java → .../java/com/telesign/TeleSignRequestIT.java b/test/com/telesign/TeleSignRequestTest.java → .../java/com/telesign/TeleSignRequestIT.java
@@ -24,7 +24,7 @@
  *	Support email address "support@telesign.com"
  *	Author: jweatherford
  */
-public class TeleSignRequestTest {
+public class TeleSignRequestIT {
 	public static String CUSTOMER_ID;
 	public static String SECRET_KEY;
 	public static String PHONE_NUMBER;

diff --git a/test/com/telesign/VerifyTest.java → src/test/java/com/telesign/VerifyIT.java b/test/com/telesign/VerifyTest.java → src/test/java/com/telesign/VerifyIT.java
@@ -21,7 +21,7 @@
  *	Support email address "support@telesign.com"
  *	Author: jweatherford
  */
-public class VerifyTest {
+public class VerifyIT {
 
 	public static String CUSTOMER_ID;
 	public static String SECRET_KEY;

diff --git a/test/com/telesign/response/ResponseTest.java → ...a/com/telesign/response/ResponseTest.java b/test/com/telesign/response/ResponseTest.java → ...a/com/telesign/response/ResponseTest.java