From 8f97df85eefe4d648f2002b8d68818ef6020c2df Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 16 Jan 2014 11:57:55 +0000
Subject: [PATCH] #396 feature - Added i18n support to JS and HTML tags with AngularJS
---
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 39 ++++++++-------------------------------
1 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index 6216867..38addaa 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -6,18 +6,14 @@
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
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 javax.ws.rs.core.UriBuilder;
-
-import net.curisit.securis.dao.UserDao;
-import net.curisit.securis.db.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,23 +33,6 @@
public BasicServices() {
}
- /**
- *
- * @return the server version in format majorVersion.minorVersion
- */
- @GET
- @Path("/index")
- @Produces(
- { MediaType.TEXT_HTML })
- public Response index(@Context HttpServletRequest request) {
- log.info("index session: " + request.getSession());
- HttpSession session = request.getSession(false);
- String page = session != null && session.getAttribute("user") != null ? "/main.html" : "/login.html";
- URI uri = UriBuilder.fromUri(page).build();
- return Response.seeOther(uri).build();
- // return Response.ok().entity("License server").build();
- }
-
@GET
@Path("/info")
@Produces(
@@ -62,17 +41,15 @@
return Response.ok().entity("License server running OK. Date: " + new Date()).build();
}
- @Inject
- UserDao userDao;
-
@GET
- @Path("/test")
+ @Path("/{module:(admin)|(login)|(licenses)}")
@Produces(
- { MediaType.TEXT_PLAIN })
- public Response test(@QueryParam("u") String username) {
- User user = userDao.test(username);
-
- return Response.ok().entity("User: " + user).build();
+ { MediaType.TEXT_HTML })
+ public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
+ log.info("App index main.html");
+ String page = "/main.html";
+ URI uri = UriBuilder.fromUri(page).build();
+ return Response.seeOther(uri).build();
}
}
--
Gitblit v1.3.2