jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r762426 - in /incubator/jspwiki/trunk: ChangeLog build.properties build.xml src/java/org/apache/wiki/Release.java
Date Mon, 06 Apr 2009 17:29:20 GMT
Author: metskem
Date: Mon Apr  6 17:29:20 2009
New Revision: 762426

URL: http://svn.apache.org/viewvc?rev=762426&view=rev
Log:
3.0.0-svn-97 added the tests.stress.disabled property to build.properties. You can now skip
the stress tests while running the tests task.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.properties
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=762426&r1=762425&r2=762426&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Apr  6 17:29:20 2009
@@ -1,6 +1,14 @@
+2009-04-05  Harry Metske <metskem@apache.org>
+
+        * 3.0.0-svn-97
+        
+        * added the tests.stress.disabled property to build.properties, and minor tweak
+           to build.xml. You now have the option to skip the stress tests while running
+           the JUnit tests. 
+
 2009-04-06  Andrew Jaquith <ajaquith AT apache DOT org>
 
-        * 3.0.0-svn-86
+        * 3.0.0-svn-96
 
         * [JSPWIKI-304] Changed all Workflow signatures so that all attribute
         values are now Serializable. This has required some minor changes

Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=762426&r1=762425&r2=762426&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Mon Apr  6 17:29:20 2009
@@ -24,7 +24,7 @@
 
 #  Set this property to 'true' if you want to build WARs
 #  that contain pre-compiled JSPs (which load faster).
-compile.jsps = false
+war.compile.jsps = true
 
 #  Enable these if you wish to create a static content tarball
 #  for use with Apache or another front-end web server.
@@ -64,4 +64,9 @@
 #jarfile.old=../JSPWiki-2.6.3-src/build/JSPWiki.jar
 
 # Stripes migration
-stripes.migrator.migrateForms=true
\ No newline at end of file
+stripes.migrator.migrateForms=true
+#
+#  The ant tests task has the on/off option for running stress tests.
+#  Set the following property to false if you want to run them.
+#
+tests.stress.disabled=true
\ No newline at end of file

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=762426&r1=762425&r2=762426&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon Apr  6 17:29:20 2009
@@ -160,7 +160,7 @@
   <path id="path.tests">
      <pathelement location="${jarfile}" />
      <pathelement location="${testjarfile}" />
-	   <pathelement location="${java.home}/../lib/tools.jar" />
+	 <pathelement location="${java.home}/../lib/tools.jar" />
      <fileset dir="${code.web}/WEB-INF/lib">
         <include name="*.jar" />
      </fileset>
@@ -722,7 +722,7 @@
            <fileset dir="${tests.src}">
                 <include name="**/*Test.java" />
                 <exclude name="**/AllTest*java" />
-                <include name="**/StressTestSpeed.java" if="tests.stress.enabled"/>
+                <exclude name="stress/**" if="tests.stress.disabled"/>
                 <exclude name="org/apache/wiki/web/*.*" />
                 <exclude name="org/apache/wiki/TranslatorReaderTest*" />
            </fileset>
@@ -732,6 +732,7 @@
   	 <junitreport todir="${tests}">
   	    <fileset dir="${tests.reports}">
   	       <include name="**/TEST-*.xml" />
+           <exclude name="**/TEST-stress.*.xml" if="tests.stress.disabled"/>
   	    </fileset>
   	    <report format="noframes" todir="${tests}" />
   	 </junitreport>
@@ -971,7 +972,6 @@
            <path refid="path.tests" />
         </classpath>
         <sysproperty key="java.io.tmpdir" value="${webtests.temp}" />
-        <sysproperty key="log4j.configuration" value="log4j.properties" />
         <sysproperty key="log4j.debug" value="yesplease" />
         <!--
         <jvmarg value="-Xdebug" />

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=762426&r1=762425&r2=762426&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Mon Apr  6 17:29:20 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "96";
+    public static final String     BUILD         = "97";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message