ARTEMIS-3300 Evaluation of the system property artmis.data in the OSGi environment in addition to karaf.data
This commit is contained in:
parent
a95c615317
commit
f4f2f4eeda
|
@ -75,11 +75,18 @@ public class OsgiBroker {
|
|||
security.setRolePrincipalClass(rolePrincipalClass);
|
||||
}
|
||||
String brokerInstance = null;
|
||||
String karafDataDir = System.getProperty("karaf.data");
|
||||
if (karafDataDir != null) {
|
||||
brokerInstance = karafDataDir + "/artemis/" + name;
|
||||
|
||||
String artemisDataDir = System.getProperty("artemis.data");
|
||||
if (artemisDataDir != null) {
|
||||
brokerInstance = artemisDataDir + "/artemis/" + name;
|
||||
} else {
|
||||
String karafDataDir = System.getProperty("karaf.data");
|
||||
if (karafDataDir != null) {
|
||||
brokerInstance = karafDataDir + "/artemis/" + name;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// todo if we start to pullout more configs from the main config then we
|
||||
// should pull out the configuration objects from factories if available
|
||||
FileConfiguration configuration = new FileConfiguration();
|
||||
|
|
Loading…
Reference in New Issue