From 1c35bc09ca740a31cb82ac5bdd07a30a356cc688 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Tue, 20 Jan 2015 17:54:05 +0100
Subject: [PATCH] Added default path
---
.gitignore | 2 ++
.../vips/core/VIPSCoreApplication.java | 1 +
.../vips/core/service/ModelResourceImpl.java | 19 +++++++++++++++++++
3 files changed, 22 insertions(+)
diff --git a/.gitignore b/.gitignore
index 23176e3..5e0e2ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
target/
classes/
+dockerdeploy/
+jboss/
diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index c023ca8..e890e15 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
@@ -56,5 +56,6 @@ public class VIPSCoreApplication extends Application
*/
private void addRestResourceClasses(Set<Class<?>> resources) {
resources.add(no.bioforsk.vips.core.config.JacksonConfig.class);
+ resources.add(no.bioforsk.vips.core.service.ModelResourceImpl.class);
}
}
\ No newline at end of file
diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
index 03a9a37..4ee731a 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
@@ -22,11 +22,13 @@ package no.bioforsk.vips.core.service;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+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.WebApplicationException;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import no.bioforsk.vips.entity.ModelConfiguration;
import no.bioforsk.vips.entity.Result;
@@ -35,6 +37,7 @@ import no.bioforsk.vips.model.Model;
import no.bioforsk.vips.model.ModelExcecutionException;
import no.bioforsk.vips.model.factory.DuplicateModelIdException;
import no.bioforsk.vips.model.factory.ModelFactory;
+import no.bioforsk.vips.util.ServletUtil;
/**
* The available resources in this system
@@ -43,6 +46,9 @@ import no.bioforsk.vips.model.factory.ModelFactory;
*/
//@Path("")
public class ModelResourceImpl implements ModelResource{
+
+ @Context
+ HttpServletRequest servletRequest;
/**
* Lists all models available in this instance, using default language (English)
@@ -55,6 +61,19 @@ public class ModelResourceImpl implements ModelResource{
}
+ /**
+ * The default response if no path given
+ * @return
+ */
+ @GET
+ @Path("")
+ @Produces("text/html")
+ @Override
+ public Response defaultResponse()
+ {
+ return Response.ok().entity("<html><head></head><body><a href=\"" + servletRequest.getContextPath() + "/models/\">Models</a></body></html>").build();
+ }
+
/**
* Lists all models available in this instance, using default language (English)
* @return list of all models available
--
GitLab