summaryrefslogtreecommitdiffstats
path: root/sonar-server/src/test/resources
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-server/src/test/resources
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-server/src/test/resources')
-rw-r--r--sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/conf/sonar.properties2
-rw-r--r--sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/db/shared.xml20
2 files changed, 22 insertions, 0 deletions
diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/conf/sonar.properties b/sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/conf/sonar.properties
new file mode 100644
index 00000000000..016382d7fe1
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/conf/sonar.properties
@@ -0,0 +1,2 @@
+hello: world
+ServerSettingsTestEnv: in_file \ No newline at end of file
diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/db/shared.xml b/sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/db/shared.xml
new file mode 100644
index 00000000000..f3a1b304598
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/platform/ServerSettingsTest/db/shared.xml
@@ -0,0 +1,20 @@
+<dataset>
+
+ <!-- project -->
+ <projects long_name="[null]" id="3333" scope="PRJ" qualifier="TRK" kee="mygroup:anotherproject" name="[null]"
+ root_id="[null]"
+ description="[null]"
+ enabled="true" language="java" copy_resource_id="[null]"/>
+
+ <!-- general properties -->
+ <properties prop_key="general_only" resource_id="[null]" user_id="[null]" text_value="is_general"/>
+ <properties prop_key="general_and_project" resource_id="[null]" user_id="[null]" text_value="is_general"/>
+
+ <!-- project properties: do not load -->
+ <properties prop_key="general_and_project" resource_id="3333" user_id="[null]" text_value="is_project"/>
+ <properties prop_key="project_only" resource_id="3333" user_id="[null]" text_value="is_project"/>
+
+ <!-- user properties : do not load -->
+ <properties prop_key="user" resource_id="[null]" user_id="110" text_value="is_user"/>
+
+</dataset> \ No newline at end of file