gCubeSystem
/
portal-manager
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2013-10-01 13:11:45 +00:00
parent 5422e34385
commit 354625513c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/common/portal/PortalContext.java
View File

@ -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")+"/");
}
}