From 354625513c65dcaa7058ce1476baf9ceb21d9fa8 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 1 Oct 2013 13:11:45 +0000 Subject: [PATCH] changed infras prop files location to tomcat/conf git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/portal-manager@82209 82a268e6-3cf1-43bd-a215-b396298e98cf --- src/main/java/org/gcube/common/portal/PortalContext.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/common/portal/PortalContext.java b/src/main/java/org/gcube/common/portal/PortalContext.java index 33c4762..c8e7a0a 100644 --- a/src/main/java/org/gcube/common/portal/PortalContext.java +++ b/src/main/java/org/gcube/common/portal/PortalContext.java @@ -45,7 +45,7 @@ public class PortalContext { private void initialize() { Properties props = new Properties(); try { - String propertyfile = getGCoreFolder() + File.separator + ".." + File.separator +"infrastructure.properties"; + String propertyfile = getCatalinaHome() + File.separator + "conf" + File.separator + "infrastructure.properties"; File propsFile = new File(propertyfile); FileInputStream fis = new FileInputStream(propsFile); props.load( fis); @@ -91,7 +91,7 @@ public class PortalContext { * * @return $CATALINA_HOME */ - private static String getGCoreFolder() { - return (System.getenv("GLOBUS_LOCATION").endsWith("/") ? System.getenv("GLOBUS_LOCATION") : System.getenv("GLOBUS_LOCATION")+"/"); + private static String getCatalinaHome() { + return (System.getenv("CATALINA_HOME").endsWith("/") ? System.getenv("CATALINA_HOME") : System.getenv("CATALINA_HOME")+"/"); } }