Index: jspwiki-portable/src/overlay/launchers/tomcat/woas.sh
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-portable/src/overlay/launchers/tomcat/woas.sh	(revision b8c9edd)
+++ jspwiki-portable/src/overlay/launchers/tomcat/woas.sh	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -4,6 +4,10 @@
 # Helper script to run JSPWiki
 #############################################################################
 
+# uncomment for remote debugging
+
+# export JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
+
 # get the directory where the script is located
 
 export JSPWIKI_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
\ No newline at end of file
Index: jspwiki-portable/src/overlay/woas/webapps/private/WEB-INF/classes/jspwiki-custom.properties
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-portable/src/overlay/woas/webapps/private/WEB-INF/classes/jspwiki-custom.properties	(revision b8c9edd)
+++ jspwiki-portable/src/overlay/woas/webapps/private/WEB-INF/classes/jspwiki-custom.properties	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -30,5 +30,5 @@
 jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
 jspwiki.breakTitleWithSpaces=true
 jspwiki.searchProvider=BasicSearchProvider
-jspwiki.usePageCache=false
+jspwiki.usePageCache=true
 log4j.appender.FileLog.File=./logs/jspwiki.log
Index: jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/classes/jspwiki-custom.properties
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/classes/jspwiki-custom.properties	(revision b8c9edd)
+++ jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/classes/jspwiki-custom.properties	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -30,5 +30,5 @@
 jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
 jspwiki.breakTitleWithSpaces=true
 jspwiki.searchProvider=BasicSearchProvider
-jspwiki.usePageCache=false
+jspwiki.usePageCache=true
 log4j.appender.FileLog.File=./logs/jspwiki.log
\ No newline at end of file
Index: jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java	(revision b8c9edd)
+++ jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -137,12 +137,13 @@
         //
         //  Create and initialize the provider.
         //
+        String cacheName = engine.getApplicationName() + "." + CACHE_NAME;
         try {
-            if (m_cacheManager.cacheExists(CACHE_NAME)) {
-                m_dynamicAttachments = m_cacheManager.getCache(CACHE_NAME);
+            if (m_cacheManager.cacheExists(cacheName)) {
+                m_dynamicAttachments = m_cacheManager.getCache(cacheName);
             } else {
-                log.info("cache with name " + CACHE_NAME + " not found in ehcache.xml, creating it with defaults.");
-                m_dynamicAttachments = new Cache(CACHE_NAME, DEFAULT_CACHECAPACITY, false, false, 0, 0);
+                log.info("cache with name " + cacheName + " not found in ehcache.xml, creating it with defaults.");
+                m_dynamicAttachments = new Cache(cacheName, DEFAULT_CACHECAPACITY, false, false, 0, 0);
                 m_cacheManager.addCache(m_dynamicAttachments);
             }
 
Index: jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java	(revision b8c9edd)
+++ jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -94,20 +94,22 @@
     {
         log.info("Initing CachingAttachmentProvider");
 
-        if (m_cacheManager.cacheExists(ATTCOLLCACHE_NAME)) {
-            m_cache = m_cacheManager.getCache(ATTCOLLCACHE_NAME);
+        String attCollCacheName = engine.getApplicationName() + "." + ATTCOLLCACHE_NAME;
+        if (m_cacheManager.cacheExists(attCollCacheName)) {
+            m_cache = m_cacheManager.getCache(attCollCacheName);
         } else {
-            m_cache = new Cache(ATTCOLLCACHE_NAME, m_capacity, false, false, 0, 0);
+            m_cache = new Cache(attCollCacheName, m_capacity, false, false, 0, 0);
             m_cacheManager.addCache(m_cache);
         }
 
         //
         // cache for the individual Attachment objects, attachment name is key, the Attachment object is the cached object
         //
-        if (m_cacheManager.cacheExists(ATTCACHE_NAME)) {
-            m_attCache = m_cacheManager.getCache(ATTCACHE_NAME);
+        String attCacheName = engine.getApplicationName() + "." + ATTCACHE_NAME;
+        if (m_cacheManager.cacheExists(attCacheName)) {
+            m_attCache = m_cacheManager.getCache(attCacheName);
         } else {
-            m_attCache = new Cache(ATTCACHE_NAME, m_capacity, false, false, 0, 0);
+            m_attCache = new Cache(attCacheName, m_capacity, false, false, 0, 0);
             m_cacheManager.addCache(m_attCache);
         }
 
\ No newline at end of file
Index: jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java	(revision b8c9edd)
+++ jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -100,27 +100,30 @@
         // engine is used for getting the search engine
         m_engine = engine;
 
-        if (m_cacheManager.cacheExists(CACHE_NAME)) {
-            m_cache = m_cacheManager.getCache(CACHE_NAME);
+        String cacheName = engine.getApplicationName() + "." + CACHE_NAME;
+        if (m_cacheManager.cacheExists(cacheName)) {
+            m_cache = m_cacheManager.getCache(cacheName);
         } else {
-            log.info("cache with name " + CACHE_NAME +  " not found in ehcache.xml, creating it with defaults.");
-            m_cache = new Cache(CACHE_NAME, DEFAULT_CACHECAPACITY, false, false, 0, 0);
+            log.info("cache with name " + cacheName +  " not found in ehcache.xml, creating it with defaults.");
+            m_cache = new Cache(cacheName, DEFAULT_CACHECAPACITY, false, false, 0, 0);
             m_cacheManager.addCache(m_cache);
         }
 
-        if (m_cacheManager.cacheExists(TEXTCACHE_NAME)) {
-            m_textCache= m_cacheManager.getCache(TEXTCACHE_NAME);
+        String textCacheName = engine.getApplicationName() + "." + TEXTCACHE_NAME;
+        if (m_cacheManager.cacheExists(textCacheName)) {
+            m_textCache= m_cacheManager.getCache(textCacheName);
         } else {
-            log.info("cache with name " + TEXTCACHE_NAME +  " not found in ehcache.xml, creating it with defaults.");
-            m_textCache = new Cache(TEXTCACHE_NAME, DEFAULT_CACHECAPACITY, false, false, 0, 0);
+            log.info("cache with name " + textCacheName +  " not found in ehcache.xml, creating it with defaults.");
+            m_textCache = new Cache(textCacheName, DEFAULT_CACHECAPACITY, false, false, 0, 0);
             m_cacheManager.addCache(m_textCache);
         }
 
-        if (m_cacheManager.cacheExists(HISTORYCACHE_NAME)) {
-            m_historyCache= m_cacheManager.getCache(HISTORYCACHE_NAME);
+        String historyCacheName = engine.getApplicationName() + "." + HISTORYCACHE_NAME;
+        if (m_cacheManager.cacheExists(historyCacheName)) {
+            m_historyCache= m_cacheManager.getCache(historyCacheName);
         } else {
-            log.info("cache with name " + HISTORYCACHE_NAME +  " not found in ehcache.xml, creating it with defaults.");
-            m_historyCache = new Cache(HISTORYCACHE_NAME, DEFAULT_CACHECAPACITY, false, false, 0, 0);
+            log.info("cache with name " + historyCacheName +  " not found in ehcache.xml, creating it with defaults.");
+            m_historyCache = new Cache(historyCacheName, DEFAULT_CACHECAPACITY, false, false, 0, 0);
             m_cacheManager.addCache(m_historyCache);
         }
 
Index: jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java	(revision b8c9edd)
+++ jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -107,11 +107,13 @@
     {
         m_engine = engine;
 
-        if (m_cacheManager.cacheExists(DOCUMENTCACHE_NAME)) {
-            m_documentCache = m_cacheManager.getCache(DOCUMENTCACHE_NAME);
+        String documentCacheName = engine.getApplicationName() + "." + DOCUMENTCACHE_NAME;
+
+        if (m_cacheManager.cacheExists(documentCacheName)) {
+            m_documentCache = m_cacheManager.getCache(documentCacheName);
         } else {
-            log.info("cache with name " + DOCUMENTCACHE_NAME +  " not found in ehcache.xml, creating it with defaults.");
-            m_documentCache = new Cache(DOCUMENTCACHE_NAME, DEFAULT_CACHESIZE, false, false, m_cacheExpiryPeriod, m_cacheExpiryPeriod);
+            log.info("cache with name " + documentCacheName +  " not found in ehcache.xml, creating it with defaults.");
+            m_documentCache = new Cache(documentCacheName, DEFAULT_CACHESIZE, false, false, m_cacheExpiryPeriod, m_cacheExpiryPeriod);
             m_cacheManager.addCache(m_documentCache);
         }
 
Index: jspwiki-war/src/main/resources/ehcache.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- jspwiki-war/src/main/resources/ehcache.xml	(revision b8c9edd)
+++ jspwiki-war/src/main/resources/ehcache.xml	(revision bd6b4a9e8db1a613eda8e16d35d9501c519f5b84)
@@ -59,19 +59,19 @@
                                      (specified as LFU)
     -->
     <!-- the default JSPWiki caches -->
-    <cache name="jspwiki.renderingCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.renderingCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.pageCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.pageCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.pageTextCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.pageTextCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.pageHistoryCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.pageHistoryCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.attachmentsCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.attachmentsCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.attachmentCollectionsCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.attachmentCollectionsCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.dynamicAttachmentCache" maxElementsInMemory="1000" />
+    <cache name="JSPWiki.jspwiki.dynamicAttachmentCache" maxElementsInMemory="1000" />
 
-    <cache name="jspwiki.rssCache" maxElementsInMemory="250" />
+    <cache name="JSPWiki.jspwiki.rssCache" maxElementsInMemory="250" />
 </ehcache>