#396 feature - Added i18n support to JS and HTML tags with AngularJS

Roberto Sánchez

2014-01-16 8f97df85eefe4d648f2002b8d68818ef6020c2df

 securis/src/main/java/net/curisit/securis/services/BasicServices.java
..
..
@@ -6,18 +6,14 @@
6
6
 import javax.inject.Inject;
7
7
 import javax.inject.Singleton;
8
8
 import javax.servlet.http.HttpServletRequest;
9
-import javax.servlet.http.HttpSession;
10
9
 import javax.ws.rs.GET;
11
10
 import javax.ws.rs.Path;
11
+import javax.ws.rs.PathParam;
12
12
 import javax.ws.rs.Produces;
13
-import javax.ws.rs.QueryParam;
14
13
 import javax.ws.rs.core.Context;
15
14
 import javax.ws.rs.core.MediaType;
16
15
 import javax.ws.rs.core.Response;
17
16
 import javax.ws.rs.core.UriBuilder;
18
-
19
-import net.curisit.securis.dao.UserDao;
20
-import net.curisit.securis.db.User;
21
17
 
22
18
 import org.slf4j.Logger;
23
19
 import org.slf4j.LoggerFactory;
..
..
@@ -37,23 +33,6 @@
37
33
 	public BasicServices() {
38
34
 	}
39
35
 
40
-	/**
41
-	 * 
42
-	 * @return the server version in format majorVersion.minorVersion
43
-	 */
44
-	@GET
45
-	@Path("/index")
46
-	@Produces(
47
-		{ MediaType.TEXT_HTML })
48
-	public Response index(@Context HttpServletRequest request) {
49
-		log.info("index session: " + request.getSession());
50
-		HttpSession session = request.getSession(false);
51
-		String page = session != null && session.getAttribute("user") != null ? "/main.html" : "/login.html";
52
-		URI uri = UriBuilder.fromUri(page).build();
53
-		return Response.seeOther(uri).build();
54
-		// return Response.ok().entity("License server").build();
55
-	}
56
-
57
36
 	@GET
58
37
 	@Path("/info")
59
38
 	@Produces(
..
..
@@ -62,17 +41,15 @@
62
41
 		return Response.ok().entity("License server running OK. Date: " + new Date()).build();
63
42
 	}
64
43
 
65
-	@Inject
66
-	UserDao userDao;
67
-
68
44
 	@GET
69
-	@Path("/test")
45
+	@Path("/{module:(admin)|(login)|(licenses)}")
70
46
 	@Produces(
71
-		{ MediaType.TEXT_PLAIN })
72
-	public Response test(@QueryParam("u") String username) {
73
-		User user = userDao.test(username);
74
-
75
-		return Response.ok().entity("User: " + user).build();
47
+		{ MediaType.TEXT_HTML })
48
+	public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
49
+		log.info("App index main.html");
50
+		String page = "/main.html";
51
+		URI uri = UriBuilder.fromUri(page).build();
52
+		return Response.seeOther(uri).build();
76
53
 	}
77
54
 
78
55
 }