diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-10-09 18:44:11 +0200 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-10-09 18:44:11 +0200 |
| commit | 45e2d5db126fd13552b56f51ad5ead72615e71d0 (patch) | |
| tree | ad63ac861c02c8eaf66378f5bff9f853907b5fe3 /sonar-application/src/main/assembly/war | |
| parent | e72f4ca2d9be6d3dafd345664cc7244efd2a5a7c (diff) | |
| download | sonarqube-45e2d5db126fd13552b56f51ad5ead72615e71d0.tar.gz sonarqube-45e2d5db126fd13552b56f51ad5ead72615e71d0.zip | |
SONAR-2881 Do not rebuild the WAR file when changing conf/logback.xml
Diffstat (limited to 'sonar-application/src/main/assembly/war')
| -rw-r--r-- | sonar-application/src/main/assembly/war/build.xml | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sonar-application/src/main/assembly/war/build.xml b/sonar-application/src/main/assembly/war/build.xml index 0832a7a58ff..9a2467fb881 100644 --- a/sonar-application/src/main/assembly/war/build.xml +++ b/sonar-application/src/main/assembly/war/build.xml @@ -32,25 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 <fileset dir="../extensions/jdbc-driver" includes="**/*.jar"/> </copy> - <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"> - <fileset dir="../conf" includes="logback.xml"/> - </copy> - - <!-- remove appenders configured for standalone mode --> - <replace file="build/sonar-server/WEB-INF/classes/logback.xml"> - <replacetoken><![CDATA[<appender-ref ref="SONAR_FILE"/>]]></replacetoken> - <replacevalue><![CDATA[<appender-ref ref="SONAR_WAR"/>]]></replacevalue> - </replace> - <replace file="build/sonar-server/WEB-INF/classes/logback.xml"> - <replacetoken><![CDATA[<appender-ref ref="PROFILING_FILE"/>]]></replacetoken> - <replacevalue><![CDATA[<appender-ref ref="SONAR_WAR"/>]]></replacevalue> - </replace> - - <!-- see SONAR-1811. The appender SONAR_FILE must be removed from logback configuration --> - <replaceregexp file="build/sonar-server/WEB-INF/classes/logback.xml" match="SONAR_STANDALONE/(.*)/SONAR_STANDALONE" replace="" byline="false" flags="gs"/> + <replace file="build/sonar-server/WEB-INF/classes/sonar-war.properties" token="#SONAR_HOME=" value="SONAR_HOME=${sonarHome}" /> <war destfile="sonar.war" webxml="build/sonar-server/WEB-INF/web.xml"> <fileset dir="build/sonar-server"/> |