rsanchez
2014-09-29 ecda08d86931f4134e31138649aa487d345a0b18
#2021 fix - Added "ping" command
3 files modified
changed files
securis/pom.xml patch | view | blame | history
securis/src/main/java/net/curisit/securis/LicenseGenerator.java patch | view | blame | history
securis/src/main/java/net/curisit/securis/services/ApiResource.java patch | view | blame | history
securis/pom.xml
....@@ -42,11 +42,6 @@
4242 <version>3.0.9.Final</version>
4343 </dependency>
4444 <dependency>
45
- <groupId>net.curisit</groupId>
46
- <artifactId>securis-client</artifactId>
47
- <version>0.9.5-SNAPSHOT</version>
48
- </dependency>
49
- <dependency>
5045 <groupId>org.slf4j</groupId>
5146 <artifactId>slf4j-log4j12</artifactId>
5247 <version>1.7.7</version>
....@@ -61,6 +56,11 @@
6156 <artifactId>hibernate-entitymanager</artifactId>
6257 <version>4.3.6.Final</version>
6358 </dependency>
59
+ <dependency>
60
+ <groupId>net.curisit</groupId>
61
+ <artifactId>securis-client</artifactId>
62
+ <version>0.9.7-SNAPSHOT</version>
63
+ </dependency>
6464 </dependencies>
6565 <build>
6666 <plugins>
securis/src/main/java/net/curisit/securis/LicenseGenerator.java
....@@ -22,7 +22,7 @@
2222 import net.curisit.securis.utils.JsonUtils;
2323 import net.curisit.securis.utils.SignatureHelper;
2424
25
-import org.apache.commons.net.util.Base64;
25
+import org.apache.commons.codec.binary.Base64;
2626 import org.apache.logging.log4j.LogManager;
2727 import org.apache.logging.log4j.Logger;
2828
securis/src/main/java/net/curisit/securis/services/ApiResource.java
....@@ -20,8 +20,8 @@
2020 import javax.ws.rs.core.Response;
2121
2222 import net.curisit.integrity.commons.JsonUtils;
23
-import net.curisit.integrity.commons.Utils;
2423 import net.curisit.securis.LicenseGenerator;
24
+import net.curisit.securis.LicenseManager;
2525 import net.curisit.securis.SeCurisException;
2626 import net.curisit.securis.beans.LicenseBean;
2727 import net.curisit.securis.beans.RequestBean;
....@@ -76,7 +76,20 @@
7676 MediaType.TEXT_PLAIN
7777 })
7878 public Response index() {
79
- return Response.ok("SeCuris API").build();
79
+ return Response.ok("SeCuris API. Date: " + new Date()).build();
80
+ }
81
+
82
+ /**
83
+ *
84
+ * @return Simple text message to check API status
85
+ */
86
+ @GET
87
+ @Path("/ping")
88
+ @Produces({
89
+ MediaType.TEXT_PLAIN
90
+ })
91
+ public Response ping() {
92
+ return Response.ok(LicenseManager.PING_MESSAGE).build();
8093 }
8194
8295