You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dd...@apache.org on 2008/10/20 14:25:05 UTC
svn commit: r706256 - in
/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources:
assembly/cache.xml assembly/jetspeed-base.xml
conf/jetspeed/spring-filter.properties
Author: ddam
Date: Mon Oct 20 05:25:04 2008
New Revision: 706256
URL: http://svn.apache.org/viewvc?rev=706256&view=rev
Log:
move PageFileCache bean to cache category, add cache category to PageSerializer spring group
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
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=706256&r1=706255&r2=706256&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 Mon Oct 20 05:25:04 2008
@@ -25,6 +25,20 @@
-->
</bean>
+ <!-- Page File Cache -->
+ <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner"
+ destroy-method="stopFileScanner">
+ <meta key="j2:cat" value="default,cache" />
+ <!-- Internal cache -->
+ <constructor-arg index="0">
+ <ref bean="internalPageFileCache" />
+ </constructor-arg>
+ <!-- Scan rate for changes in cached files on the file system -->
+ <constructor-arg index="1">
+ <value>${page.file.cache.scanRate}</value>
+ </constructor-arg>
+ </bean>
+
<!-- Factory bean used to instantiate a EHCache with the specified name (and corresponding
configuration in cacheManager.xml -->
<bean id="ehPortletContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml?rev=706256&r1=706255&r2=706256&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml Mon Oct 20 05:25:04 2008
@@ -36,18 +36,4 @@
</constructor-arg>
</bean>
- <!-- Page File Cache -->
- <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner"
- destroy-method="stopFileScanner">
- <meta key="j2:cat" value="default,base" />
- <!-- Internal cache -->
- <constructor-arg index="0">
- <ref bean="internalPageFileCache" />
- </constructor-arg>
- <!-- Scan rate for changes in cached files on the file system -->
- <constructor-arg index="1">
- <value>${page.file.cache.scanRate}</value>
- </constructor-arg>
- </bean>
-
</beans>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties?rev=706256&r1=706255&r2=706256&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties Mon Oct 20 05:25:04 2008
@@ -37,4 +37,4 @@
serializer=${baseSerializer},dbSecurity
serializer.ldap=${baseSerializer},ldapSecurity
-pageSerializer=jdbcDS,base,pageSerializer,transaction,springProperties,security,dbSecurity
+pageSerializer=jdbcDS,base,pageSerializer,transaction,springProperties,security,dbSecurity,cache
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org