Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-04-03 02:38:55 +02:00
Code Issues Packages Projects Releases Activity

merge with branch issue-53

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-09-07 10:50:00 +02:00
parent 46fb09756d dd9f9a3322
commit 4c6942096f
2 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scm-core/src/main/java/sonia/scm/BasicContextProvider.java
View File

@@ -35,6 +35,7 @@ package sonia.scm;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.util.IOUtil;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
@@ -65,6 +66,9 @@ public class BasicContextProvider implements SCMContextProvider
/** Java system property for the SCM-Manager base directory */
public static final String DIRECTORY_PROPERTY = "scm.home";
/** Classpath resource for the SCM-Manager base directory */
public static final String DIRECTORY_RESOURCE = "/scm.properties";
/** Path to the maven properties file of the scm-core artifact */
public static final String MAVEN_PROPERTIES =
"/META-INF/maven/sonia.scm/scm-core/pom.properties";
@@ -139,16 +143,21 @@ public class BasicContextProvider implements SCMContextProvider
*/
private File findBaseDirectory()
{
String path = System.getProperty(DIRECTORY_PROPERTY);
String path = getPathFromResource();
if (Util.isEmpty(path))
{
path = System.getenv(DIRECTORY_ENVIRONMENT);
path = System.getProperty(DIRECTORY_PROPERTY);
if (Util.isEmpty(path))
{
path = System.getProperty("user.home").concat(File.separator).concat(
DIRECTORY_DEFAULT);
path = System.getenv(DIRECTORY_ENVIRONMENT);
if (Util.isEmpty(path))
{
path = System.getProperty("user.home").concat(File.separator).concat(
DIRECTORY_DEFAULT);
}
}
}
@@ -189,6 +198,46 @@ public class BasicContextProvider implements SCMContextProvider
return properties.getProperty(MAVEN_PROPERTY_VERSION, DEFAULT_VERSION);
}
//~--- get methods ----------------------------------------------------------
/**
* Load path from classpath resource.
*
*
* @return path from classpath resource or null
*/
private String getPathFromResource()
{
String path = null;
InputStream input = null;
try
{
input =
BasicContextProvider.class.getResourceAsStream(DIRECTORY_RESOURCE);
if (input != null)
{
Properties properties = new Properties();
properties.load(input);
path = properties.getProperty(DIRECTORY_PROPERTY);
}
}
catch (IOException ex)
{
throw new ConfigurationException(
"could not load properties form resource ".concat(
DIRECTORY_RESOURCE), ex);
}
finally
{
IOUtil.close(input);
}
return path;
}
//~--- fields ---------------------------------------------------------------
/** The base directory of the SCM-Manager */