Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java Wed Mar 3 19:34:46 2010 @@ -35,6 +35,7 @@ import org.apache.jetspeed.cache.impl.EhCacheConfigResource; import org.apache.jetspeed.om.page.FragmentProperty; +import org.apache.jetspeed.page.PageManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,6 +50,11 @@ { protected static Logger log = LoggerFactory.getLogger(TestDatabasePageManagerCache.class); + private static final long CACHE_NOTIFICATION_STARTUP_WAIT = 10000; + private static final long CACHE_NOTIFICATION_WAIT = 2000; + private static final long CACHE_NOTIFICATION_POLL = 250; + private static final long CACHE_LOGGING_PUMP_WAIT = 50; + // Members private String osExecutableExtension; @@ -113,10 +119,10 @@ // wait if servers not distributed if (!server0Distributed || !server1Distributed) { - Thread.sleep(250); + sleep(server0, server1, CACHE_NOTIFICATION_POLL); } } - while ((!server0Distributed || !server1Distributed) && (System.currentTimeMillis()-distributedCheckStarted < 5000)); + while ((!server0Distributed || !server1Distributed) && (System.currentTimeMillis()-distributedCheckStarted < CACHE_NOTIFICATION_STARTUP_WAIT)); if (!server0Distributed && !server1Distributed) { System.out.println("Server page managers not distributed: possible system limitation... test skipped"); @@ -141,15 +147,15 @@ // login servers setting test user, group, and role principal names result = server0.execute("pageManagerServer.setUser(\"user\");"); assertTrue(!result.contains("Exception")); - result = server0.execute("pageManagerServer.setGroup(\"group\");"); + result = server0.execute("pageManagerServer.setGroups(\"group\");"); assertTrue(!result.contains("Exception")); - result = server0.execute("pageManagerServer.setRole(\"role\");"); + result = server0.execute("pageManagerServer.setRoles(\"role\");"); assertTrue(!result.contains("Exception")); result = server1.execute("pageManagerServer.setUser(\"user\");"); assertTrue(!result.contains("Exception")); - result = server1.execute("pageManagerServer.setGroup(\"group\");"); + result = server1.execute("pageManagerServer.setGroups(\"group\");"); assertTrue(!result.contains("Exception")); - result = server1.execute("pageManagerServer.setRole(\"role\");"); + result = server1.execute("pageManagerServer.setRoles(\"role\");"); assertTrue(!result.contains("Exception")); // reset request cache @@ -175,11 +181,15 @@ assertTrue(!result.contains("Exception")); result = server0.execute("fragment.setState(\"DEFAULT\");"); assertTrue(!result.contains("Exception")); + result = server0.execute("fragment.setProperty(\"CUSTOM\", null, null, \"CUSTOM\");"); + assertTrue(!result.contains("Exception")); result = server0.execute("pageManager.updatePage(page);"); assertTrue(!result.contains("Exception")); result = server0.execute("fragment.setState(\""+FragmentProperty.USER_PROPERTY_SCOPE+"\", null, \"USER\");"); assertTrue(!result.contains("Exception")); - result = server0.execute("pageManager.updateFragmentProperties(fragment, \""+FragmentProperty.USER_PROPERTY_SCOPE+"\");"); + result = server0.execute("fragment.setProperty(\"CUSTOM\", null, null, \"CUSTOM2\");"); + assertTrue(!result.contains("Exception")); + result = server0.execute("pageManager.updateFragmentProperties(fragment, \""+PageManager.ALL_PROPERTY_SCOPE+"\");"); assertTrue(!result.contains("Exception")); result = server0.execute("page = pageManager.newPage(\"/another-page.psml\");"); assertTrue(!result.contains("Exception")); @@ -191,12 +201,18 @@ assertTrue(!result.contains("Exception")); result = server0.execute("fragment.setState(\"DEFAULT\");"); assertTrue(!result.contains("Exception")); + result = server0.execute("fragment.setProperty(\"CUSTOM\", null, null, \"CUSTOM\");"); + assertTrue(!result.contains("Exception")); result = server0.execute("pageManager.updatePage(page);"); assertTrue(!result.contains("Exception")); result = server0.execute("page = pageManager.newPage(\"/some-other-page.psml\");"); assertTrue(!result.contains("Exception")); result = server0.execute("page.setTitle(\"Some Other Page\");"); assertTrue(!result.contains("Exception")); + result = server0.execute("fragment = page.getRootFragment();"); + assertTrue(!result.contains("Exception")); + result = server0.execute("fragment.setProperty(\"CUSTOM\", null, null, \"SOME-OTHER-CUSTOM\");"); + assertTrue(!result.contains("Exception")); result = server0.execute("pageManager.updatePage(page);"); assertTrue(!result.contains("Exception")); result = server0.execute("link = pageManager.newLink(\"/default.link\");"); @@ -237,7 +253,7 @@ assertTrue(!result.contains("Exception")); // wait for cache notifications to propagate between servers - Thread.sleep(500); + sleep(server0, server1, CACHE_NOTIFICATION_WAIT); // populate folders, documents, and properties in second page manager result = server1.execute("pageManager.getFolder(\"/\").getTitle();"); @@ -248,14 +264,20 @@ assertTrue(result.endsWith("Default Page Root Fragment")); result = server1.execute("pageManager.getPage(\"/default-page.psml\").getRootFragment().getState();"); assertTrue(result.endsWith("USER")); + result = server1.execute("pageManager.getPage(\"/default-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + assertTrue(result.endsWith("CUSTOM2")); result = server1.execute("pageManager.getPage(\"/another-page.psml\").getTitle();"); assertTrue(result.endsWith("Another Page")); result = server1.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getTitle();"); assertTrue(result.endsWith("Another Page Root Fragment")); result = server1.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getState();"); assertTrue(result.endsWith("DEFAULT")); + result = server1.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + assertTrue(result.endsWith("CUSTOM")); result = server1.execute("pageManager.getPage(\"/some-other-page.psml\").getTitle();"); assertTrue(result.endsWith("Some Other Page")); + result = server1.execute("pageManager.getPage(\"/some-other-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + assertTrue(result.endsWith("SOME-OTHER-CUSTOM")); result = server1.execute("pageManager.getLink(\"/default.link\").getTitle();"); assertTrue(result.endsWith("Default Link")); result = server1.execute("pageManager.getFolder(\"/deep-0\").getTitle();"); @@ -268,6 +290,9 @@ assertTrue(result.endsWith("Deep Page 1")); result = server1.execute("pageManager.getPageSecurity().getPath();"); assertTrue(result.endsWith("/page.security")); + + // wait for cache notifications to propagate between servers + sleep(server0, server1, CACHE_NOTIFICATION_WAIT); // update/remove objects and properties in second page manager result = server1.execute("page = pageManager.getPage(\"/default-page.psml\");"); @@ -282,6 +307,8 @@ assertTrue(!result.contains("Exception")); result = server1.execute("fragment.setState(\"DEFAULT2\");"); assertTrue(!result.contains("Exception")); + result = server1.execute("fragment.setProperty(\"CUSTOM\", null, null, \"CUSTOM2\");"); + assertTrue(!result.contains("Exception")); result = server1.execute("pageManager.updatePage(page);"); assertTrue(!result.contains("Exception")); result = server1.execute("page = pageManager.getPage(\"/some-other-page.psml\");"); @@ -308,12 +335,17 @@ // reset request cache result = server1.execute("pageManager.cleanupRequestCache();"); assertTrue(!result.contains("Exception")); + + // wait for cache notifications to propagate between servers + sleep(server0, server1, CACHE_NOTIFICATION_WAIT); // test objects and properties in both page managers for cache coherence result = server1.execute("pageManager.getPage(\"/default-page.psml\").getTitle();"); assertTrue(result.endsWith("Edited Default Page")); result = server1.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getState();"); assertTrue(result.endsWith("DEFAULT2")); + result = server1.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + assertTrue(result.endsWith("CUSTOM2")); result = server1.execute("pageManager.getPage(\"/some-other-page.psml\");"); assertTrue(result.contains("PageNotFoundException")); result = server1.execute("pageManager.getFolder(\"/\").getPages().size();"); @@ -330,6 +362,7 @@ assertTrue(result.endsWith("1")); boolean defaultPageUpdated = false; boolean anotherPageStateUpdated = false; + boolean anotherPagePropertyUpdated = false; boolean someOtherPageRemoved = false; boolean rootFolderPagesCountTwo = false; boolean defaultLinkUpdated = false; @@ -355,6 +388,11 @@ result = server0.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getState();"); anotherPageStateUpdated = result.endsWith("DEFAULT2"); } + if (!anotherPagePropertyUpdated) + { + result = server0.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + anotherPagePropertyUpdated = result.endsWith("CUSTOM2"); + } if (!someOtherPageRemoved) { result = server0.execute("pageManager.getPage(\"/some-other-page.psml\");"); @@ -392,14 +430,15 @@ } // wait for cache coherence - if (!defaultPageUpdated || !anotherPageStateUpdated || !someOtherPageRemoved || !rootFolderPagesCountTwo || !defaultLinkUpdated || !deep0FolderUpdated || !deepPage1Removed || !deep1FolderRemoved || !rootFolderFoldersCountOne) + if (!defaultPageUpdated || !anotherPageStateUpdated || !anotherPagePropertyUpdated || !someOtherPageRemoved || !rootFolderPagesCountTwo || !defaultLinkUpdated || !deep0FolderUpdated || !deepPage1Removed || !deep1FolderRemoved || !rootFolderFoldersCountOne) { - Thread.sleep(250); + sleep(server0, server1, CACHE_NOTIFICATION_POLL); } } - while ((!defaultPageUpdated || !anotherPageStateUpdated || !someOtherPageRemoved || !rootFolderPagesCountTwo || !defaultLinkUpdated || !deep0FolderUpdated || !deepPage1Removed || !deep1FolderRemoved || !rootFolderFoldersCountOne) && (System.currentTimeMillis()-coherencyCheckStarted < 5000)); + while ((!defaultPageUpdated || !anotherPageStateUpdated || !anotherPagePropertyUpdated || !someOtherPageRemoved || !rootFolderPagesCountTwo || !defaultLinkUpdated || !deep0FolderUpdated || !deepPage1Removed || !deep1FolderRemoved || !rootFolderFoldersCountOne) && (System.currentTimeMillis()-coherencyCheckStarted < CACHE_NOTIFICATION_WAIT)); assertTrue(defaultPageUpdated); assertTrue(anotherPageStateUpdated); + assertTrue(anotherPagePropertyUpdated); assertTrue(someOtherPageRemoved); assertTrue(rootFolderPagesCountTwo); assertTrue(defaultLinkUpdated); @@ -421,7 +460,7 @@ assertTrue(!result.contains("Exception")); result = server0.execute("fragment.setState(\""+FragmentProperty.USER_PROPERTY_SCOPE+"\", null, \"USER2\");"); assertTrue(!result.contains("Exception")); - result = server0.execute("pageManager.updateFragmentProperties(fragment, \""+FragmentProperty.USER_PROPERTY_SCOPE+"\");"); + result = server0.execute("pageManager.updateFragmentProperties(fragment, \""+PageManager.USER_PROPERTY_SCOPE+"\");"); assertTrue(!result.contains("Exception")); result = server0.execute("page = pageManager.newPage(\"/new-page.psml\");"); assertTrue(!result.contains("Exception")); @@ -435,10 +474,13 @@ assertTrue(!result.contains("Exception")); result = server0.execute("pageManager.updateFolder(folder);"); assertTrue(!result.contains("Exception")); - + // reset request cache result = server0.execute("pageManager.cleanupRequestCache();"); assertTrue(!result.contains("Exception")); + + // wait for cache notifications to propagate between servers + sleep(server0, server1, CACHE_NOTIFICATION_WAIT); // test objects in both page managers for cache coherence result = server0.execute("pageManager.getPage(\"/default-page.psml\").getRootFragment().getState();"); @@ -493,15 +535,108 @@ // wait for cache coherence if (!defaultPageUserStateUpdated || !rootFolderPagesCountThree || !rootFolderFoldersCountTwo || !newPageCreated || !deep2FolderCreated) { - Thread.sleep(250); + sleep(server0, server1, CACHE_NOTIFICATION_POLL); } } - while ((!defaultPageUserStateUpdated || !rootFolderPagesCountThree || !rootFolderFoldersCountTwo || !newPageCreated || !deep2FolderCreated) && (System.currentTimeMillis()-coherencyCheckStarted < 5000)); + while ((!defaultPageUserStateUpdated || !rootFolderPagesCountThree || !rootFolderFoldersCountTwo || !newPageCreated || !deep2FolderCreated) && (System.currentTimeMillis()-coherencyCheckStarted < CACHE_NOTIFICATION_WAIT)); assertTrue(defaultPageUserStateUpdated); assertTrue(rootFolderPagesCountThree); assertTrue(rootFolderFoldersCountTwo); assertTrue(newPageCreated); assertTrue(deep2FolderCreated); + + // reset request cache + result = server0.execute("pageManager.cleanupRequestCache();"); + assertTrue(!result.contains("Exception")); + result = server1.execute("pageManager.cleanupRequestCache();"); + assertTrue(!result.contains("Exception")); + + // update only properties in second page manager + result = server1.execute("page = pageManager.getPage(\"/default-page.psml\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("fragment = page.getRootFragment();"); + assertTrue(!result.contains("Exception")); + result = server1.execute("fragment.setState(\""+FragmentProperty.USER_PROPERTY_SCOPE+"\", null, \"USER3\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("pageManager.updateFragmentProperties(fragment, \""+PageManager.USER_PROPERTY_SCOPE+"\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("page = pageManager.getPage(\"/another-page.psml\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("fragment = page.getRootFragment();"); + assertTrue(!result.contains("Exception")); + result = server1.execute("fragment.setProperty(\"CUSTOM\", null, null, \"CUSTOM3\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("pageManager.updateFragmentProperties(fragment, null);"); + assertTrue(!result.contains("Exception")); + if (FragmentProperty.GROUP_AND_ROLE_PROPERTY_SCOPES_ENABLED) + { + result = server1.execute("page = pageManager.getPage(\"/new-page.psml\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("fragment = page.getRootFragment();"); + assertTrue(!result.contains("Exception")); + result = server1.execute("fragment.setProperty(\"GROUP-CUSTOM\", \""+FragmentProperty.GROUP_PROPERTY_SCOPE+"\", \"group\", \"GROUP-CUSTOM\");"); + assertTrue(!result.contains("Exception")); + result = server1.execute("pageManager.updateFragmentProperties(fragment, \""+PageManager.GROUP_PROPERTY_SCOPE+"\");"); + assertTrue(!result.contains("Exception")); + } + + // reset request cache + result = server1.execute("pageManager.cleanupRequestCache();"); + assertTrue(!result.contains("Exception")); + + // wait for cache notifications to propagate between servers + sleep(server0, server1, CACHE_NOTIFICATION_WAIT); + + // test objects in both page managers for cache coherence + result = server1.execute("pageManager.getPage(\"/default-page.psml\").getRootFragment().getState();"); + assertTrue(result.endsWith("USER3")); + result = server1.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + assertTrue(result.endsWith("CUSTOM3")); + if (FragmentProperty.GROUP_AND_ROLE_PROPERTY_SCOPES_ENABLED) + { + result = server1.execute("pageManager.getPage(\"/new-page.psml\").getRootFragment().getProperty(\"GROUP-CUSTOM\");"); + assertTrue(result.endsWith("GROUP-CUSTOM")); + } + defaultPageUserStateUpdated = false; + anotherPagePropertyUpdated = false; + boolean newPagePropertyUpdated = false; + coherencyCheckStarted = System.currentTimeMillis(); + do + { + // reset request cache + result = server0.execute("pageManager.cleanupRequestCache();"); + assertTrue(!result.contains("Exception")); + + // check cache coherence + if (!defaultPageUserStateUpdated) + { + result = server0.execute("pageManager.getPage(\"/default-page.psml\").getRootFragment().getState();"); + defaultPageUserStateUpdated = result.endsWith("USER3"); + } + if (!anotherPagePropertyUpdated) + { + result = server0.execute("pageManager.getPage(\"/another-page.psml\").getRootFragment().getProperty(\"CUSTOM\");"); + anotherPagePropertyUpdated = result.endsWith("CUSTOM3"); + } + if (FragmentProperty.GROUP_AND_ROLE_PROPERTY_SCOPES_ENABLED) + { + if (!newPagePropertyUpdated) + { + result = server0.execute("pageManager.getPage(\"/new-page.psml\").getRootFragment().getProperty(\"GROUP-CUSTOM\");"); + newPagePropertyUpdated = result.endsWith("GROUP-CUSTOM"); + } + } + + // wait for cache coherence + if (!defaultPageUserStateUpdated || !anotherPagePropertyUpdated || (!newPagePropertyUpdated && FragmentProperty.GROUP_AND_ROLE_PROPERTY_SCOPES_ENABLED)) + { + sleep(server0, server1, CACHE_NOTIFICATION_POLL); + } + } + while ((!defaultPageUserStateUpdated || !anotherPagePropertyUpdated || (!newPagePropertyUpdated && FragmentProperty.GROUP_AND_ROLE_PROPERTY_SCOPES_ENABLED)) && (System.currentTimeMillis()-coherencyCheckStarted < CACHE_NOTIFICATION_WAIT)); + assertTrue(defaultPageUserStateUpdated); + assertTrue(anotherPagePropertyUpdated); + assertTrue(newPagePropertyUpdated || !FragmentProperty.GROUP_AND_ROLE_PROPERTY_SCOPES_ENABLED); // reset request cache result = server0.execute("pageManager.cleanupRequestCache();"); @@ -548,6 +683,21 @@ } } + private void sleep(TestProgram server0, TestProgram server1, long millis) throws IOException, InterruptedException + { + long slept = 0; + while (slept < millis) + { + // poll servers for logging + server0.poll(); + server1.poll(); + // sleep for interval + long sleep = Math.min(millis-slept, CACHE_LOGGING_PUMP_WAIT); + Thread.sleep(sleep); + slept += sleep; + } + } + // Implementation classes protected class TestProgram @@ -608,7 +758,7 @@ } } - public synchronized String execute(final String scriptLine) throws IOException + public synchronized void poll() throws IOException { assertNotNull(process); @@ -617,6 +767,12 @@ { logProcessLine(line); } + } + + public synchronized String execute(final String scriptLine) throws IOException + { + // poll to read messages from process + poll(); // write script line to process processInput.write(scriptLine); @@ -655,7 +811,7 @@ { try { - Thread.sleep(10000); + Thread.sleep(CACHE_NOTIFICATION_STARTUP_WAIT); if ( process != null) { log.warn( "Forcibly stopping "+name); @@ -689,7 +845,7 @@ private void logProcessLine(final String line) { - if (!line.contains("INFO") && (line.contains("ERROR") || line.contains("Exception") || line.matches("\\s+at\\s.*"))) + if (line.contains("ERROR") || line.contains("Exception") || line.matches("\\s+at\\s.*")) { log.error("{"+name+"} "+line); }
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml Wed Mar 3 19:34:46 2010 @@ -56,6 +56,16 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> </bean> @@ -72,6 +82,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + <!-- Transaction Proxying --> <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor"> <!-- Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager.xml Wed Mar 3 19:34:46 2010 @@ -39,6 +39,10 @@ <constructor-arg index="6"><ref bean="pageManagerPropertiesCache"/></constructor-arg> <!-- fragment properties path cache --> <constructor-arg index="7"><ref bean="pageManagerPropertiesPathCache"/></constructor-arg> + <!-- principal fragment properties cache --> + <constructor-arg index="8"><ref bean="pageManagerPrincipalPropertiesCache"/></constructor-arg> + <!-- principal fragment properties path cache --> + <constructor-arg index="9"><ref bean="pageManagerPrincipalPropertiesPathCache"/></constructor-arg> </bean> </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/distributed-ehcache.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/distributed-ehcache.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/distributed-ehcache.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/distributed-ehcache.xml Wed Mar 3 19:34:46 2010 @@ -89,6 +89,29 @@ replicateRemovals=true"/> </cache> + <cache name="pageManagerPrincipalPropertiesCache" + maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxelements}" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + memoryStoreEvictionPolicy="LFU"/> + + <cache name="pageManagerPrincipalPropertiesPathCache" + maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxelements}" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + memoryStoreEvictionPolicy="LFU"> + <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory" + properties="replicateAsynchronously=true, + replicatePuts=false, + replicateUpdates=false, + replicateUpdatesViaCopy=false, + replicateRemovals=true"/> + </cache> + <cache name="pageFileCache" maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxfiles}" eternal="false" Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/ehcache.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/ehcache.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/ehcache.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/ehcache.xml Wed Mar 3 19:34:46 2010 @@ -64,6 +64,22 @@ timeToLiveSeconds="150" memoryStoreEvictionPolicy="LFU"/> + <cache name="pageManagerPrincipalPropertiesCache" + maxElementsInMemory="128" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="150" + timeToLiveSeconds="150" + memoryStoreEvictionPolicy="LFU"/> + + <cache name="pageManagerPrincipalPropertiesPathCache" + maxElementsInMemory="128" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="150" + timeToLiveSeconds="150" + memoryStoreEvictionPolicy="LFU"/> + <cache name="pageFileCache" maxElementsInMemory="100" eternal="false" Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j-stdout.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j-stdout.properties?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j-stdout.properties (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j-stdout.properties Wed Mar 3 19:34:46 2010 @@ -23,6 +23,9 @@ log4j.rootLogger = ERROR, stdout +#log4j.category.net.sf.ehcache.distribution = DEBUG, stdout +#log4j.additivity.net.sf.ehcache.distribution = false + log4j.category.org.apache.jetspeed = INFO, stdout log4j.additivity.org.apache.jetspeed = false Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j.properties?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j.properties (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j.properties Wed Mar 3 19:34:46 2010 @@ -23,6 +23,9 @@ log4j.rootLogger = ERROR, errorlogging +#log4j.category.net.sf.ehcache.distribution = DEBUG, infologging +#log4j.additivity.net.sf.ehcache.distribution = false + log4j.category.org.apache.jetspeed = INFO, infologging log4j.additivity.org.apache.jetspeed = false Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-database-page-manager.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-database-page-manager.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-database-page-manager.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-database-page-manager.xml Wed Mar 3 19:34:46 2010 @@ -39,6 +39,10 @@ <constructor-arg index="6"><ref bean="pageManagerPropertiesCache"/></constructor-arg> <!-- fragment properties path cache --> <constructor-arg index="7"><ref bean="pageManagerPropertiesPathCache"/></constructor-arg> + <!-- principal fragment properties cache --> + <constructor-arg index="8"><ref bean="pageManagerPrincipalPropertiesCache"/></constructor-arg> + <!-- principal fragment properties path cache --> + <constructor-arg index="9"><ref bean="pageManagerPrincipalPropertiesPathCache"/></constructor-arg> </bean> </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-permissions-database-page-manager.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-permissions-database-page-manager.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-permissions-database-page-manager.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-permissions-database-page-manager.xml Wed Mar 3 19:34:46 2010 @@ -39,6 +39,10 @@ <constructor-arg index="6"><ref bean="pageManagerPropertiesCache"/></constructor-arg> <!-- fragment properties path cache --> <constructor-arg index="7"><ref bean="pageManagerPropertiesPathCache"/></constructor-arg> + <!-- principal fragment properties cache --> + <constructor-arg index="8"><ref bean="pageManagerPrincipalPropertiesCache"/></constructor-arg> + <!-- principal fragment properties path cache --> + <constructor-arg index="9"><ref bean="pageManagerPrincipalPropertiesPathCache"/></constructor-arg> </bean> </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/cache-test.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/cache-test.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/cache-test.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/cache-test.xml Wed Mar 3 19:34:46 2010 @@ -288,6 +288,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -308,4 +320,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/cache-test.xml Wed Mar 3 19:34:46 2010 @@ -288,6 +288,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -308,4 +320,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/cache-test.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/cache-test.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/cache-test.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/test/resources/cache-test.xml Wed Mar 3 19:34:46 2010 @@ -288,6 +288,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -308,4 +320,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/cache-test.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/cache-test.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/cache-test.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/resources/cache-test.xml Wed Mar 3 19:34:46 2010 @@ -288,6 +288,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -308,4 +320,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/cache-test.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/cache-test.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/cache-test.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/resources/cache-test.xml Wed Mar 3 19:34:46 2010 @@ -288,6 +288,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -308,4 +320,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + </beans> Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/resources/cache-test.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/resources/cache-test.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/resources/cache-test.xml (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/resources/cache-test.xml Wed Mar 3 19:34:46 2010 @@ -288,6 +288,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -308,4 +320,14 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + </beans> Modified: portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml (original) +++ portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml Wed Mar 3 19:34:46 2010 @@ -39,6 +39,10 @@ <constructor-arg index="6"><ref bean="pageManagerPropertiesCache"/></constructor-arg> <!-- fragment properties path cache --> <constructor-arg index="7"><ref bean="pageManagerPropertiesPathCache"/></constructor-arg> + <!-- principal fragment properties cache --> + <constructor-arg index="8"><ref bean="pageManagerPrincipalPropertiesCache"/></constructor-arg> + <!-- principal fragment properties path cache --> + <constructor-arg index="9"><ref bean="pageManagerPrincipalPropertiesPathCache"/></constructor-arg> </bean> <!-- Proxying --> Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml (original) +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml Wed Mar 3 19:34:46 2010 @@ -295,6 +295,18 @@ <property name="cacheName" value="pageManagerPropertiesPathCache"/> </bean> + <bean id="ehPageManagerPrincipalPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesCache"/> + </bean> + + <bean id="ehPageManagerPrincipalPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <meta key="j2:cat" value="default or cache"/> + <property name="cacheManager" ref="cacheManager"/> + <property name="cacheName" value="pageManagerPrincipalPropertiesPathCache"/> + </bean> + <bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg> @@ -315,6 +327,16 @@ <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></constructor-arg> </bean> + <bean id="pageManagerPrincipalPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesCache"/></constructor-arg> + </bean> + + <bean id="pageManagerPrincipalPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <meta key="j2:cat" value="default or cache"/> + <constructor-arg><ref bean="ehPageManagerPrincipalPropertiesPathCache"/></constructor-arg> + </bean> + <bean id="userContentCacheManager" class="org.apache.jetspeed.cache.impl.UserContentCacheManagerImpl"> <meta key="j2:cat" value="default or cache"/> <constructor-arg><ref bean="portletContentCache"/></constructor-arg> Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml (original) +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml Wed Mar 3 19:34:46 2010 @@ -260,6 +260,14 @@ <constructor-arg index="7"> <ref bean="pageManagerPropertiesPathCache"/> </constructor-arg> + <!-- principal fragment properties cache --> + <constructor-arg index="8"> + <ref bean="pageManagerPrincipalPropertiesCache"/> + </constructor-arg> + <!-- principal fragment properties path cache --> + <constructor-arg index="9"> + <ref bean="pageManagerPrincipalPropertiesPathCache"/> + </constructor-arg> </bean> <bean id="dbPageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml (original) +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml Wed Mar 3 19:34:46 2010 @@ -570,4 +570,27 @@ replicateRemovals=true"/> </cache> + <cache name="pageManagerPrincipalPropertiesCache" + maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxelements}" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + memoryStoreEvictionPolicy="LFU"/> + + <cache name="pageManagerPrincipalPropertiesPathCache" + maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxelements}" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + memoryStoreEvictionPolicy="LFU"> + <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory" + properties="replicateAsynchronously=true, + replicatePuts=false, + replicateUpdates=false, + replicateUpdatesViaCopy=false, + replicateRemovals=true"/> + </cache> + </ehcache> Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml?rev=918656&r1=918655&r2=918656&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml (original) +++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml Wed Mar 3 19:34:46 2010 @@ -533,4 +533,20 @@ timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" memoryStoreEvictionPolicy="LFU"/> + <cache name="pageManagerPrincipalPropertiesCache" + maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxelements}" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + memoryStoreEvictionPolicy="LFU"/> + + <cache name="pageManagerPrincipalPropertiesPathCache" + maxElementsInMemory="${org.apache.jetspeed.ehcache.pagemanager.maxelements}" + eternal="false" + overflowToDisk="false" + timeToIdleSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}" + memoryStoreEvictionPolicy="LFU"/> + </ehcache> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
