Author: metskem
Date: Tue Dec 15 19:15:41 2009
New Revision: 890948
URL: http://svn.apache.org/viewvc?rev=890948&view=rev
Log:
2.8.4-svn-5
* JSPWIKI-619: Include geronimo-web.xml in JSPWiki.war (reported by
Jurgen Weber)
* JSPWIKI-618: Allow Administrators to override attachment.maxsize
(reported by Jurgen Weber)
Added:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/geronimo-web.xml
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=890948&r1=890947&r2=890948&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Tue Dec 15 19:15:41
2009
@@ -1,3 +1,10 @@
+2009-12-15 Harry Metske <[email protected]>
+
+ * 2.8.4-svn-5
+
+ * JSPWIKI-619: Include geronimo-web.xml in JSPWiki.war (reported by
Jurgen Weber)
+ * JSPWIKI-618: Allow Administrators to override attachment.maxsize
(reported by Jurgen Weber)
+
2009-12-06 Harry Metske <[email protected]>
* 2.8.4-svn-4
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml?rev=890948&r1=890947&r2=890948&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/build.xml Tue Dec 15 19:15:41
2009
@@ -402,7 +402,8 @@
<include name="jspwiki.properties" />
<include name="*.tld" />
<include name="userdatabase.xml" />
- <include name="groupdatabase.xml" />
+ <include name="groupdatabase.xml" />
+ <include name="geronimo-web.xml" />
</webinf>
<classes dir="etc" includes="oscache.properties" />
</war>
Added: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/geronimo-web.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/geronimo-web.xml?rev=890948&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/geronimo-web.xml (added)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/geronimo-web.xml Tue Dec
15 19:15:41 2009
@@ -0,0 +1,35 @@
+
+<!--
+ 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.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2";>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>default</sys:groupId>
+ <sys:artifactId>JSPWiki</sys:artifactId>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ <sys:hidden-classes>
+ <sys:filter>org.jaxen</sys:filter>
+ <sys:filter>org.jdom</sys:filter>
+ </sys:hidden-classes>
+ </sys:environment>
+</web-app>
\ No newline at end of file
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl?rev=890948&r1=890947&r2=890948&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
Tue Dec 15 19:15:41 2009
@@ -142,6 +142,7 @@
# You can limit the maximum size of an attachment by setting this
# value. The value is in bytes, and by default all attachments
# are accepted.
+# This limit is not enforced for users with AdminPermissions.
#
# The following line would limit the attachment size to 100,000 bytes
#jspwiki.attachment.maxsize=100000
@@ -151,6 +152,7 @@
# can allow some types only, or forbid some other types. By default,
# all file types are allowed (if you do not specify the "allow" list
# at all or it is empty).
+# These allow/forbid statements are not enforced for users with
AdminPermissions.
#
# These both are space-separated lists of file suffixes
#
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=890948&r1=890947&r2=890948&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Tue Dec 15 19:15:41 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "4";
+ public static final String BUILD = "5";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=890948&r1=890947&r2=890948&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
Tue Dec 15 19:15:41 2009
@@ -594,7 +594,10 @@
ServletFileUpload upload = new ServletFileUpload(factory);
upload.setHeaderEncoding("UTF-8");
- upload.setFileSizeMax( m_maxSize );
+ if( !context.hasAdminPermissions() )
+ {
+ upload.setFileSizeMax( m_maxSize );
+ }
upload.setProgressListener( pl );
List<FileItem> items = upload.parseRequest( req );
