Author: ajaquith
Date: Sun Oct 25 16:45:15 2009
New Revision: 829617
URL: http://svn.apache.org/viewvc?rev=829617&view=rev
Log:
Additional build.xml tweaks to fix broken WAR builds.
Added:
incubator/jspwiki/trunk/etc/jspwiki.properties
- copied unchanged from r829488,
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/etc/log4j.properties
incubator/jspwiki/trunk/etc/priha.properties
Removed:
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
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=829617&r1=829616&r2=829617&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Oct 25 16:45:15 2009
@@ -1,3 +1,9 @@
+2009-10-25 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-171
+
+ * Additional build.xml tweaks to fix broken WAR builds.
+
2009-10-24 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-170
Modified: incubator/jspwiki/trunk/build.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=829617&r1=829616&r2=829617&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Sun Oct 25 16:45:15 2009
@@ -28,14 +28,18 @@
# Any changes in this file will be reflected in the default
# jspwiki.properties-file when it is run.
#
-...@appname@=JSPWiki
+appname=JSPWiki
+logfile=/tmp/jspwiki.log
+pagedir=/tmp/priha
+securitylog=/tmp/jspwiki.security.log
+spamlog=/tmp/jspwiki.spam.log
# JavaMail configuration
[email protected]@=127.0.0.1
[email protected]@=25
[email protected]@=JSPWiki <jspw...@localhost>
[email protected]@=foo
[email protected]@=foopassword
+mail.smtp.host=127.0.0.1
+mail.smtp.port=25
+mail.from=JSPWiki <jspw...@localhost>
+#mail.smtp.account=foo
+#mail.smtp.password=foopassword
# Set this property to 'true' if you want to build WARs
# that contain pre-compiled JSPs (which load faster).
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=829617&r1=829616&r2=829617&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Oct 25 16:45:15 2009
@@ -185,24 +185,14 @@
<!-- Initialising, cleaning, etc. -->
<target name="init"
- description="Initializes everything, creates directories, etc."
- depends="mkpropertyfile">
- <mkdir dir="${code.build}" />
- </target>
-
- <target name="mkpropertyfile"
- description="Builds the correct propertyfile from the
build.properties">
- <copy file="etc/jspwiki.properties.tmpl"
tofile="${code.web}/WEB-INF/jspwiki.properties" />
- <replace file="${code.web}/WEB-INF/jspwiki.properties"
- replacefilterfile="${build.properties}" />
+ description="Initializes everything, creates directories, etc.">
+ <mkdir dir="${code.build}" />
</target>
<!-- Removes the build directory and the tests build directory -->
<target name="clean"
description="Cleans away all generated files.">
<delete dir="${build}" />
- <delete dir="${tests.build}" />
- <delete file="${code.web}/WEB-INF/jspwiki.properties" />
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
<fileset dir="." includes="**/#*#" defaultexcludes="no"/>
@@ -378,6 +368,18 @@
<delete quiet="true">
<fileset dir="${war.build}"
includes="JSPWiki-jsp.jar,jasper-runtime-*.jar,commons-el-*.jar,web-fragment.xmlf,web.xml"/>
</delete>
+
+ <!-- Build war.xml and the classes/properties files -->
+ <copy toDir="${war.build}" overwrite="true">
+ <fileset dir="etc">
+ <include name="jspwiki.properties" />
+ <include name="log4j.properties" />
+ <include name="priha.properties" />
+ </fileset>
+ <filterset>
+ <filtersfile file="${build.properties}" />
+ </filterset>
+ </copy>
<copy file="${code.web}/WEB-INF/web.xml" toFile="${war.build}/web.xml"
overwrite="false" />
</target>
@@ -390,9 +392,14 @@
<lib file="${war.build}/JSPWiki-jsp.jar" />
<lib file="${war.build}/jasper-runtime-*.jar" />
<lib file="${war.build}/commons-el-*.jar" />
+ <classes dir="${war.build}">
+ <include name="log4j.properties" />
+ <include name="priha.properties" />
+ </classes>
<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
<fileset dir="${code.web}" includes="**" excludes="**/servlet-api.jar
**/jsp-api.jar WEB-INF/web.xml WEB-INF/jspwiki.tld" />
+ <webinf dir="${war.build}" includes="jspwiki.properties" />
</war>
<copy file="${warfile}" toDir="${install.fulldir}" />
</target>
@@ -671,7 +678,7 @@
<!-- Running tests -->
- <target name="tests-init" depends="mkpropertyfile">
+ <target name="tests-init">
<!-- Create test files for classpath -->
<copy toDir="${tests.classpath}" overwrite="true">
Added: incubator/jspwiki/trunk/etc/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/log4j.properties?rev=829617&view=auto
==============================================================================
--- incubator/jspwiki/trunk/etc/log4j.properties (added)
+++ incubator/jspwiki/trunk/etc/log4j.properties Sun Oct 25 16:45:15 2009
@@ -0,0 +1,105 @@
+#
+# JSPWiki - a JSP-based WikiWiki clone.
+#
+# 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.
+#
+############################################################################
+#
+# Configure logs. See log4j documentation for more information
+# on how you can configure the logs.
+#
+# Log4j is available at http://jakarta.apache.org/log4j
+#
+# WARNING WARNING WILL ROBINSON: If you turn on DEBUG logging, be aware
+# that some security-sensitive information will be logged (such as session
IDs).
+# Please be careful.
+#
+# Send mail to root on all problems containing warnings.
+#
+#log4j.appender.mail = org.apache.log4j.net.SMTPAppender
+#log4j.appender.mail.Threshold = WARN
+#log4j.appender.mail.To = r...@localhost
+#log4j.appender.mail.From = jspw...@localhost
+#log4j.appender.mail.Subject = Problem with JSPWiki!
+#log4j.appender.mail.SMTPHost = mail
+
+#log4j.appender.mail.layout = org.apache.log4j.PatternLayout
+#log4j.appender.mail.layout.ConversionPattern =%d [%t] %p %c %x - %m%n
+
+#
+# Log everything into a file, roll it over every 10 MB, keep
+# only 14 latest ones.
+#
+log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
+log4j.appender.FileLog.MaxFileSize = 10MB
+log4j.appender.FileLog.MaxBackupIndex = 14
+log4j.appender.FileLog.File = @logfile@
+log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
+log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
+
+#
+# If you want to use some other logging system (such as JBoss, which uses
+# log4j already, comment this line out. If you just don't want any logs
+# at all, you can set it to be empty. However, I suggest that you do
+# at least to a level of WARN.
+#
+log4j.rootCategory=INFO,FileLog
+#
+# If you want to override one specific package (or just one class), do this as
follows:
+#
+#log4j.logger.org.apache.wiki.plugin=debug, FileLog
+#log4j.additivity.org.apache.wiki.plugin=false
+
+# Enable if you're using mailing, above.
+#log4j.rootCategory=INFO,FileLog,mail
+
+#
+# Uncomment these lines if you want to see detailed security event logging.
+# The logging levels are as follows:
+# ERROR: login errors (other than failed/expired logins)
+# WARN: access denied, failed login (account expired, password/credential
expired)
+# INFO: login, logout
+# DEBUG: add/remove group, add/remove group member, clear groups/group
members, access allowed
+#
+#log4j.logger.SecurityLog=INFO, SecurityAppender
+#log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
+#log4j.appender.SecurityAppender.MaxFileSize = 10MB
+#log4j.appender.SecurityAppender.MaxBackupIndex = 14
+#log4j.appender.SecurityAppender.File = @securitylog@
+#log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
+#log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
+
+#
+# Uncomment these lines if you wish to receive detailed spam
+# filter logging.
+#
+#log4j.logger.SpamLog=INFO,SpamAppender
+#log4j.appender.SpamAppender = org.apache.log4j.RollingFileAppender
+#log4j.appender.SpamAppender.MaxFileSize = 10MB
+#log4j.appender.SpamAppender.MaxBackupIndex = 14
+#log4j.appender.SpamAppender.File = @spamlog@
+#log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
+#log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
+
+# Enable this if you want to debug the Stripes framework
+#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.Target=System.out
+#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L -
%m%n
+#log4j.rootLogger=INFO, stdout
+#log4j.logger.net.sourceforge.stripes=DEBUG
Added: incubator/jspwiki/trunk/etc/priha.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/priha.properties?rev=829617&view=auto
==============================================================================
--- incubator/jspwiki/trunk/etc/priha.properties (added)
+++ incubator/jspwiki/trunk/etc/priha.properties Sun Oct 25 16:45:15 2009
@@ -0,0 +1,38 @@
+#
+# JSPWiki - a JSP-based WikiWiki clone.
+#
+# 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.
+#
+############################################################################
+#
+# File to give a test configuration for Priha.
+#
+
+# Set up an EhCache instance which uses the defaultProvider as the underlying
+# storage.
+priha.provider.ehcache.class = org.priha.providers.EhCachingProvider
+priha.provider.ehcache.realProvider = defaultProvider
+priha.provider.ehcache.size = 1000
+
+# Define workspaces
+priha.provider.ehcache.workspaces = default jspwiki
+priha.provider.defaultProvider.directory = @pagedir@
+
+# Finally, tell Priha which providers shall we use. We only need to mention
+# the EhCache provider, since that already includes the defaultProvider.
+priha.providers = ehcache
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=829617&r1=829616&r2=829617&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Oct 25
16:45:15 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "170";
+ public static final String BUILD = "171";
/**
* This is the generic version string you should use
