diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-10-05 00:44:37 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2011-10-07 13:36:25 +0200 |
| commit | ef5bf7fdece84e5a52c8d478c8a733ecdf4d57f1 (patch) | |
| tree | c64a8a041183379e92fbc81becc77af07c9b38e3 /sonar-application | |
| parent | 3174a29201e922db758b51f4b693ca131e7037ec (diff) | |
| download | sonarqube-ef5bf7fdece84e5a52c8d478c8a733ecdf4d57f1.tar.gz sonarqube-ef5bf7fdece84e5a52c8d478c8a733ecdf4d57f1.zip | |
SONAR-2861 New Configuration API
The component org.apache.commons.Configuration is still available but plugins should use org.sonar.api.config.Settings.
It also implies the following issues :
SONAR-2870 do not rebuild the WAR file when editing sonar.properties
SONAR-2869 allow to use the annotations @Properties/@Property on extensions
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/src/main/assembly/war/build.xml | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/sonar-application/src/main/assembly/war/build.xml b/sonar-application/src/main/assembly/war/build.xml index b8409fbaa64..0832a7a58ff 100644 --- a/sonar-application/src/main/assembly/war/build.xml +++ b/sonar-application/src/main/assembly/war/build.xml @@ -32,17 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 <fileset dir="../extensions/jdbc-driver" includes="**/*.jar"/> </copy> - <!-- sonar properties --> - <copy todir="build/sonar-server/WEB-INF/classes/conf" file="../conf/sonar.properties" overwrite="true" - failonerror="true"/> - - <condition property="sonarhome.found"> - <isfileselected file="build/sonar-server/WEB-INF/classes/conf/sonar.properties"> - <contains text="sonar.home"/> - </isfileselected> - </condition> - - <antcall target="append-sonar-home"/> + <replace file="build/sonar-server/WEB-INF/classes/sonar-war.properties" token="#sonar.home=" value="sonar.home=${sonarHome}" /> <!-- copy the logback config --> <copy todir="build/sonar-server/WEB-INF/classes"> @@ -75,10 +65,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 * supported web servers are Jetty and Tomcat 5.x/6.x/7.x * the web application uses the Sonar home directory. For this reason it must be deployed on this host only. * the war file must be rebuilt when : - - configuration is updated (files in the directory conf/) - - the Sonar home directory is moved to other location - - sonar is upgraded to a new version - It does not have to be rebuilt when a plugin is removed or installed. + - logback configuration is updated (conf/logback.xml) + - the Sonar home directory is moved to other location + - sonar is upgraded to a new version ----------------------------------------------------------------------------------------------------------- </echo> </target> @@ -87,12 +76,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 <delete dir="build"/> <delete file="sonar.war"/> </target> - - <target name="append-sonar-home" unless="sonarhome.found"> - <echo>Setting home to: ${sonarHome}</echo> - <echo file="build/sonar-server/WEB-INF/classes/conf/sonar.properties" append="yes"> - sonar.home=${sonarHome} - </echo> - </target> - </project>
\ No newline at end of file |