From ecda08d86931f4134e31138649aa487d345a0b18 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 29 Sep 2014 15:36:46 +0000
Subject: [PATCH] #2021 fix - Added "ping" command
---
securis/pom.xml | 10 +++++-----
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 17 +++++++++++++++--
securis/src/main/java/net/curisit/securis/LicenseGenerator.java | 2 +-
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index 4c8dc88..aa26b49 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -42,11 +42,6 @@
<version>3.0.9.Final</version>
</dependency>
<dependency>
- <groupId>net.curisit</groupId>
- <artifactId>securis-client</artifactId>
- <version>0.9.5-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.7</version>
@@ -61,6 +56,11 @@
<artifactId>hibernate-entitymanager</artifactId>
<version>4.3.6.Final</version>
</dependency>
+ <dependency>
+ <groupId>net.curisit</groupId>
+ <artifactId>securis-client</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/securis/src/main/java/net/curisit/securis/LicenseGenerator.java b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
index 74d170d..40954f4 100644
--- a/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
@@ -22,7 +22,7 @@
import net.curisit.securis.utils.JsonUtils;
import net.curisit.securis.utils.SignatureHelper;
-import org.apache.commons.net.util.Base64;
+import org.apache.commons.codec.binary.Base64;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/securis/src/main/java/net/curisit/securis/services/ApiResource.java b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
index 876410c..24903bc 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -20,8 +20,8 @@
import javax.ws.rs.core.Response;
import net.curisit.integrity.commons.JsonUtils;
-import net.curisit.integrity.commons.Utils;
import net.curisit.securis.LicenseGenerator;
+import net.curisit.securis.LicenseManager;
import net.curisit.securis.SeCurisException;
import net.curisit.securis.beans.LicenseBean;
import net.curisit.securis.beans.RequestBean;
@@ -76,7 +76,20 @@
MediaType.TEXT_PLAIN
})
public Response index() {
- return Response.ok("SeCuris API").build();
+ return Response.ok("SeCuris API. Date: " + new Date()).build();
+ }
+
+ /**
+ *
+ * @return Simple text message to check API status
+ */
+ @GET
+ @Path("/ping")
+ @Produces({
+ MediaType.TEXT_PLAIN
+ })
+ public Response ping() {
+ return Response.ok(LicenseManager.PING_MESSAGE).build();
}
--
Gitblit v1.3.2