Author: jalkanen
Date: Sun Jul 26 09:42:34 2009
New Revision: 797887
URL: http://svn.apache.org/viewvc?rev=797887&view=rev
Log:
Oops, fixed priha ehcache config and AttachmentManager cache config...
Accidental miscommit :)
Modified:
incubator/jspwiki/trunk/doc/README - Caches.txt
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/priha.properties
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
Modified: incubator/jspwiki/trunk/doc/README - Caches.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/README%20-%20Caches.txt?rev=797887&r1=797886&r2=797887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/README - Caches.txt (original)
+++ incubator/jspwiki/trunk/doc/README - Caches.txt Sun Jul 26 09:42:34 2009
@@ -49,7 +49,7 @@
-------------------------------------------------------------------------------
Name: jspwiki.dynamicAttachmentCache
-Default configuration: No maximum size
+Default configuration: 256 entries
memory only caching;
No expiry time.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/priha.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/priha.properties?rev=797887&r1=797886&r2=797887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/priha.properties
(original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/priha.properties Sun
Jul 26 09:42:34 2009
@@ -30,7 +30,7 @@
priha.provider.ehcache.size = 1000
# Define workspaces
-priha.provider.defaultProvider.workspaces = default jspwiki
+priha.provider.ehcache.workspaces = default jspwiki
# Finally, tell Priha which providers shall we use. We only need to mention
# the EhCache provider, since that already includes the defaultProvider.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java?rev=797887&r1=797886&r2=797887&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
Sun Jul 26 09:42:34 2009
@@ -112,7 +112,7 @@
m_dynamicAttachments = m_cachingManager.getCache( CACHE_NAME );
if( m_dynamicAttachments == null )
{
- m_dynamicAttachments = new Cache( CACHE_NAME, Integer.MAX_VALUE,
false, true, 3600, 3600 );
+ m_dynamicAttachments = new Cache( CACHE_NAME, 256, false, true,
3600, 3600 );
m_cachingManager.addCache( m_dynamicAttachments );
}
