From cc3f9054f478d9698e240bfb644d0d9de9a37c85 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 19 Dec 2013 14:10:36 +0000
Subject: [PATCH] #333 feature - Refactoring to use JEtty and RestEasy with Guice

---
 securis/src/main/java/net/curisit/securis/services/LicenseServices.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
index 00c266a..bbf1a0d 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
@@ -1,22 +1,25 @@
 package net.curisit.securis.services;
 
+import java.io.IOException;
 import java.net.URI;
 import java.text.MessageFormat;
 
-import javax.inject.Inject;
 import javax.inject.Named;
+import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import net.curisit.integrity.beans.ServerConfigVersions;
 import net.curisit.integrity.beans.ServiceResponse;
 
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,14 +30,13 @@
 	// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
 	private static final Logger log = LoggerFactory.getLogger(LicenseServices.class);
 
-	private static final int DEFAULT_LICENSE_EXPIRATION = 3650; // 10 years;
+	private static final int DEFAULT_LICENSE_EXPIRATION = 365;
 	private static final String LICENSE_STRING = "CurisIntegrity Config Server v{0}.{1}";
 
-	@Inject
+	@com.google.inject.Inject
 	@Named("base-uri")
 	private URI uri;
 
-	@Inject
 	public LicenseServices() {
 	}
 
@@ -43,10 +45,16 @@
 	 * @return the server version in format majorVersion.minorVersion
 	 */
 	@GET
-	@Path("/")
 	@Produces(
-		{ MediaType.TEXT_PLAIN })
-	public Response currentVersion() {
+		{ MediaType.TEXT_HTML })
+	public Response index() {
+		try {
+			String index = IOUtils.toString(this.getClass().getResourceAsStream("/static/index.html"));
+			return Response.ok().entity(index).build();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		return Response.ok().entity(MessageFormat.format(LICENSE_STRING, 0, 1)).build();
 	}
 
@@ -54,8 +62,9 @@
 	@Path("/dummy")
 	@Produces(
 		{ MediaType.TEXT_PLAIN })
-	public Response dummy() {
-		return Response.ok().entity(uri.toString()).build();
+	public Response dummy(@Context HttpServletRequest request) {
+		log.info("Request: " + request.getPathInfo());
+		return Response.ok().entity((uri == null)).build();
 	}
 
 	/**

--
Gitblit v1.3.2