Author: florianh
Date: Mon Jul 16 07:56:49 2012
New Revision: 1361929
URL: http://svn.apache.org/viewvc?rev=1361929&view=rev
Log:
synchronized windows to unix build files
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.bat
incubator/jspwiki/trunk/build.properties.win
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1361929&r1=1361928&r2=1361929&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Jul 16 07:56:49 2012
@@ -1,3 +1,8 @@
+2012-07-16 Florian Holeczek (florianh AT apache DOT org)
+
+ * no version bump
+ * synchronized windows to unix build files
+
2012-07-07 Dirk Frederickx (brushed AT apache DOT org)
* 2.9.0-incubating-6
Modified: incubator/jspwiki/trunk/build.bat
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.bat?rev=1361929&r1=1361928&r2=1361929&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.bat (original)
+++ incubator/jspwiki/trunk/build.bat Mon Jul 16 07:56:49 2012
@@ -2,4 +2,4 @@
REM A simple build script
-ant -Dbuild.properties=build.properties.mine -find
+ant -Dbuild.properties=build.properties.win -find
Modified: incubator/jspwiki/trunk/build.properties.win
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties.win?rev=1361929&r1=1361928&r2=1361929&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties.win (original)
+++ incubator/jspwiki/trunk/build.properties.win Mon Jul 16 07:56:49 2012
@@ -12,11 +12,54 @@
@appname@=JSPWiki
@pagedir@=C:\\\\temp\\\\wikipages
@logfile@=C:\\\\temp\\\\jspwiki.log
+@securitylog@=C:\\\\temp\\\\security.log
+@spamlog@=C:\\\\temp\\\\spamlog.log
@tests.pagedir@=C:\\\\temp\\\\testrepository
@tests.workdir@=C:\\\\temp\\\\testworkdir
@tests.logfile@=C:\\\\temp\\\\jspwikitests.log
[email protected]=C:\\\\temp\\\\testrepository\\\\auth.txt
[email protected]@=tests/etc/filters.xml
+
# JavaMail configuration
[email protected]@=JSPWiki@localhost
[email protected]@=localhost
[email protected]@=127.0.0.1
[email protected]@=25
[email protected]@=JSPWiki <JSPWiki@localhost>
+#@mail.smtp.account@=foo
+#@mail.smtp.password@=foopassword
+
+# Enable these if you wish to create a static content tarball
+# for use with Apache or another front-end web server.
+# You should specify user and group names that make sense for
+# your environment.
+
+static.user = apache
+static.group = daemon
+jks.password = jspwiki
+
+#
+# JDBC testing properties
+#
+jdbc.driver.id=hsql
+jdbc.driver.jar=tests/lib/hsqldb.jar
+jdbc.driver.class=org.hsqldb.jdbcDriver
+jdbc.driver.url=jdbc:hsqldb:hsql://localhost/jspwiki
+jdbc.admin.id=SA
+jdbc.admin.password=
+jdbc.user.id=jspwiki
+jdbc.user.password=password
+
+#
+# Running webtests
+#
+
+# Which browser to use?
+webtests.browser=*safari
+# if you run firefox, and it is not in your PATH, you can specify this :
+#webtests.browser=*firefox /usr/lib/firefox/firefox-2-bin
+
+# For generating API diffs (you must have DependencyFinder installed)
+#dependencyfinder.dir=../lib/DependencyFinder
+#jarfile.old=../JSPWiki-2.6.3-src/build/JSPWiki.jar
+#jspwiki.test.skip=whatever