Merge pull request #8 from ljwolford/android

Android
adlnet · Jun 22, 2015 · 79f2fdc · 79f2fdc
2 parents 6e0a46d + 1c0cc14
commit 79f2fdc
Show file tree

Hide file tree

Showing 32 changed files with 1,445 additions and 457 deletions.
diff --git a/pom.xml b/pom.xml
@@ -85,6 +85,22 @@
 	</profiles>
 	<build>
 		<plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -155,13 +171,28 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
+			<version>4.7</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.2.4</version>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>1.46</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet</artifactId>
+            <version>3.0.0.v201112011016</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liferay.org.apache.commons.fileupload</groupId>
+            <artifactId>com.liferay.org.apache.commons.fileupload</artifactId>
+            <version>6.2.0.1</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/src/main/java/gov/adlnet/xapi/App.java b/src/main/java/gov/adlnet/xapi/App.java
diff --git a/src/main/java/gov/adlnet/xapi/client/AboutClient.java b/src/main/java/gov/adlnet/xapi/client/AboutClient.java
@@ -0,0 +1,30 @@
+package gov.adlnet.xapi.client;
+
+import gov.adlnet.xapi.model.About;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Created by lou on 6/18/15.
+ */
+public class AboutClient extends BaseClient {
+
+    public AboutClient(String uri, String username, String password)
+            throws MalformedURLException {
+        super(uri, username, password);
+    }
+
+    public AboutClient(URL uri, String username, String password)
+            throws MalformedURLException {
+        super(uri, username, password);
+    }
+
+    public About getAbout()
+            throws IOException {
+        String path = "/xAPI/about";
+        String result = issueGet(path);
+        return getDecoder().fromJson(result, About.class);
+    }
+}