PetaScope usability improvements

- WCPS and WCS-T now both use the ConfigManager for reading settings
- Now we have a unique settings file: settings.properties (dbparams.properties has been removed)
- The HTML templates were moved to a different folder

1 files changed, 2 insertions, 2 deletions

diff --git a/src/wcps/server/servlet/WCPSServlet.java b/src/wcps/server/servlet/WCPSServlet.java
index f791215..b1abaa0 100644
--- a/src/wcps/server/servlet/WCPSServlet.java
+++ b/src/wcps/server/servlet/WCPSServlet.java
@@ -67,7 +67,7 @@ public class WCPSServlet extends HttpServlet
 	private String rasdamanUrl;

 	private WCPS wcps;

     // path to the default HTML response of the servlet

-    private String servletHtmlPath = "/misc/wcps-servlet.html";

+    private String servletHtmlPath = "/templates/wcps-servlet.html";

     // String containing the HTML code for the default response

     private String defaultHtmlResponse;

 

@@ -79,7 +79,7 @@ public class WCPSServlet extends HttpServlet
 			System.out.println("WCPS: loading database properties");

 			dbParams.load(

 			    new FileInputStream(

-				getServletContext().getRealPath("/dbparams.properties")));

+				getServletContext().getRealPath("/settings.properties")));

 			rasdamanUrl      = dbParams.getProperty("rasdaman_url");

 			rasdamanDatabase = dbParams.getProperty("rasdaman_database");