portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r896119 [2/2] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/ components/jetspeed-page-man...
Date Tue, 05 Jan 2010 16:32:49 GMT
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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -276,6 +276,18 @@
         <property name="cacheName" value="pageManagerPathCache"/>
     </bean>
     
+    <bean id="ehPageManagerPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesCache"/>
+    </bean>
+    
+    <bean id="ehPageManagerPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesPathCache"/>
+    </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>
@@ -286,4 +298,14 @@
         <constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
     </bean>
     
+    <bean id="pageManagerPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesCache"/></constructor-arg>
+    </bean>
+    
+    <bean id="pageManagerPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -276,6 +276,18 @@
         <property name="cacheName" value="pageManagerPathCache"/>
     </bean>
     
+    <bean id="ehPageManagerPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesCache"/>
+    </bean>
+    
+    <bean id="ehPageManagerPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesPathCache"/>
+    </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>
@@ -285,5 +297,15 @@
         <meta key="j2:cat" value="default or cache"/>
         <constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
     </bean>
+
+    <bean id="pageManagerPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesCache"/></constructor-arg>
+    </bean>    
+    
+    <bean id="pageManagerPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -276,6 +276,18 @@
         <property name="cacheName" value="pageManagerPathCache"/>
     </bean>
     
+    <bean id="ehPageManagerPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesCache"/>
+    </bean>
+    
+    <bean id="ehPageManagerPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesPathCache"/>
+    </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>
@@ -286,4 +298,14 @@
         <constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
     </bean>
     
+    <bean id="pageManagerPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesCache"/></constructor-arg>
+    </bean>
+
+    <bean id="pageManagerPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -276,6 +276,18 @@
         <property name="cacheName" value="pageManagerPathCache"/>
     </bean>
     
+    <bean id="ehPageManagerPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesCache"/>
+    </bean>
+    
+    <bean id="ehPageManagerPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesPathCache"/>
+    </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>
@@ -286,4 +298,14 @@
         <constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
     </bean>
     
+    <bean id="pageManagerPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesCache"/></constructor-arg>
+    </bean>
+    
+    <bean id="pageManagerPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -276,6 +276,18 @@
         <property name="cacheName" value="pageManagerPathCache"/>
     </bean>
     
+    <bean id="ehPageManagerPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesCache"/>
+    </bean>
+    
+    <bean id="ehPageManagerPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesPathCache"/>
+    </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>
@@ -286,4 +298,14 @@
         <constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
     </bean>
     
+    <bean id="pageManagerPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesCache"/></constructor-arg>
+    </bean>
+    
+    <bean id="pageManagerPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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 Tue Jan  5
16:32:47 2010
@@ -35,6 +35,10 @@
       <constructor-arg index="4"><ref bean="pageManagerOidCache"/></constructor-arg>
       <!-- folder/page/link path cache -->
       <constructor-arg index="5"><ref bean="pageManagerPathCache"/></constructor-arg>
+      <!-- fragment properties cache -->
+      <constructor-arg index="6"><ref bean="pageManagerPropertiesCache"/></constructor-arg>
+      <!-- fragment properties path cache -->
+      <constructor-arg index="7"><ref bean="pageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -283,6 +283,18 @@
         <property name="cacheName" value="pageManagerPathCache"/>
     </bean>
     
+    <bean id="ehPageManagerPropertiesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesCache"/>
+    </bean>
+
+    <bean id="ehPageManagerPropertiesPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheManager" ref="cacheManager"/>
+        <property name="cacheName" value="pageManagerPropertiesPathCache"/>
+    </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>
@@ -293,6 +305,16 @@
         <constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
     </bean>
     
+    <bean id="pageManagerPropertiesCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesCache"/></constructor-arg>
+    </bean>
+    
+    <bean id="pageManagerPropertiesPathCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehPageManagerPropertiesPathCache"/></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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -252,6 +252,14 @@
     <constructor-arg index="5">
       <ref bean="pageManagerPathCache"/>
     </constructor-arg>
+    <!-- fragment properties cache -->
+    <constructor-arg index="6">
+      <ref bean="pageManagerPropertiesCache"/>
+    </constructor-arg>
+    <!-- fragment properties path cache -->
+    <constructor-arg index="7">
+      <ref bean="pageManagerPropertiesPathCache"/>
+    </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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -547,4 +547,27 @@
                                                replicateRemovals=true"/>
     </cache>
 
+    <cache name="pageManagerPropertiesCache"
+           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="pageManagerPropertiesPathCache"
+           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=896119&r1=896118&r2=896119&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
Tue Jan  5 16:32:47 2010
@@ -517,4 +517,20 @@
            timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}"
            memoryStoreEvictionPolicy="LFU"/>
 
+    <cache name="pageManagerPropertiesCache"
+           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="pageManagerPropertiesPathCache"
+           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: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message