Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dffc30f7 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dffc30f7 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dffc30f7 Branch: refs/heads/master Commit: dffc30f756fb6e635fc464f47cb1f10107758bfe Parents: c724c42 f037317 Author: Christian Schneider <[email protected]> Authored: Fri Feb 21 21:10:07 2014 +0100 Committer: Christian Schneider <[email protected]> Committed: Fri Feb 21 21:10:07 2014 +0100 ---------------------------------------------------------------------- .../karaf/diagnostic/command/DumpCommand.java | 4 +- instance/core/pom.xml | 3 +- .../core/internal/InstanceServiceImpl.java | 23 +- .../org/apache/karaf/main/ConfigProperties.java | 2 +- .../org/apache/karaf/main/InstanceHelper.java | 6 +- .../main/java/org/apache/karaf/main/Main.java | 6 +- .../org/apache/karaf/main/PropertiesLoader.java | 32 +- .../apache/karaf/main/lock/DefaultJDBCLock.java | 2 +- .../apache/karaf/main/lock/DerbyJDBCLock.java | 2 +- .../apache/karaf/main/lock/GenericJDBCLock.java | 2 +- .../org/apache/karaf/main/lock/LockFactory.java | 2 +- .../apache/karaf/main/lock/MySQLJDBCLock.java | 2 +- .../apache/karaf/main/lock/OracleJDBCLock.java | 2 +- .../karaf/main/lock/PostgreSQLJDBCLock.java | 2 +- .../karaf/main/lock/SQLServerJDBCLock.java | 2 +- .../apache/karaf/main/lock/SimpleFileLock.java | 2 +- .../karaf/main/util/BootstrapLogManager.java | 6 +- .../org/apache/karaf/main/util/SubstHelper.java | 141 --- .../java/org/apache/karaf/main/MockLock.java | 2 +- .../main/lock/BaseJDBCLockIntegrationTest.java | 2 +- .../karaf/main/lock/BaseJDBCLockTest.java | 4 +- .../lock/DefaultJDBCLockIntegrationTest.java | 2 +- .../karaf/main/lock/DefaultJDBCLockTest.java | 2 +- .../main/lock/DerbyJDBCLockIntegrationTest.java | 2 +- .../karaf/main/lock/DerbyJDBCLockTest.java | 2 +- .../main/lock/MySQLJDBCLockIntegrationTest.java | 2 +- .../karaf/main/lock/MySQLJDBCLockTest.java | 2 +- .../lock/OracleJDBCLockIntegrationTest.java | 2 +- .../karaf/main/lock/OracleJDBCLockTest.java | 2 +- .../lock/PostgreSQLJDBCLockIntegrationTest.java | 2 +- .../karaf/main/lock/PostgreSQLJDBCLockTest.java | 2 +- .../main/util/BootstrapLogManagerTest.java | 2 +- shell/help/pom.xml | 2 +- .../karaf/shell/help/impl/HelpSystem.java | 2 +- .../apache/karaf/util/InterpolationHelper.java | 215 ---- .../apache/karaf/util/locks/FileLockUtils.java | 110 ++ .../karaf/util/properties/FileLockUtils.java | 110 -- .../util/properties/InterpolationHelper.java | 325 ++++++ .../karaf/util/properties/Properties.java | 1102 ++++++++++++++++++ 39 files changed, 1603 insertions(+), 534 deletions(-) ----------------------------------------------------------------------
