From b618fc0e471533acf99c77f3057ac68e3fb7895e Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 7 Nov 2018 11:11:20 +0000 Subject: [PATCH] added path info git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@174038 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../resolver/services/UriResolverIndex.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/UriResolverIndex.java b/src/main/java/org/gcube/datatransfer/resolver/services/UriResolverIndex.java index bff0918..7b71c5b 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/UriResolverIndex.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/UriResolverIndex.java @@ -10,7 +10,6 @@ import java.io.InputStream; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; @@ -25,15 +24,15 @@ import org.slf4j.LoggerFactory; * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it * Oct 22, 2018 */ -@Path("") +@Path("/") public class UriResolverIndex { private static Logger logger = LoggerFactory.getLogger(UriResolverIndex.class); @GET @Produces({MediaType.TEXT_HTML}) - @Path("{toInfo:(index|info)?") - public InputStream index(@Context HttpServletRequest req, @PathParam("toInfo") String info){ + @Path("index") + public InputStream index(@Context HttpServletRequest req){ String indexFile = "/WEB-INF/jsp/index.jsp"; @@ -47,5 +46,19 @@ public class UriResolverIndex { } } + + @GET + @Produces({MediaType.TEXT_HTML}) + @Path("info") + public InputStream info(@Context HttpServletRequest req){ + return index(req); + } + +// @GET +// @Produces({MediaType.TEXT_HTML}) +// @Path("") +// public InputStream emptyPath(@Context HttpServletRequest req){ +// return index(req); +// } }