aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core/src/main
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2011-10-09 18:44:11 +0200
committersimonbrandhof <simon.brandhof@gmail.com>2011-10-09 18:44:11 +0200
commit45e2d5db126fd13552b56f51ad5ead72615e71d0 (patch)
treead63ac861c02c8eaf66378f5bff9f853907b5fe3 /sonar-core/src/main
parente72f4ca2d9be6d3dafd345664cc7244efd2a5a7c (diff)
downloadsonarqube-45e2d5db126fd13552b56f51ad5ead72615e71d0.tar.gz
sonarqube-45e2d5db126fd13552b56f51ad5ead72615e71d0.zip
SONAR-2881 Do not rebuild the WAR file when changing conf/logback.xml
Diffstat (limited to 'sonar-core/src/main')
-rw-r--r--sonar-core/src/main/java/org/sonar/core/config/ConfigurationUtils.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/config/ConfigurationUtils.java b/sonar-core/src/main/java/org/sonar/core/config/ConfigurationUtils.java
index bf4eda351a4..e5ea9230a47 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/ConfigurationUtils.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/ConfigurationUtils.java
@@ -51,13 +51,13 @@ public final class ConfigurationUtils {
public static Properties openProperties(File file) throws IOException {
FileInputStream input = FileUtils.openInputStream(file);
- return openInputStream(input);
+ return readInputStream(input);
}
/**
* Note that the input stream is closed in this method.
*/
- public static Properties openInputStream(InputStream input) throws IOException {
+ public static Properties readInputStream(InputStream input) throws IOException {
try {
Properties p = new Properties();
p.load(input);
@@ -97,7 +97,7 @@ public final class ConfigurationUtils {
return Collections.emptyList();
}
- public static List<Property> getGlobalProperties(DatabaseSessionFactory dbFactory) {
+ public static List<Property> getGeneralProperties(DatabaseSessionFactory dbFactory) {
DatabaseSession session = prepareDbSession(dbFactory);
return session
.createQuery("from " + Property.class.getSimpleName() + " p where p.resourceId is null and p.userId is null")