Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-21 23:12:11 +01:00
Code Issues Packages Projects Releases Activity

load server configuration from config directory if a config file exists

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-03-25 14:23:24 +02:00
parent 27885baf1d
commit a8a23cc63e
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scm-dao-orientdb/src/main/java/sonia/scm/orientdb/ConnectionProvider.java
View File

@@ -33,6 +33,7 @@ package sonia.scm.orientdb;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.io.Files;
import com.google.common.io.Resources;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -84,6 +85,10 @@ public class ConnectionProvider
public static final String EMBEDDED_CONFIGURATION =
"sonia/scm/orientdb/server-configuration.xml";
/** Field description */
public static final String CONFIG_PATH_SERVER =
"config".concat(File.separator).concat("orientdb-server.xml");
/** Field description */
public static final String CONFIG_PATH_CLIENT =
"config".concat(File.separator).concat("orientdb-client.xml");
@@ -118,10 +123,10 @@ public class ConnectionProvider
{
try
{
File baseDirectory = SCMContext.getContext().getBaseDirectory();
// create connection configuration for embedded server
File directory = new File(SCMContext.getContext().getBaseDirectory(),
DEFAULT_DB_DIRECTORY);
File directory = new File(baseDirectory, DEFAULT_DB_DIRECTORY);
if (logger.isInfoEnabled())
{
@@ -131,7 +136,23 @@ public class ConnectionProvider
server = OServerMain.create();
URL configUrl = Resources.getResource(EMBEDDED_CONFIGURATION);
URL configUrl = null;
File serverConfiguration = new File(baseDirectory, CONFIG_PATH_SERVER);
if (serverConfiguration.exists())
{
configUrl = serverConfiguration.toURI().toURL();
}
else
{
configUrl = Resources.getResource(EMBEDDED_CONFIGURATION);
}
if (logger.isInfoEnabled())
{
logger.info("load orientdb server configuration from {}", configUrl);
}
String config = Resources.toString(configUrl, Charset.defaultCharset());
server.startup(config);