You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/05/02 18:29:45 UTC
svn commit: r1478431 - in /incubator/jspwiki/trunk: ChangeLog build.bat
build.properties build.properties.win build.sh pom.xml src/main/filters/
src/main/filters/filters.properties
Author: gmazza
Date: Thu May 2 16:29:45 2013
New Revision: 1478431
URL: http://svn.apache.org/r1478431
Log:
Maven filters property added (if unused right now), removed unused build scripts from root folder.
Added:
incubator/jspwiki/trunk/src/main/filters/
incubator/jspwiki/trunk/src/main/filters/filters.properties
Removed:
incubator/jspwiki/trunk/build.bat
incubator/jspwiki/trunk/build.properties.win
incubator/jspwiki/trunk/build.sh
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/pom.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1478431&r1=1478430&r2=1478431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu May 2 16:29:45 2013
@@ -1,7 +1,12 @@
2013-05-02 Glen Mazza (glenmazza AT apache DOT org)
- * Removed install.sh, slight renaming of web.xml files generated in build.xml for readability
-
+ * Removed install.sh, build.sh/build.bat/build.properties.win, moved latter's
+ info into build.properties.
+
+ * slight renaming of web.xml files generated in build.xml for readability
+
+ * Added Maven-only filters.properties to src/main/filters (not yet used)
+
2013-04-30 Glen Mazza (glenmazza AT apache DOT org)
* 2.9.1-incubating-7
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=1478431&r1=1478430&r2=1478431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Thu May 2 16:29:45 2013
@@ -36,6 +36,20 @@
@tests.auth.filename=/tmp/testrepository/auth.txt
@tests.filter@=tests/etc/filters.xml
+#
+# Windows may still require four "\" for every "\" in the path
+# (TODO: Test/confirm, switch to ${file.separator} for portability
+#
+#@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
+#@testcontainerlog@=tests\\\\build\\\\webtests\\\\testcontainer.log
+#@tests.auth.filename=C:\\\\temp\\\\testrepository\\\\auth.txt
+#@tests.filter@=tests/etc/filters.xml
+
# JavaMail configuration
@mail.smtp.host@=127.0.0.1
@mail.smtp.port@=25
@@ -68,7 +82,7 @@ jdbc.user.password=password
# Running webtests
#
-# Which browser to use?
+# Which browser to use? Safari may be better for Windows
#webtests.browser=*safari
# if you run firefox, and it is not in your PATH, you can specify this :
#webtests.browser=*firefox /usr/bin/firefox
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1478431&r1=1478430&r2=1478431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu May 2 16:29:45 2013
@@ -212,6 +212,16 @@
<build>
<finalName>JSPWiki</finalName>
+ <filters>
+ <filter>src/main/filters/filters.properties</filter>
+ </filters>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- No filtering yet -->
+ <!--filtering>true</filtering-->
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
Added: incubator/jspwiki/trunk/src/main/filters/filters.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/filters/filters.properties?rev=1478431&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/main/filters/filters.properties (added)
+++ incubator/jspwiki/trunk/src/main/filters/filters.properties Thu May 2 16:29:45 2013
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# This file is for Maven use only, replaces the Ant
+# build.properties file which requires delimiters for filter
+# values (@appname@= instead of appname=, for example).
+#
+appname=JSPWiki
+logfile=/tmp/jspwiki.log
+securitylog=/tmp/security.log
+spamlog=/tmp/spamlog.log
+
+tests.pagedir=/tmp/testrepository
+tests.workdir=/tmp/testworkdir
+tests.logfile=/tmp/jspwikitests.log
+testcontainerlog=tests/build/webtests/testcontainer.log
+
+tests.auth.filename=/tmp/testrepository/auth.txt
+tests.filter=tests/etc/filters.xml
+
+# JavaMail configuration
+mail.smtp.host=127.0.0.1
+mail.smtp.port=25
+mail.from=JSPWiki <JS...@localhost>
+#mail.smtp.account=foo
+#mail.smtp.password=foopassword