portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r746287 [2/4] - in /portals/jetspeed-2/portal/branches/JPA_BRANCH: components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/ components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ components/jetspeed-cm/sr...
Date Fri, 20 Feb 2009 16:32:07 GMT
Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/cache-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/cache-test.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/cache-test.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-profiler/src/test/resources/cache-test.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java Fri Feb 20 16:32:05 2009
@@ -91,6 +91,9 @@
     
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        // despite setting up JNDI datasource, current OJB
+        // test configuration apparently relies on jdbcDS
+        // instead of utilizing jndiDS as one might expect!
+        return "default,ojb,jdbcDS";
     }
 }

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestOpenJPAPortletEntityDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestOpenJPAPortletEntityDAO.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestOpenJPAPortletEntityDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestOpenJPAPortletEntityDAO.java Fri Feb 20 16:32:05 2009
@@ -48,7 +48,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java Fri Feb 20 16:32:05 2009
@@ -279,7 +279,7 @@
 
     protected String getBeanDefinitionFilterCategories()
     {
-        return "registry,transaction,cache,jdbcDS";
+        return "ojb,registry,transaction,cache,jdbcDS";
     }
     
     protected String[] getConfigurations()

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestOpenJPAPortletPreferencesProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestOpenJPAPortletPreferencesProvider.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestOpenJPAPortletPreferencesProvider.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletpreferences/TestOpenJPAPortletPreferencesProvider.java Fri Feb 20 16:32:05 2009
@@ -48,7 +48,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java Fri Feb 20 16:32:05 2009
@@ -189,7 +189,7 @@
 
     protected String getBeanDefinitionFilterCategories()
     {
-        return "registry,transaction,cache,jdbcDS";
+        return "ojb,registry,transaction,cache,jdbcDS";
     }
     
     protected String[] getConfigurations()
@@ -198,4 +198,4 @@
         { "transaction.xml", "registry-test.xml", "cache-test.xml", "static-bean-references.xml" };
     }
 
-}
\ No newline at end of file
+}

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPAPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPAPortletRegistryDAO.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPAPortletRegistryDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPAPortletRegistryDAO.java Fri Feb 20 16:32:05 2009
@@ -48,7 +48,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPARegistryCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPARegistryCache.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPARegistryCache.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestOpenJPARegistryCache.java Fri Feb 20 16:32:05 2009
@@ -48,7 +48,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java Fri Feb 20 16:32:05 2009
@@ -299,7 +299,7 @@
 
     protected String getBeanDefinitionFilterCategories()
     {
-        return "registry,transaction,cache,jdbcDS";
+        return "ojb,registry,transaction,cache,jdbcDS";
     }
     
     protected String[] getConfigurations()

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java Fri Feb 20 16:32:05 2009
@@ -164,7 +164,7 @@
     
     protected String getBeanDefinitionFilterCategories()
     {
-        return "registry,transaction,cache,jdbcDS";
+        return "ojb,registry,transaction,cache,jdbcDS";
     }
     
     protected String[] getConfigurations()

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestOpenJPARegistryDirectAll.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestOpenJPARegistryDirectAll.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestOpenJPARegistryDirectAll.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestOpenJPARegistryDirectAll.java Fri Feb 20 16:32:05 2009
@@ -48,7 +48,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/cache-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/cache-test.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/cache-test.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-registry/src/test/resources/cache-test.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/jpa/SecurityAttributeValueImpl.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
 
     @Id
     @GeneratedValue (strategy=GenerationType.AUTO)
-    @Column (name="PRINCIPAL_ID")
+    @Column (name="ATTR_ID")
     @SuppressWarnings("unused")
     private Long id;
     @Version

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/JETSPEED-INF/spring/JetspeedPrincipalManagerProviderOverride.xml Fri Feb 20 16:32:05 2009
@@ -21,7 +21,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" />

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java Fri Feb 20 16:32:05 2009
@@ -141,7 +141,7 @@
     
     protected String getBeanDefinitionFilterCategories()
     {
-        return "security,dbSecurity,transaction,cache,jdbcDS";
+        return "ojb,security,dbSecurity,transaction,cache,jdbcDS";
     }
 
     protected String[] getConfigurations()
@@ -201,4 +201,4 @@
             pms.removePermission(p);
         }
     }
-}
\ No newline at end of file
+}

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAGroupManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAGroupManager.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAGroupManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAGroupManager.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPALoginModule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPALoginModule.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPALoginModule.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPALoginModule.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAPermissionManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAPermissionManager.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAPermissionManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAPermissionManager.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicy.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicy.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicy.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicyFolder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicyFolder.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicyFolder.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARdbmsPolicyFolder.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARoleManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARoleManager.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARoleManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPARoleManager.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAUserManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAUserManager.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAUserManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestOpenJPAUserManager.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/cache-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/cache-test.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/cache-test.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-security/src/test/resources/cache-test.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java Fri Feb 20 16:32:05 2009
@@ -136,7 +136,7 @@
     
     protected String getBeanDefinitionFilterCategories()
     {
-        return "security,dbSecurity,transaction,cache,jdbcDS";
+        return "ojb,security,dbSecurity,transaction,cache,jdbcDS";
     }
 
     protected String[] getConfigurations()
@@ -185,4 +185,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOComponent.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOComponent.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOComponent.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOManager.java?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOManager.java (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/TestOpenJPASSOManager.java Fri Feb 20 16:32:05 2009
@@ -47,7 +47,7 @@
      */
     protected String getBeanDefinitionFilterCategories()
     {
-        return "default,jdbcDS";
+        return "default,jpa,jndiDS";
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/cache-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/cache-test.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/cache-test.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/components/jetspeed-sso/src/test/resources/cache-test.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml Fri Feb 20 16:32:05 2009
@@ -19,15 +19,22 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <!--
-    Simply use the JNDI data source provided via Spring
+    Simply use the JNDI data sources provided via Spring
   -->
   <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">
-    <meta key="j2:cat" value="jndiDS" />
-    <property name="resourceRef" value="false" />
-    <property name="jndiName" value="java:comp/env/jdbc/jetspeed" />
+    <meta key="j2:cat" value="jndiDS"/>
+    <property name="resourceRef" value="false"/>
+    <property name="jndiName" value="java:comp/env/jdbc/jetspeed"/>
+  </bean>
+  <bean id="JetspeedXADS" class="org.springframework.jndi.JndiObjectFactoryBean">
+    <meta key="j2:cat" value="jpa and jndiDS"/>
+    <property name="resourceRef" value="false"/>
+    <property name="jndiName" value="java:comp/env/jdbc/jetspeed-xa"/>
   </bean>
 
-  <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer" />
+  <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer">
+    <meta key="j2:cat" value="ojb" />
+  </bean>
 
   <!-- 
     Dynamically configures Database Platform for OJB by looking at the connection string
@@ -37,6 +44,7 @@
   -->
   <bean id="PlatformConfigurator" class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
     init-method="init">
+    <meta key="j2:cat" value="ojb" />
     <constructor-arg index='0' ref="JetspeedDS" />
     <!-- JNDI Name -->
     <constructor-arg index='1' value="JetspeedDS" />
@@ -56,7 +64,7 @@
   -->
 
   <bean class="org.apache.jetspeed.components.datasource.SchemaAwareDataSourceProxy">
-    <meta key="j2:cat" value="schemaAwareDS" />
+    <meta key="j2:cat" value="ojb and schemaAwareDS" />
     <meta key="j2:alias" value="JetspeedDS" />
     <property name="targetDataSource" ref="dataSourceTarget" />
     <property name="schemaSql">
@@ -65,7 +73,7 @@
   </bean>
 
   <bean class="org.springframework.jndi.JndiObjectFactoryBean">
-    <meta key="j2:cat" value="schemaAwareDS" />
+    <meta key="j2:cat" value="ojb and schemaAwareDS" />
     <meta key="j2:alias" value="dataSourceTarget" />
     <property name="resourceRef" value="false" />
     <property name="jndiName" value="java:comp/env/jdbc/jetspeed" />
@@ -94,7 +102,7 @@
   -->
 
   <bean class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
-    <meta key="j2:cat" value="ojbConnectionRepositoryDS" />
+    <meta key="j2:cat" value="ojb and ojbConnectionRepositoryDS" />
     <meta key="j2:alias" value="JetspeedDS" />
     <property name="jndiName" value="java:comp/env/jdbc/jetspeed" />
   </bean>
@@ -111,7 +119,7 @@
     This property is located in /etc/db-ojb/OJB.properties in the source tree.
   -->
   <bean class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <meta key="j2:cat" value="jdbcDS" />
+    <meta key="j2:cat" value="ojb and jdbcDS" />
     <meta key="j2:alias" value="JetspeedDS" />
     <property name="driverClassName" value="${org.apache.jetspeed.database.driver}" />
     <property name="url">



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message