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 rw...@apache.org on 2009/04/16 07:19:06 UTC
svn commit: r765465 [2/3] - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/
components/jetspeed-cm/src/test/java/org/apache/jetspeed/components/
components/jetspeed-portal-site/src/test/resource...
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=765465&r1=765464&r2=765465&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 Thu Apr 16 05:19:05 2009
@@ -20,20 +20,20 @@
<!-- Cache Manager -->
<bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="defaultConfigResource" value="ehcache.xml"/>
<property name="test" value="true"/>
</bean>
<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="configLocation" ref="cacheManagerConfig"/>
</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" />
+ <meta key="j2:cat" value="default or cache" />
<!-- Internal cache -->
<constructor-arg index="0">
<ref bean="internalPageFileCache" />
@@ -47,7 +47,7 @@
<!-- 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">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -55,7 +55,7 @@
</bean>
<bean id="ContentCacheKeyGenerator" class="org.apache.jetspeed.cache.impl.JetspeedCacheKeyGenerator">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<!-- Keys are order specific in the list:
where username == the user principal name of the current user
pipeline == the name of the active pipeline for the current request (portal | desktop)
@@ -76,7 +76,7 @@
</bean>
<bean id="portletContentCache" class="org.apache.jetspeed.cache.impl.EhPortletContentCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehPortletContentCache" />
</constructor-arg>
@@ -89,7 +89,7 @@
</bean>
<bean id="ehDecorationContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -97,7 +97,7 @@
</bean>
<bean id="decorationContentCache" class="org.apache.jetspeed.cache.impl.EhDecorationContentCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehDecorationContentCache" />
</constructor-arg>
@@ -110,7 +110,7 @@
</bean>
<bean id="ehDecorationConfigurationCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -118,14 +118,14 @@
</bean>
<bean id="decorationConfigurationCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehDesktopContentCache" />
</constructor-arg>
</bean>
<bean id="ehPreferencesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -133,14 +133,14 @@
</bean>
<bean id="preferencesCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPreferencesCache" />
</constructor-arg>
</bean>
<bean id="ehPortletApplicationOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -148,7 +148,7 @@
</bean>
<bean id="ehPortletApplicationNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -156,7 +156,7 @@
</bean>
<bean id="ehDesktopContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -164,28 +164,28 @@
</bean>
<bean id="portletApplicationOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletApplicationOidCache" />
</constructor-arg>
</bean>
<bean id="portletApplicationNameCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletApplicationNameCache" />
</constructor-arg>
</bean>
<bean id="desktopContentCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehDesktopContentCache" />
</constructor-arg>
</bean>
<bean id="ehPortletDefinitionOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -193,7 +193,7 @@
</bean>
<bean id="ehPortletDefinitionNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -202,14 +202,14 @@
<bean id="portletDefinitionOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletDefinitionOidCache" />
</constructor-arg>
</bean>
<bean id="portletDefinitionNameCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletDefinitionNameCache" />
</constructor-arg>
@@ -219,7 +219,7 @@
<!-- Factory bean used to instantiate a EHCache with the specified name (and corresponding
configuration in cacheManager.xml -->
<bean id="ehActiveAuthenticationCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -227,14 +227,14 @@
</bean>
<bean id="activeAuthenticationCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehActiveAuthenticationCache" />
</constructor-arg>
</bean>
<bean id="ehPortletWindowCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -242,14 +242,14 @@
</bean>
<bean id="portletWindowCache" class="org.apache.jetspeed.cache.impl.EhPortletWindowCache">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehPortletWindowCache" />
</constructor-arg>
</bean>
<bean id="ehInternalPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -257,14 +257,14 @@
</bean>
<bean id="internalPageFileCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehInternalPageFileCache" />
</constructor-arg>
</bean>
<bean id="ehInternalImportPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -272,7 +272,7 @@
</bean>
<bean id="internalImportPageFileCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehInternalImportPageFileCache" />
</constructor-arg>
@@ -280,24 +280,24 @@
<!-- Page Manager Caches -->
<bean id="ehPageManagerOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="cacheManager" ref="cacheManager"/>
<property name="cacheName" value="pageManagerOidCache"/>
</bean>
<bean id="ehPageManagerPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="cacheManager" ref="cacheManager"/>
<property name="cacheName" value="pageManagerPathCache"/>
</bean>
<bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg>
</bean>
<bean id="pageManagerPathCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
</bean>
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=765465&r1=765464&r2=765465&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 Thu Apr 16 05:19:05 2009
@@ -20,20 +20,20 @@
<!-- Cache Manager -->
<bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="defaultConfigResource" value="ehcache.xml"/>
<property name="test" value="true"/>
</bean>
<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="configLocation" ref="cacheManagerConfig"/>
</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" />
+ <meta key="j2:cat" value="default or cache" />
<!-- Internal cache -->
<constructor-arg index="0">
<ref bean="internalPageFileCache" />
@@ -47,7 +47,7 @@
<!-- 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">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -55,7 +55,7 @@
</bean>
<bean id="ContentCacheKeyGenerator" class="org.apache.jetspeed.cache.impl.JetspeedCacheKeyGenerator">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<!-- Keys are order specific in the list:
where username == the user principal name of the current user
pipeline == the name of the active pipeline for the current request (portal | desktop)
@@ -76,7 +76,7 @@
</bean>
<bean id="portletContentCache" class="org.apache.jetspeed.cache.impl.EhPortletContentCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehPortletContentCache" />
</constructor-arg>
@@ -89,7 +89,7 @@
</bean>
<bean id="ehDecorationContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -97,7 +97,7 @@
</bean>
<bean id="decorationContentCache" class="org.apache.jetspeed.cache.impl.EhDecorationContentCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehDecorationContentCache" />
</constructor-arg>
@@ -110,7 +110,7 @@
</bean>
<bean id="ehDecorationConfigurationCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -118,14 +118,14 @@
</bean>
<bean id="decorationConfigurationCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehDesktopContentCache" />
</constructor-arg>
</bean>
<bean id="ehPreferencesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -133,14 +133,14 @@
</bean>
<bean id="preferencesCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPreferencesCache" />
</constructor-arg>
</bean>
<bean id="ehPortletApplicationOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -148,7 +148,7 @@
</bean>
<bean id="ehPortletApplicationNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -156,7 +156,7 @@
</bean>
<bean id="ehDesktopContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -164,28 +164,28 @@
</bean>
<bean id="portletApplicationOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletApplicationOidCache" />
</constructor-arg>
</bean>
<bean id="portletApplicationNameCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletApplicationNameCache" />
</constructor-arg>
</bean>
<bean id="desktopContentCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehDesktopContentCache" />
</constructor-arg>
</bean>
<bean id="ehPortletDefinitionOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -193,7 +193,7 @@
</bean>
<bean id="ehPortletDefinitionNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -202,14 +202,14 @@
<bean id="portletDefinitionOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletDefinitionOidCache" />
</constructor-arg>
</bean>
<bean id="portletDefinitionNameCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletDefinitionNameCache" />
</constructor-arg>
@@ -219,7 +219,7 @@
<!-- Factory bean used to instantiate a EHCache with the specified name (and corresponding
configuration in cacheManager.xml -->
<bean id="ehActiveAuthenticationCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -227,14 +227,14 @@
</bean>
<bean id="activeAuthenticationCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehActiveAuthenticationCache" />
</constructor-arg>
</bean>
<bean id="ehPortletWindowCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -242,14 +242,14 @@
</bean>
<bean id="portletWindowCache" class="org.apache.jetspeed.cache.impl.EhPortletWindowCache">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehPortletWindowCache" />
</constructor-arg>
</bean>
<bean id="ehInternalPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -257,14 +257,14 @@
</bean>
<bean id="internalPageFileCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehInternalPageFileCache" />
</constructor-arg>
</bean>
<bean id="ehInternalImportPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -272,7 +272,7 @@
</bean>
<bean id="internalImportPageFileCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehInternalImportPageFileCache" />
</constructor-arg>
@@ -280,24 +280,24 @@
<!-- Page Manager Caches -->
<bean id="ehPageManagerOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="cacheManager" ref="cacheManager"/>
<property name="cacheName" value="pageManagerOidCache"/>
</bean>
<bean id="ehPageManagerPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="cacheManager" ref="cacheManager"/>
<property name="cacheName" value="pageManagerPathCache"/>
</bean>
<bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg>
</bean>
<bean id="pageManagerPathCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
</bean>
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=765465&r1=765464&r2=765465&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 Thu Apr 16 05:19:05 2009
@@ -20,20 +20,20 @@
<!-- Cache Manager -->
<bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="configuration" ref="portal_configuration"/>
<property name="defaultConfigResource" value="ehcache.xml"/>
</bean>
<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="configLocation" ref="cacheManagerConfig"/>
</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" />
+ <meta key="j2:cat" value="default or cache" />
<!-- Internal cache -->
<constructor-arg index="0">
<ref bean="internalPageFileCache" />
@@ -47,7 +47,7 @@
<!-- 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">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -55,7 +55,7 @@
</bean>
<bean id="ContentCacheKeyGenerator" class="org.apache.jetspeed.cache.impl.JetspeedCacheKeyGenerator">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<!-- Keys are order specific in the list:
where username == the user principal name of the current user
pipeline == the name of the active pipeline for the current request (portal | desktop)
@@ -76,7 +76,7 @@
</bean>
<bean id="portletContentCache" class="org.apache.jetspeed.cache.impl.EhPortletContentCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehPortletContentCache" />
</constructor-arg>
@@ -89,7 +89,7 @@
</bean>
<bean id="ehDecorationContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -97,7 +97,7 @@
</bean>
<bean id="decorationContentCache" class="org.apache.jetspeed.cache.impl.EhDecorationContentCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehDecorationContentCache" />
</constructor-arg>
@@ -110,7 +110,7 @@
</bean>
<bean id="ehDecorationConfigurationCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -118,14 +118,14 @@
</bean>
<bean id="decorationConfigurationCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehDesktopContentCache" />
</constructor-arg>
</bean>
<bean id="ehPreferencesCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -133,14 +133,14 @@
</bean>
<bean id="preferencesCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPreferencesCache" />
</constructor-arg>
</bean>
<bean id="ehPortletApplicationOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -148,7 +148,7 @@
</bean>
<bean id="ehPortletApplicationNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -156,7 +156,7 @@
</bean>
<bean id="ehDesktopContentCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -164,28 +164,28 @@
</bean>
<bean id="portletApplicationOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletApplicationOidCache" />
</constructor-arg>
</bean>
<bean id="portletApplicationNameCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletApplicationNameCache" />
</constructor-arg>
</bean>
<bean id="desktopContentCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehDesktopContentCache" />
</constructor-arg>
</bean>
<bean id="ehPortletDefinitionOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -193,7 +193,7 @@
</bean>
<bean id="ehPortletDefinitionNameCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -202,14 +202,14 @@
<bean id="portletDefinitionOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletDefinitionOidCache" />
</constructor-arg>
</bean>
<bean id="portletDefinitionNameCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehPortletDefinitionNameCache" />
</constructor-arg>
@@ -219,7 +219,7 @@
<!-- Factory bean used to instantiate a EHCache with the specified name (and corresponding
configuration in cacheManager.xml -->
<bean id="ehActiveAuthenticationCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -227,14 +227,14 @@
</bean>
<bean id="activeAuthenticationCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg index="0">
<ref bean="ehActiveAuthenticationCache" />
</constructor-arg>
</bean>
<bean id="ehInternalPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -242,14 +242,14 @@
</bean>
<bean id="internalPageFileCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehInternalPageFileCache" />
</constructor-arg>
</bean>
<bean id="ehInternalImportPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<property name="cacheManager">
<ref local="cacheManager" />
</property>
@@ -257,7 +257,7 @@
</bean>
<bean id="internalImportPageFileCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache" />
+ <meta key="j2:cat" value="default or cache" />
<constructor-arg>
<ref bean="ehInternalImportPageFileCache" />
</constructor-arg>
@@ -265,29 +265,29 @@
<!-- Page Manager Caches -->
<bean id="ehPageManagerOidCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="cacheManager" ref="cacheManager"/>
<property name="cacheName" value="pageManagerOidCache"/>
</bean>
<bean id="ehPageManagerPathCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<property name="cacheManager" ref="cacheManager"/>
<property name="cacheName" value="pageManagerPathCache"/>
</bean>
<bean id="pageManagerOidCache" class="org.apache.jetspeed.cache.impl.EhCacheImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="ehPageManagerOidCache"/></constructor-arg>
</bean>
<bean id="pageManagerPathCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="ehPageManagerPathCache"/></constructor-arg>
</bean>
<bean id="userContentCacheManager" class="org.apache.jetspeed.cache.impl.UserContentCacheManagerImpl">
- <meta key="j2:cat" value="default,cache"/>
+ <meta key="j2:cat" value="default or cache"/>
<constructor-arg><ref bean="portletContentCache"/></constructor-arg>
<constructor-arg><ref bean="decorationContentCache"/></constructor-arg>
<constructor-arg><ref bean="ContentCacheKeyGenerator"/></constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<!-- Capabilities DAO-->
<bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
- <meta key="j2:cat" value="default,capabilities" />
+ <meta key="j2:cat" value="default or capabilities" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
</constructor-arg>
@@ -40,7 +40,7 @@
<!-- Capabilities -->
<bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,capabilities" />
+ <meta key="j2:cat" value="default or capabilities" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.capabilities.Capabilities</value>
</property>
@@ -65,22 +65,22 @@
<!-- Client -->
<bean id="Client" class="org.apache.jetspeed.capabilities.impl.ClientImpl" scope="prototype">
- <meta key="j2:cat" value="default,capabilities" />
+ <meta key="j2:cat" value="default or capabilities" />
</bean>
<!-- MediaType -->
<bean id="MediaType" class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl" scope="prototype">
- <meta key="j2:cat" value="default,capabilities" />
+ <meta key="j2:cat" value="default or capabilities" />
</bean>
<!-- MimeType -->
<bean id="MimeType" class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl" scope="prototype">
- <meta key="j2:cat" value="default,capabilities" />
+ <meta key="j2:cat" value="default or capabilities" />
</bean>
<!-- Capability -->
<bean id="Capability" class="org.apache.jetspeed.capabilities.impl.CapabilityImpl" scope="prototype">
- <meta key="j2:cat" value="default,capabilities" />
+ <meta key="j2:cat" value="default or capabilities" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
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=765465&r1=765464&r2=765465&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 Thu Apr 16 05:19:05 2009
@@ -21,7 +21,7 @@
<!-- ID Generator -->
<bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start"
destroy-method="stop">
- <meta key="j2:cat" value="default,base" />
+ <meta key="j2:cat" value="default or base" />
<!-- ID Start value -->
<constructor-arg index="0">
<value>${portal.core.id.generator.start}</value>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<!-- Commons configuration object generated from jetspeed.properties + override.properties -->
<bean id="portal_configuration" class="org.apache.jetspeed.components.util.ConfigurationProperties">
- <meta key="j2:cat" value="default,springProperties" />
+ <meta key="j2:cat" value="default or springProperties" />
<property name="locations">
<list>
<value>file:///${jetspeedPropertiesPath}/jetspeed.properties</value>
@@ -34,7 +34,7 @@
<!-- Adds jetspeed.properties as our configuration object to support ${...} vars -->
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <meta key="j2:cat" value="default,springProperties" />
+ <meta key="j2:cat" value="default or springProperties" />
<property name="locations">
<list>
<value>file:///${jetspeedPropertiesPath}/jetspeed.properties</value>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml Thu Apr 16 05:19:05 2009
@@ -67,7 +67,7 @@
<!-- Request Context -->
<bean id="org.apache.jetspeed.request.RequestContextComponent"
class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<constructor-arg index='0'><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" /></constructor-arg>
<constructor-arg index='1'><ref bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
<constructor-arg index='2'><ref bean="RequestContextObjects" /></constructor-arg>
@@ -118,4 +118,4 @@
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
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=765465&r1=765464&r2=765465&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 Thu Apr 16 05:19:05 2009
@@ -21,7 +21,7 @@
<!-- XML/Castor PageManager -->
<bean id="xmlDocumentHandlerFactory" class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl">
- <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
+ <meta key="j2:cat" value="xmlPageManager or pageSerializer" />
<constructor-arg>
<map>
<entry key=".psml">
@@ -105,7 +105,7 @@
</bean>
<bean id="xmlFolderHandler" class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler">
- <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
+ <meta key="j2:cat" value="xmlPageManager or pageSerializer" />
<constructor-arg index="0">
<value>${psml.pages.path}</value>
</constructor-arg>
@@ -118,7 +118,7 @@
</bean>
<bean name="xmlPageManager" class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
- <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
+ <meta key="j2:cat" value="xmlPageManager or pageSerializer" />
<constructor-arg index="0">
<ref bean="IdGenerator" />
</constructor-arg>
@@ -146,7 +146,7 @@
<!-- Database PageManager -->
<bean id="dbPageManagerImpl" class="org.apache.jetspeed.page.impl.DatabasePageManager" init-method="init">
- <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+ <meta key="j2:cat" value="dbPageManager or pageSerializer" />
<!-- OJB configuration file resource path -->
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/page-manager-repository.xml</value>
@@ -170,7 +170,7 @@
</bean>
<bean id="dbPageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
- <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+ <meta key="j2:cat" value="dbPageManager or pageSerializer" />
<meta key="j2:alias" value="org.apache.jetspeed.page.PageManager" />
<property name="transactionManager">
<ref bean="transactionManager" />
@@ -248,7 +248,7 @@
<!-- Inject Page Manager Proxy into Page Manager -->
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+ <meta key="j2:cat" value="dbPageManager or pageSerializer" />
<property name="targetObject">
<ref bean="dbPageManagerImpl" />
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<!-- Profiler -->
<bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/profiler_repository.xml</value>
</constructor-arg>
@@ -55,7 +55,7 @@
</bean>
<bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.profiler.Profiler</value>
</property>
@@ -75,7 +75,7 @@
</bean>
<bean id="ProfileResolvers" class="org.apache.jetspeed.profiler.rules.impl.ProfileResolversImpl">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
<constructor-arg index="0">
<map>
<entry key="request">
@@ -143,72 +143,72 @@
</bean>
<bean id='StandardResolver' class='org.apache.jetspeed.profiler.rules.impl.StandardResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='SessionResolver' class='org.apache.jetspeed.profiler.rules.impl.SessionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='RequestSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.RequestSessionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='PathResolver' class='org.apache.jetspeed.profiler.rules.impl.PathResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='PathSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.PathSessionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='HardCodedResolver' class='org.apache.jetspeed.profiler.rules.impl.HardCodedResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='UserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='RoleCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='PrincipalCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.PrincipalCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='RoleComboCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleComboCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='GroupCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='MediatypeCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.MediatypeCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='LanguageCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.LanguageCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='CountryCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.CountryCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='GroupRoleUserCriterionResolver'
class='org.apache.jetspeed.profiler.rules.impl.GroupRoleUserCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='UserAttributeResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAttributeResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='NavigationCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.NavigationCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='UserAgentCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAgentCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='IPCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.IPCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<bean id='HostnameCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.HostnameCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
<!-- use the dot prefix, for ex: "accounting.xyz.com" returns "accounting" -->
<constructor-arg type="boolean" index="0">
<value>false</value>
</constructor-arg>
</bean>
<bean id='DomainCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.DomainCriterionResolver'>
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<!-- Profiling Rules -->
@@ -216,29 +216,29 @@
<!-- Standard Profiler -->
<bean id="StandardProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
scope="prototype">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<!-- Fallback Profiler -->
<bean id="RoleFallbackProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
scope="prototype">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<!-- Locator -->
<bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<!-- Principal Rule -->
<bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
<!-- Rule Criterion -->
<bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype">
- <meta key="j2:cat" value="default,profiler" />
+ <meta key="j2:cat" value="default or profiler" />
</bean>
</beans>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<!-- Portlet Factory -->
<bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<!-- If the following constructor-arg is set to true,
proxy instances will switch config mode to built-in custom config mode portlet. -->
<constructor-arg index="0">
@@ -40,7 +40,7 @@
<!-- Portlet Registry DAO-->
<bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry"
init-method="init">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/registry_repository.xml</value>
@@ -64,7 +64,7 @@
<bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry"
parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
</property>
@@ -93,7 +93,7 @@
class="org.apache.jetspeed.components.portletpreferences.PortletPreferencesServiceImpl"
init-method="init" destroy-method="destroy">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<constructor-arg index="0">
<ref bean="portletFactory" />
</constructor-arg>
@@ -105,7 +105,7 @@
<bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy"
name="portletPreferencesProvider" destroy-method="destroy">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider</value>
</property>
@@ -129,7 +129,7 @@
<bean id="portletEntityAccessImpl"
class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<constructor-arg>
<ref bean="portletRegistry" />
</constructor-arg>
@@ -148,7 +148,7 @@
<bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy"
name="portletEntityAccess">
- <meta key="j2:cat" value="default,registry" />
+ <meta key="j2:cat" value="default or registry" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
</property>
@@ -174,4 +174,4 @@
</property>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<!--SEARCH COMPONENT-->
<bean id="org.apache.jetspeed.search.HandlerFactory" class="org.apache.jetspeed.search.handlers.HandlerFactoryImpl">
- <meta key="j2:cat" value="default,search" />
+ <meta key="j2:cat" value="default or search" />
<constructor-arg>
<map>
<entry key="java.net.URL">
@@ -38,7 +38,7 @@
<bean id="org.apache.jetspeed.search.SearchEngine" class="org.apache.jetspeed.search.lucene.SearchEngineImpl">
- <meta key="j2:cat" value="default,search" />
+ <meta key="j2:cat" value="default or search" />
<constructor-arg index="0">
<value>${search.index.location}</value>
</constructor-arg>
@@ -53,4 +53,4 @@
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml Thu Apr 16 05:19:05 2009
@@ -22,7 +22,7 @@
<!-- Security: Login Module Proxy -->
<bean id="org.apache.jetspeed.security.LoginModuleProxy"
class="org.apache.jetspeed.security.impl.LoginModuleProxyImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<!-- Authentication Provider to authenticate a user -->
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.AuthenticationProvider" />
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<!-- Security: RDBMS Policy implementation for JAAS -->
<bean id="org.apache.jetspeed.security.impl.RdbmsPolicy" class="org.apache.jetspeed.security.impl.RdbmsPolicy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.PermissionManager" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Thu Apr 16 05:19:05 2009
@@ -20,7 +20,7 @@
<bean id="org.apache.jetspeed.security.JetspeedPrincipalType.user"
class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" value="user" />
<constructor-arg index="1" value="org.apache.jetspeed.security.impl.UserImpl" />
<constructor-arg index="2">
@@ -57,7 +57,7 @@
<bean id="org.apache.jetspeed.security.JetspeedPrincipalType.role"
class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" value="role" />
<constructor-arg index="1" value="org.apache.jetspeed.security.impl.RoleImpl" />
<constructor-arg index="2">
@@ -82,7 +82,7 @@
<bean id="org.apache.jetspeed.security.JetspeedPrincipalType.group"
class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" value="group" />
<constructor-arg index="1" value="org.apache.jetspeed.security.impl.GroupImpl" />
<constructor-arg index="2">
@@ -108,7 +108,7 @@
<!-- Security: User Manager -->
<bean id="org.apache.jetspeed.security.UserManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>
org.apache.jetspeed.security.UserManager, org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -131,7 +131,7 @@
<bean id="org.apache.jetspeed.security.impl.UserManagerImpl"
class="org.apache.jetspeed.security.impl.UserManagerImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
@@ -141,7 +141,7 @@
</bean>
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="targetObject"><ref local="org.apache.jetspeed.security.impl.UserManagerImpl"/></property>
<property name="targetMethod"><value>addListener</value></property>
<property name="arguments">
@@ -152,7 +152,7 @@
<!-- Security: Group Manager -->
<bean id="org.apache.jetspeed.security.GroupManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>
org.apache.jetspeed.security.GroupManager,org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -174,7 +174,7 @@
<bean id="org.apache.jetspeed.security.impl.GroupManagerImpl"
class="org.apache.jetspeed.security.impl.GroupManagerImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
@@ -183,7 +183,7 @@
</bean>
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="targetObject"><ref local="org.apache.jetspeed.security.impl.GroupManagerImpl"/></property>
<property name="targetMethod"><value>addListener</value></property>
<property name="arguments">
@@ -194,7 +194,7 @@
<!-- Security: Role Manager -->
<bean id="org.apache.jetspeed.security.RoleManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>
org.apache.jetspeed.security.RoleManager,org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -216,7 +216,7 @@
<bean id="org.apache.jetspeed.security.impl.RoleManagerImpl"
class="org.apache.jetspeed.security.impl.RoleManagerImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
@@ -225,7 +225,7 @@
</bean>
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="targetObject"><ref local="org.apache.jetspeed.security.impl.RoleManagerImpl"/></property>
<property name="targetMethod"><value>addListener</value></property>
<property name="arguments">
@@ -236,7 +236,7 @@
<!-- Security: Permission Manager -->
<bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.PermissionManager</value>
</property>
@@ -258,7 +258,7 @@
<bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl"
class="org.apache.jetspeed.security.impl.PermissionManagerImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<list>
<bean class="org.apache.jetspeed.security.spi.impl.FolderPermission$Factory" />
@@ -277,7 +277,7 @@
<bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalManagerProvider"
class="org.apache.jetspeed.security.impl.JetspeedPrincipalManagerProviderImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<set>
<ref bean="org.apache.jetspeed.security.UserManager" />
@@ -290,7 +290,7 @@
<bean id="userIsMemberOfRoleAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsMemberOfPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.RoleManager" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
@@ -298,7 +298,7 @@
<bean id="userIsMemberOfGroupAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsMemberOfPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
@@ -306,7 +306,7 @@
<bean id="groupIsMemberOfRoleAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsMemberOfPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.GroupManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.RoleManager" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
@@ -314,34 +314,34 @@
<bean id="roleIsARoleAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsAPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.RoleManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
</bean>
<bean id="roleIsPartOfRoleAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsPartOfPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.RoleManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
</bean>
<bean id="groupIsAGroupAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsAPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.GroupManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
</bean>
<bean id="groupIsPartOfGroupAssociationHandler"
class="org.apache.jetspeed.security.spi.impl.IsPartOfPrincipalAssociationHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.GroupManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager" />
</bean>
<bean id="userSubjectRolesResolver" class="org.apache.jetspeed.security.spi.impl.UserSubjectPrincipalsResolverImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
<constructor-arg index="2">
@@ -378,7 +378,7 @@
<bean id="userSubjectGroupsResolver"
class="org.apache.jetspeed.security.spi.impl.UserSubjectPrincipalsResolverImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
<constructor-arg index="2">
@@ -421,6 +421,6 @@
</constructor-arg>
</bean>
<bean id="org.apache.jetspeed.security.PrincipalManagerEventAdapter" class="org.apache.jetspeed.security.PrincipalManagerEventAdapter" >
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml Thu Apr 16 05:19:05 2009
@@ -41,7 +41,7 @@
<!-- Security: Authorization Provider -->
<bean id="org.apache.jetspeed.security.AuthorizationProvider"
class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml Thu Apr 16 05:19:05 2009
@@ -23,7 +23,7 @@
<!-- require a non-empty password -->
<bean id="org.apache.jetspeed.security.spi.CredentialPasswordValidator"
class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<!-- UNCOMMENT TO TURN ON Regex-based password validation. The pattern below gives:
* Must be at least 6 characters
@@ -36,7 +36,7 @@
<!-- MessageDigest encode passwords using SHA-1 -->
<bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<value>SHA-1</value>
</constructor-arg>
@@ -53,7 +53,7 @@
<!--
<bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator" />
</constructor-arg>
@@ -104,7 +104,7 @@
<!--
<bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<list>
@@ -120,7 +120,7 @@
<!--
<bean id="org.apache.jetspeed.security.spi.CredentialHandler"
class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
@@ -138,7 +138,7 @@
may demarcate its own transactions -->
<!--<bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"
class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg>
<ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
</constructor-arg>
@@ -146,7 +146,7 @@
<bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy"
name="userSecurityHandler">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
</property>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml Thu Apr 16 05:19:05 2009
@@ -23,14 +23,14 @@
<bean id="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager"
class="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager" init-method="init">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/security_repository.xml</value>
</constructor-arg>
</bean>
<bean id="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>
org.apache.jetspeed.security.spi.JetspeedPermissionAccessManager,
@@ -100,14 +100,14 @@
<bean id="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl"
class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
<constructor-arg index="2" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" />
</bean>
<bean id="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.spi.UserPasswordCredentialManager</value>
</property>
@@ -123,7 +123,7 @@
<bean id="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl"
class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.CredentialPasswordEncoder" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.CredentialPasswordValidator" />
<constructor-arg index="2">
@@ -137,7 +137,7 @@
</bean>
<bean id="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager</value>
</property>
@@ -154,7 +154,7 @@
<bean id="org.apache.jetspeed.security.CredentialPasswordEncoder"
class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
<constructor-arg index="0">
<value>SHA-1</value>
</constructor-arg>
@@ -162,12 +162,12 @@
<bean id="org.apache.jetspeed.security.CredentialPasswordValidator"
class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
- <meta key="j2:cat" value="default,security" />
+ <meta key="j2:cat" value="default or security" />
</bean>
<bean id="org.apache.jetspeed.security.spi.AuthorizationProvider"
class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
- <meta key="j2:cat" value="default,security,AuthorizationProvider" />
+ <meta key="j2:cat" value="default or security or AuthorizationProvider" />
<constructor-arg index="0">
<ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy" />
</constructor-arg>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=765465&r1=765464&r2=765465&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml Thu Apr 16 05:19:05 2009
@@ -4,7 +4,7 @@
<bean id="org.apache.jetspeed.serializer.JetspeedSerializer" name="JetspeedSerializer"
class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
- <meta key="j2:cat" value="default,serializer" />
+ <meta key="j2:cat" value="default or serializer" />
<constructor-arg index="0">
<list>
<bean class="org.apache.jetspeed.serializer.JetspeedCapabilitiesSerializer">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org