Add all HTML/JS/CSS files into src/main/webapp directory.

Added /api prefix to all api calls.
shsu · Feb 27, 2014 · be533ca · be533ca
1 parent 54ce465
commit be533ca
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/ca/bcit/infosys/comp4911/services/JaxRsActivator.java b/src/main/java/ca/bcit/infosys/comp4911/services/JaxRsActivator.java
@@ -3,7 +3,7 @@
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/api")
 public class JaxRsActivator extends Application {
 
 }
diff --git a/src/main/java/ca/bcit/infosys/comp4911/services/StatusResource.java b/src/main/java/ca/bcit/infosys/comp4911/services/StatusResource.java
@@ -18,7 +18,7 @@ public String test() {
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("<link href=\"//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css\" rel=\"stylesheet\">");
         stringBuffer.append("<div class=\"container\"><br />");
-        stringBuffer.append("<div class=\"alert alert-success\"><h3>All Systems Operational</h3></div>");
+        stringBuffer.append("<div class=\"alert alert-success\"><h3>API Endpoint is Operational</h3></div>");
         stringBuffer.append("</div>");
         return stringBuffer.toString();
     }

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+</head>
+<body>
+    <h1>Regular Systems OK</h1>
+</body>
+</html>
diff --git a/src/test/java/ca/bcit/infosys/comp4911/services/UserResourceTest.java b/src/test/java/ca/bcit/infosys/comp4911/services/UserResourceTest.java
@@ -11,7 +11,7 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public class UserResourceTest {
-    private static final String url = "https://comp4911-stevenhsu.rhcloud.com";
+    private static final String url = "https://comp4911-stevenhsu.rhcloud.com/api";
 
     private JSONObject authorizationJSONObject;
 

diff --git a/src/test/java/ca/bcit/infosys/comp4911/services/UsersResourceTest.java b/src/test/java/ca/bcit/infosys/comp4911/services/UsersResourceTest.java
@@ -12,7 +12,7 @@
 import static org.junit.Assert.assertFalse;
 
 public class UsersResourceTest {
-    private static final String url = "https://comp4911-stevenhsu.rhcloud.com";
+    private static final String url = "https://comp4911-stevenhsu.rhcloud.com/api";
 
     private String token;