jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1419164 - in /incubator/jspwiki/trunk: ChangeLog build.xml etc/jspwiki.properties.tmpl
Date Sun, 09 Dec 2012 21:08:58 GMT
Author: juanpablo
Date: Sun Dec  9 21:08:57 2012
New Revision: 1419164

URL: http://svn.apache.org/viewvc?rev=1419164&view=rev
Log:
some minor build improvements:

 * Sonar Ant task is executed even if there are tests failures
       
 * When building jspwiki.properties, jspwiki.baseURL defaults to http://localhost:8080/JSPWiki/

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1419164&r1=1419163&r2=1419164&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Dec  9 21:08:57 2012
@@ -1,3 +1,9 @@
+2012-12-09  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * Sonar Ant task executed even if there are tests failures
+       
+       * When building jspwiki.properties, jspwiki.baseURL defaults to http://localhost:8080/JSPWiki/
+       
 2012-12-08  Harry Metske <metskem@apache.org>
 
        * 2.9.1-svn-4

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1419164&r1=1419163&r2=1419164&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Dec  9 21:08:57 2012
@@ -863,7 +863,13 @@
   	    <report format="noframes" todir="${tests.reports}" />
   	 </junitreport>
      
-     <fail message="Test failure detected, check test results." if="test.failed" />
+     <antcall target="fail-build">
+       <param name="test.failed" value="@{test.failed}"/>
+     </antcall>
+  </target>
+	
+  <target name="fail-build" unless="continue_even_with_test_failures">
+  	<fail message="Test failure detected, check test results." if="test.failed" />
   </target>
 
   <target name="tests-auth" depends="jar,tests-init,jartests"
@@ -1644,20 +1650,22 @@ To automate the JAR signing processs, yo
   <target name="coverage-reports" depends="coverage-tests,version">
   	<cobertura-report srcdir="${code.src}" destdir="${tests.build}/cobertura" />
   </target>
-  
-  <target name="sonar" depends="coverage-tests,version">
+	
+	
+	    
+  <target name="sonar-bootstrap" description="sonar ant task build configuration">
   	<!-- bootstrap sonar ant tasks -->
     <typedef resource="org/sonar/ant/antlib.xml" 
              uri="antlib:org.sonar.ant" 
              classpathref="path.optional" />
-  	
+  	    
     <!-- list of Sonar project configuration properties -->
     <property name="sonar.projectKey" value="org.apache.jspwiki:jspwiki" />
     <property name="sonar.projectName" value="Apache JSPWiki (incubating)" />
     <property name="sonar.projectVersion" value="${jspwiki.version}" />
     <property name="sonar.sources" value="${code.src}" />
     <property name="sonar.scm.url" value="scm:svn:http://svn.apache.org/repos/asf/incubator/jspwiki/trunk/"
/>
-    
+  	
     <!-- list of optional Sonar properties -->
     <property name="sonar.binaries" value="${code.build}" />
     <property name="sonar.tests" value="${tests.src}" />
@@ -1665,7 +1673,7 @@ To automate the JAR signing processs, yo
     <!-- list of advanced properties -->
     <property name="sonar.core.codeCoveragePlugin" value="cobertura"/>
     <property name="sonar.surefire.reportsPath" value="./tests/reports" />
-  	<property name="sonar.cobertura.reportPath" value="${tests.build}/cobertura/coverage.xml"
/>
+    <property name="sonar.cobertura.reportPath" value="${tests.build}/cobertura/coverage.xml"
/>
     <property name="sonar.dynamicAnalysis" value="reuseReports" />
     
     <!-- Used by PMD only -->
@@ -1678,7 +1686,12 @@ To automate the JAR signing processs, yo
     <!-- <property name="sonar.jdbc.password" value="sonar" /> -->
     <!-- <property name="sonar.jdbc.url" value="jdbc:derby://localhost:1527/sonar"
/> -->
     <!-- <property name="sonar.host.url" value="http://localhost:9000" /> -->
-  	
+    
+    <!-- don't break the build if there are test failures -->
+  	<property name="continue_even_with_test_failures" value="true" />
+  </target>
+  
+  <target name="sonar" depends="sonar-bootstrap,coverage-tests,version">
   	<!-- Sonar needs an xml type cobertura report -->
   	<cobertura-report format="xml" 
   	                  srcdir="${code.src}" 

Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=1419164&r1=1419163&r2=1419164&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Sun Dec  9 21:08:57 2012
@@ -46,7 +46,7 @@ jspwiki.applicationName = @appname@
 #  Example:
 #  jspwiki.baseURL = http://www.jspwiki.org/
 #
-jspwiki.baseURL=
+jspwiki.baseURL=http://localhost:8080/JSPWiki/
 
 #
 #  Which page provider class to use.  Possibilities are:



Mime
View raw message