Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/cache.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/cache.xml?view=diff&rev=509904&r1=509903&r2=509904 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/cache.xml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/cache.xml Tue Feb 20 21:55:40 2007 @@ -1,102 +1,123 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd";> <!-- -Copyright 2004 The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Copyright 2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> <beans> -<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"> - <!-- get it through the class path - <property name="configLocation" value="${applicationRoot}/WEB-INF/conf/ehcache.xml"/> - --> -</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"> -<property name="cacheManager"> -<ref local="cacheManager"/> -</property> - <property name="cacheName" value="portletContentCache"/> -</bean> - -<bean id="portletContentCache" class="org.apache.jetspeed.cache.impl.EhPortletContentCacheImpl"> - <constructor-arg> - <ref bean="ehPortletContentCache"/> - </constructor-arg> -</bean> - -<bean id="ehPreferencesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> -<property name="cacheManager"> -<ref local="cacheManager"/> -</property> - <property name="cacheName" value="preferencesCache"/> -</bean> - -<bean id="preferencesCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl"> - <constructor-arg> - <ref bean="ehPreferencesCache"/> - </constructor-arg> -</bean> - -<bean id="ehPortletApplicationOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> -<property name="cacheManager"> -<ref local="cacheManager"/> -</property> - <property name="cacheName" value="portletApplicationOidCache"/> -</bean> -<bean id="ehPortletApplicationNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> -<property name="cacheManager"> -<ref local="cacheManager"/> -</property> - <property name="cacheName" value="portletApplicationNameCache"/> -</bean> - -<bean id="portletApplicationOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> - <constructor-arg> - <ref bean="ehPortletApplicationOidCache"/> - </constructor-arg> -</bean> -<bean id="portletApplicationNameCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> - <constructor-arg> - <ref bean="ehPortletApplicationNameCache"/> - </constructor-arg> -</bean> - -<bean id="ehPortletDefinitionOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> -<property name="cacheManager"> -<ref local="cacheManager"/> -</property> - <property name="cacheName" value="portletDefinitionOidCache"/> -</bean> -<bean id="ehPortletDefinitionNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean"> -<property name="cacheManager"> -<ref local="cacheManager"/> -</property> - <property name="cacheName" value="portletDefinitionNameCache"/> -</bean> - -<bean id="portletDefinitionOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> - <constructor-arg> - <ref bean="ehPortletDefinitionOidCache"/> - </constructor-arg> -</bean> -<bean id="portletDefinitionNameCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl"> - <constructor-arg> - <ref bean="ehPortletDefinitionNameCache"/> - </constructor-arg> -</bean> + <bean id="cacheManager" + class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"> + <!-- get it through the class path + <property name="configLocation" value="${applicationRoot}/WEB-INF/conf/ehcache.xml"/> + --> + </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"> + <property name="cacheManager"> + <ref local="cacheManager" /> + </property> + <property name="cacheName" value="portletContentCache" /> + </bean> + + <bean id="portletContentCache" + class="org.apache.jetspeed.cache.impl.EhPortletContentCacheImpl"> + <constructor-arg index="0"> + <ref bean="ehPortletContentCache" /> + </constructor-arg> + <constructor-arg index="1"> + <ref bean="preferencesCache" /> + </constructor-arg> + </bean> + + <bean id="ehPreferencesCache" + class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager"> + <ref local="cacheManager" /> + </property> + <property name="cacheName" value="preferencesCache" /> + </bean> + + <bean id="preferencesCache" + class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl"> + <constructor-arg> + <ref bean="ehPreferencesCache" /> + </constructor-arg> + </bean> + + <bean id="ehPortletApplicationOidCache" + class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager"> + <ref local="cacheManager" /> + </property> + <property name="cacheName" value="portletApplicationOidCache" /> + </bean> + + <bean id="ehPortletApplicationNameCache" + class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager"> + <ref local="cacheManager" /> + </property> + <property name="cacheName" value="portletApplicationNameCache" /> + </bean> + + <bean id="portletApplicationOidCache" + class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <constructor-arg> + <ref bean="ehPortletApplicationOidCache" /> + </constructor-arg> + </bean> + + <bean id="portletApplicationNameCache" + class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl"> + <constructor-arg> + <ref bean="ehPortletApplicationNameCache" /> + </constructor-arg> + </bean> + + <bean id="ehPortletDefinitionOidCache" + class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager"> + <ref local="cacheManager" /> + </property> + <property name="cacheName" value="portletDefinitionOidCache" /> + </bean> + + <bean id="ehPortletDefinitionNameCache" + class="org.springframework.cache.ehcache.EhCacheFactoryBean"> + <property name="cacheManager"> + <ref local="cacheManager" /> + </property> + <property name="cacheName" value="portletDefinitionNameCache" /> + </bean> + + + <bean id="portletDefinitionOidCache" + class="org.apache.jetspeed.cache.impl.EhCacheImpl"> + <constructor-arg> + <ref bean="ehPortletDefinitionOidCache" /> + </constructor-arg> + </bean> + + <bean id="portletDefinitionNameCache" + class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl"> + <constructor-arg> + <ref bean="ehPortletDefinitionNameCache" /> + </constructor-arg> + </bean> </beans>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml?view=diff&rev=509904&r1=509903&r2=509904 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml Tue Feb 20 21:55:40 2007 @@ -104,14 +104,17 @@ <!-- Portlet Window Component --> <bean id="PortletWindowAccessor" class="org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl" name="org.apache.jetspeed.container.window.PortletWindowAccessor"> - <constructor-arg> + <constructor-arg index='0'> <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" /> </constructor-arg> - <constructor-arg> + <constructor-arg index='1'> <ref bean="portletFactory" /> </constructor-arg> + <constructor-arg index='2'> + <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" /> + </constructor-arg> <!-- enable window validation --> - <constructor-arg type="boolean"> + <constructor-arg type="boolean" index='3'> <value>false</value> </constructor-arg> </bean> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml?view=diff&rev=509904&r1=509903&r2=509904 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml Tue Feb 20 21:55:40 2007 @@ -35,6 +35,12 @@ <constructor-arg index="3"> <ref bean="portletDefinitionOidCache" /> </constructor-arg> + <constructor-arg index="4"> + <ref bean="portletApplicationNameCache" /> + </constructor-arg> + <constructor-arg index="5"> + <ref bean="portletDefinitionNameCache" /> + </constructor-arg> </bean> <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy"> @@ -56,45 +62,6 @@ </property> </bean> - <!-- Portlet Entity Access DAO--> - <!-- - <bean id="systemCache" class="org.apache.jetspeed.cache.general.SimpleHashMapCache" /> - - <bean id="systemCachingInterceptor" class="org.apache.jetspeed.components.interceptors.CachingInterceptor" > - <constructor-arg> - <ref bean="systemCache"/> - </constructor-arg> - </bean> - - <bean id="systemRemoveFromCacheInterceptor" class="org.apache.jetspeed.components.interceptors.RemoveFromCacheInterceptor" > - <constructor-arg> - <ref bean="systemCache"/> - </constructor-arg> - </bean> - - <bean id="portletEntityCachingAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor"> - <property name="advice"> - <ref bean="systemCachingInterceptor"/> - </property> - <property name="patterns"> - <list> - <value>.*getPortletEntity.*</value> - </list> - </property> - </bean> - - <bean id="portletEntityRemoveFromCacheAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor"> - <property name="advice"> - <ref bean="systemRemoveFromCacheInterceptor"/> - </property> - <property name="patterns"> - <list> - <value>.*removePortletEntity.*</value> - </list> - </property> - </bean> - - --> <!-- - PortletEntity business object: OJB implementation, as an inner bean wrapped - by an outer transactional proxy. The two bean definitions could have been separate, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
