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 [3/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/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/cache.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/cache.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/cache.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="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="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/capabilities.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml Fri Feb 20 16:32:05 2009
@@ -19,8 +19,9 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <!-- Capabilities DAO-->
-  <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
-    <meta key="j2:cat" value="default,capabilities" />
+  <bean class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
+    <meta key="j2:cat" value="ojb and (default or capabilities)" />
+    <meta key="j2:alias" value="capabilitiesImpl" />
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
     </constructor-arg>
@@ -39,8 +40,9 @@
   </bean>
 
   <!-- Capabilities -->
-  <bean id="org.apache.jetspeed.capabilities.Capabilities" name="capabilities" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,capabilities" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or capabilities)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.capabilities.Capabilities,capabilities" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.capabilities.Capabilities</value>
     </property>
@@ -60,27 +62,79 @@
     </property>
   </bean>
 
-
   <!-- Capability related content -->
 
   <!-- Client -->
-  <bean id="Client" class="org.apache.jetspeed.capabilities.impl.ClientImpl" scope="prototype">
-    <meta key="j2:cat" value="default,capabilities" />
+  <bean class="org.apache.jetspeed.capabilities.impl.ClientImpl" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or capabilities)" />
+    <meta key="j2:alias" value="Client" />
   </bean>
 
   <!-- MediaType -->
-  <bean id="MediaType" class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl" scope="prototype">
-    <meta key="j2:cat" value="default,capabilities" />
+  <bean class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or capabilities)" />
+    <meta key="j2:alias" value="MediaType" />
   </bean>
 
   <!-- MimeType -->
-  <bean id="MimeType" class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl" scope="prototype">
-    <meta key="j2:cat" value="default,capabilities" />
+  <bean class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or capabilities)" />
+    <meta key="j2:alias" value="MimeType" />
   </bean>
 
   <!-- Capability -->
-  <bean id="Capability" class="org.apache.jetspeed.capabilities.impl.CapabilityImpl" scope="prototype">
-    <meta key="j2:cat" value="default,capabilities" />
+  <bean class="org.apache.jetspeed.capabilities.impl.CapabilityImpl" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or capabilities)" />
+    <meta key="j2:alias" value="Capability" />
+  </bean>
+
+  <!-- JPA/OpenJPA Capabilities Components -->
+  <bean class="org.apache.jetspeed.capabilities.jpa.ClientImpl" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <meta key="j2:alias" value="Client"/>
+  </bean>
+  <bean class="org.apache.jetspeed.capabilities.jpa.MediaTypeImpl" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <meta key="j2:alias" value="MediaType"/>
+  </bean>
+  <bean class="org.apache.jetspeed.capabilities.jpa.MimeTypeImpl" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <meta key="j2:alias" value="MimeType"/>
+  </bean>
+  <bean class="org.apache.jetspeed.capabilities.jpa.CapabilityImpl" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <meta key="j2:alias" value="Capability"/>
+  </bean>
+  <bean class="org.apache.jetspeed.capabilities.jpa.JetspeedCapabilities">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.capabilities.Capabilities,capabilities,capabilitiesImpl"/>
+    <constructor-arg index="0"><value>Client</value></constructor-arg>
+    <constructor-arg index="1"><value>MediaType</value></constructor-arg>
+    <constructor-arg index="2"><value>MimeType</value></constructor-arg>
+    <constructor-arg index="3"><value>Capability</value></constructor-arg>
+  </bean>
+
+  <!-- JPA Capabilities Manager Context -->
+  <bean id="capabilitiesManagerContext" class="org.apache.jetspeed.capabilities.jpa.CapabilitiesManagerContext" scope="prototype" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <property name="capabilitiesManager" ref="capabilities"/>
+  </bean>
+
+  <!-- OpenJPA/Atomikos Configuration -->
+  <bean id="jpaCapabilitiesProperties" class="org.apache.jetspeed.components.rdbms.jpa.OpenJPAConfigurationProperties">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <property name="jpaProperties">
+      <props>
+        <prop key="openjpa.ConnectionFactoryMode">managed</prop>
+        <prop key="openjpa.TransactionMode">managed</prop>
+        <prop key="openjpa.ManagedRuntime">invocation(TransactionManagerMethod=com.atomikos.icatch.jta.TransactionManagerImp.getTransactionManager)</prop>
+      </props>
+    </property>
+  </bean>
+  <bean id="capabilitiesEntityManagerFactory" parent="abstractEntityManagerFactory">
+    <meta key="j2:cat" value="jpa and (default or capabilities)"/>
+    <property name="persistenceUnitName" value="jetspeed-capabilities"/>
+    <property name="jpaProperties" ref="jpaCapabilitiesProperties"/>
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml Fri Feb 20 16:32:05 2009
@@ -70,7 +70,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="ServletRequestFactory" /></constructor-arg>
     <constructor-arg index='1'><ref bean="ServletResponseFactory" /></constructor-arg>
     <constructor-arg index='2'><ref bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>

Added: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml?rev=746287&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml (added)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/jpa-jta.xml Fri Feb 20 16:32:05 2009
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+      http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+      http://www.springframework.org/schema/tx
+      http://www.springframework.org/schema/tx/spring-tx.xsd">
+
+  <!-- OJB Configuration -->
+  <bean id="ojbTransactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
+    <meta key="j2:cat" value="ojb"/>
+  </bean>
+
+  <!-- JPA/OpenJPA Configuration -->
+  <bean id="persistenceUnitManager" class="org.apache.jetspeed.components.rdbms.jpa.MergingPersistenceUnitManager">
+    <meta key="j2:cat" value="jpa"/>
+    <property name="dataSources">
+      <map>
+        <entry key="jetspeed-xa" value-ref="JetspeedXADS"/>
+        <entry key="jetspeed" value-ref="JetspeedDS"/>
+      </map>
+    </property>
+    <property name="defaultDataSource" ref="JetspeedDS"/>
+    <property name="persistenceXmlLocations">
+      <list>
+        <value>classpath*:META-INF/persistence.xml</value>
+      </list>
+    </property>
+  </bean>
+  <bean id="abstractEntityManagerFactory" abstract="true" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+    <meta key="j2:cat" value="jpa"/>
+    <property name="persistenceUnitManager" ref="persistenceUnitManager"/>
+    <property name="jpaDialect">
+      <bean class="org.springframework.orm.jpa.vendor.OpenJpaDialect"/>
+    </property>
+  </bean>
+
+  <!-- Spring/Atomikos/JTA Transaction Manager -->
+  <bean id="atomikosUserTransactionService" class="com.atomikos.icatch.config.UserTransactionServiceImp" init-method="init" destroy-method="shutdownForce">
+    <meta key="j2:cat" value="jpa"/>
+    <constructor-arg>
+      <props>
+        <!-- standard atomikos standalone configuration -->
+        <prop key="com.atomikos.icatch.service">com.atomikos.icatch.standalone.UserTransactionServiceFactory</prop>
+        <!-- server/process name overrides for log file names -->
+        <prop key="com.atomikos.icatch.tm_unique_name">${com.atomikos.icatch.tm_unique_name}</prop>
+        <prop key="com.atomikos.icatch.log_base_dir">${com.atomikos.icatch.log_base_dir}</prop>
+        <prop key="com.atomikos.icatch.log_base_name">${com.atomikos.icatch.log_base_name}</prop>
+        <prop key="com.atomikos.icatch.output_dir">${com.atomikos.icatch.output_dir}</prop>
+        <prop key="com.atomikos.icatch.console_file_name">${com.atomikos.icatch.console_file_name}</prop>
+      </props>
+    </constructor-arg>
+  </bean>
+  <bean id="atomikosTransactionManager" class="com.atomikos.icatch.jta.UserTransactionManager" init-method="init" destroy-method="close" depends-on="atomikosUserTransactionService">
+    <meta key="j2:cat" value="jpa"/>
+    <property name="forceShutdown" value="true"/>
+  </bean>
+  <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
+    <meta key="j2:cat" value="jpa"/>
+    <property name="transactionManager" ref="atomikosTransactionManager"/>
+    <property name="userTransactionName" value="java:comp/UserTransaction"/>
+  </bean>
+  <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor">
+    <meta key="j2:cat" value="jpa"/>
+  </bean>
+
+  <!-- Spring Transaction Annotations -->
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="ojb"/>
+    <meta key="j2:alias" value="transactionManager"/>
+    <property name="targetBeanName" value="ojbTransactionManager"/>
+  </bean>
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="jpa"/>
+    <meta key="j2:alias" value="transactionManager"/>
+    <property name="targetBeanName" value="jtaTransactionManager"/>
+  </bean>
+  <tx:annotation-driven transaction-manager="transactionManager"/>
+
+</beans>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml Fri Feb 20 16:32: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>
@@ -145,8 +145,9 @@
 
   <!-- Database PageManager -->
 
-  <bean id="dbPageManagerImpl" class="org.apache.jetspeed.page.impl.DatabasePageManager" init-method="init">
-    <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+  <bean class="org.apache.jetspeed.page.impl.DatabasePageManager" init-method="init">
+    <meta key="j2:cat" value="ojb and (dbPageManager or pageSerializer)" />
+    <meta key="j2:alias" value="dbPageManagerImpl" />
     <!-- OJB configuration file resource path -->
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/page-manager-repository.xml</value>
@@ -169,9 +170,9 @@
     </constructor-arg>
   </bean>
 
-  <bean id="dbPageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-    <meta key="j2:cat" value="dbPageManager,pageSerializer" />
-    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager" />
+  <bean class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <meta key="j2:cat" value="ojb and (dbPageManager or pageSerializer)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager,dbPageManager" />
     <property name="transactionManager">
       <ref bean="transactionManager" />
     </property>
@@ -233,7 +234,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="ojb and (dbPageManager or pageSerializer)" />
     <property name="targetObject">
       <ref bean="dbPageManagerImpl" />
     </property>
@@ -247,6 +248,51 @@
     </property>
   </bean>
 
+  <!-- JPA/OpenJPA Database Page Manager -->
+  <bean class="org.apache.jetspeed.page.jpa.OpenJPADatabasePageManagerImpl" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (dbPageManager or pageSerializer)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager,dbPageManager,dbPageManagerImpl"/>
+    <!-- permissions security enabled flag, default=false -->
+    <constructor-arg index="0"><value>${page.manager.permissions.security}</value></constructor-arg>
+    <!-- constraints security enabled flag, default=true -->
+    <constructor-arg index="1"><value>${page.manager.constraints.security}</value></constructor-arg>
+  </bean>
+
+  <!-- Inject Database Page Manager Proxy into JPA Database Page Manager -->
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <meta key="j2:cat" value="jpa and (dbPageManager or pageSerializer)"/>
+    <property name="targetObject" ref="dbPageManagerImpl"/>
+    <property name="targetMethod" value="setDatabasePageManagerProxy"/>
+    <property name="arguments">
+      <list>
+        <ref bean="dbPageManager"/>
+      </list>
+    </property>
+  </bean>
+
+  <!-- JPA Database Page Manager Context -->
+  <bean id="pageManagerContext" class="org.apache.jetspeed.page.jpa.DatabasePageManagerContext" scope="prototype" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (dbPageManager or pageSerializer)"/>
+    <property name="databasePageManager" ref="dbPageManager"/>
+  </bean>
+
+  <!-- OpenJPA/Atomikos Configuration -->
+  <bean id="jpaPageManagerProperties" class="org.apache.jetspeed.page.jpa.OpenJPADatabasePageManagerProperties">
+    <meta key="j2:cat" value="jpa and (dbPageManager or pageSerializer)"/>
+    <property name="jpaProperties">
+      <props>
+        <prop key="openjpa.ConnectionFactoryMode">managed</prop>
+        <prop key="openjpa.TransactionMode">managed</prop>
+        <prop key="openjpa.ManagedRuntime">invocation(TransactionManagerMethod=com.atomikos.icatch.jta.TransactionManagerImp.getTransactionManager)</prop>
+      </props>
+    </property>
+  </bean>
+  <bean id="pageManagerEntityManagerFactory" parent="abstractEntityManagerFactory">
+    <meta key="j2:cat" value="jpa and (dbPageManager or pageSerializer)"/>
+    <property name="persistenceUnitName" value="jetspeed-page-manager"/>
+    <property name="jpaProperties" ref="jpaPageManagerProperties"/>
+  </bean>
+
   <!-- End Database PageManager -->
 
   <!-- FactoryBean selecting which PageManager to use -->

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml Fri Feb 20 16:32:05 2009
@@ -19,8 +19,9 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <!-- Profiler -->
-  <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
-    <meta key="j2:cat" value="default,profiler" />
+  <bean class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
+    <meta key="j2:cat" value="ojb and (default or profiler)" />
+    <meta key="j2:alias" value="profilerImpl" />
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
     </constructor-arg>
@@ -54,8 +55,9 @@
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,profiler" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or profiler)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.profiler.Profiler,profiler" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.profiler.Profiler</value>
     </property>
@@ -74,8 +76,42 @@
     </property>
   </bean>
 
+  <!-- Profiling Rules -->
+
+  <!-- Standard Profiler -->
+  <bean id="StandardProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or profiler)" />
+    <meta key="j2:alias" value="StandardProfilingRule" />
+  </bean>
+
+  <!-- Fallback Profiler -->
+  <bean class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or profiler)" />
+    <meta key="j2:alias" value="RoleFallbackProfilingRule" />
+  </bean>
+
+  <!-- Principal Rule -->
+  <bean class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or profiler)" />
+    <meta key="j2:alias" value="PrincipalRule" />
+  </bean>
+
+  <!-- Rule Criterion -->
+  <bean class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype">
+    <meta key="j2:cat" value="ojb and (default or profiler)" />
+    <meta key="j2:alias" value="RuleCriterion" />
+  </bean>
+
+  <!-- Profiling Locator -->
+
+  <bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype">
+    <meta key="j2:cat" value="default or profiler" />
+  </bean>
+
+  <!-- Profiling Resolvers -->
+
   <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,102 +179,128 @@
   </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 -->
-
-  <!-- Standard Profiler -->
-  <bean id="StandardProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
-    scope="prototype">
-    <meta key="j2:cat" value="default,profiler" />
-  </bean>
-
-  <!-- Fallback Profiler -->
-  <bean id="RoleFallbackProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
-    scope="prototype">
-    <meta key="j2:cat" value="default,profiler" />
+  <!-- JPA/OpenJPA Profiler Components -->
+  <bean class="org.apache.jetspeed.profiler.rules.jpa.StandardProfilingRule" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <meta key="j2:alias" value="StandardProfilingRule"/>
+  </bean>
+  <bean class="org.apache.jetspeed.profiler.rules.jpa.RoleFallbackProfilingRule" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <meta key="j2:alias" value="RoleFallbackProfilingRule"/>
+  </bean>
+  <bean class="org.apache.jetspeed.profiler.rules.jpa.PrincipalRuleImpl" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <meta key="j2:alias" value="PrincipalRule"/>
+  </bean>
+  <bean class="org.apache.jetspeed.profiler.rules.jpa.RuleCriterionImpl" scope="prototype">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <meta key="j2:alias" value="RuleCriterion"/>
+  </bean>
+  <bean class="org.apache.jetspeed.profiler.jpa.JetspeedProfilerImpl">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.profiler.Profiler,profiler,profilerImpl"/>
+    <constructor-arg index="0"><value>j2</value></constructor-arg>
+    <constructor-arg index="1"><ref bean="ProfileResolvers"/></constructor-arg>
+    <constructor-arg index="2">
+      <map>
+        <entry key="locator"><value>ProfileLocator</value></entry>
+        <entry key="principal"><value>PrincipalRule</value></entry>
+        <entry key="standard"><value>StandardProfilingRule</value></entry>
+        <entry key="fallback"><value>RoleFallbackProfilingRule</value></entry>
+      </map>
+    </constructor-arg>
+    <constructor-arg index="3"><value>RuleCriterion</value></constructor-arg>
   </bean>
 
-  <!-- Locator -->
-  <bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype">
-    <meta key="j2:cat" value="default,profiler" />
+  <!-- JPA Profiler Manager Context -->
+  <bean id="profilerManagerContext" class="org.apache.jetspeed.profiler.jpa.ProfilerManagerContext" scope="prototype" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <property name="profilerManager" ref="profiler"/>
   </bean>
 
-  <!-- Principal Rule -->
-  <bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype">
-    <meta key="j2:cat" value="default,profiler" />
+  <!-- OpenJPA/Atomikos Configuration -->
+  <bean id="jpaProfilerProperties" class="org.apache.jetspeed.components.rdbms.jpa.OpenJPAConfigurationProperties">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <property name="jpaProperties">
+      <props>
+        <prop key="openjpa.ConnectionFactoryMode">managed</prop>
+        <prop key="openjpa.TransactionMode">managed</prop>
+        <prop key="openjpa.ManagedRuntime">invocation(TransactionManagerMethod=com.atomikos.icatch.jta.TransactionManagerImp.getTransactionManager)</prop>
+      </props>
+    </property>
   </bean>
-
-
-  <!-- Rule Criterion -->
-  <bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype">
-    <meta key="j2:cat" value="default,profiler" />
+  <bean id="profilerEntityManagerFactory" parent="abstractEntityManagerFactory">
+    <meta key="j2:cat" value="jpa and (default or profiler)"/>
+    <property name="persistenceUnitName" value="jetspeed-profiler"/>
+    <property name="jpaProperties" ref="jpaProfilerProperties"/>
   </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/registry.xml Fri Feb 20 16:32: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">
@@ -38,10 +38,9 @@
   </bean>
 
   <!-- Portlet Registry DAO-->
-  <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry"
-    init-method="init">
-    <meta key="j2:cat" value="default,registry" />
-
+  <bean class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
+    <meta key="j2:cat" value="ojb and (default or registry)" />
+    <meta key="j2:alias" value="portletRegistryImpl" />
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/registry_repository.xml</value>
     </constructor-arg>
@@ -62,9 +61,9 @@
     </constructor-arg>    
   </bean>
 
-  <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry"
-    parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,registry" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or registry)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.components.portletregistry.PortletRegistry,portletRegistry" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
     </property>
@@ -89,11 +88,9 @@
     </property>
   </bean>
 
-    <bean id="org.apache.pluto.services.PreferencesService" name="PortletPreferencesProviderImpl"
-          class="org.apache.jetspeed.components.portletpreferences.PortletPreferencesServiceImpl"
-	    init-method="init" destroy-method="destroy">
-          
-      <meta key="j2:cat" value="default,registry" />          
+  <bean class="org.apache.jetspeed.components.portletpreferences.PortletPreferencesServiceImpl" init-method="init" destroy-method="destroy">
+    <meta key="j2:cat" value="ojb and (default or registry)" />
+    <meta key="j2:alias" value="org.apache.pluto.services.PreferencesService,PortletPreferencesProviderImpl" />
     <constructor-arg index="0">
       <ref bean="portletFactory" />
     </constructor-arg>
@@ -103,9 +100,9 @@
     <property name="useEntityPreferences" ><value>true</value></property>
     </bean>
 
-  <bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy"
-    name="portletPreferencesProvider" destroy-method="destroy">
-    <meta key="j2:cat" value="default,registry" />
+  <bean parent="baseTransactionProxy" destroy-method="destroy">
+    <meta key="j2:cat" value="ojb and (default or registry)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider,portletPreferencesProvider" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider</value>
     </property>
@@ -127,9 +124,9 @@
     - but this is cleaner as there is no need to ever access the unwrapped object.
   -->
 
-  <bean id="portletEntityAccessImpl"
-    class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
-    <meta key="j2:cat" value="default,registry" />
+  <bean class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
+    <meta key="j2:cat" value="ojb and (default or registry)" />
+    <meta key="j2:alias" value="portletEntityAccessImpl" />
     <constructor-arg>
       <ref bean="portletRegistry" />
     </constructor-arg>
@@ -146,9 +143,9 @@
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy"
-    name="portletEntityAccess">
-    <meta key="j2:cat" value="default,registry" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or registry)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent,portletEntityAccess" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
     </property>
@@ -174,4 +171,52 @@
     </property>
   </bean>
 
-</beans>
\ No newline at end of file
+  <!-- JPA/OpenJPA Registry Components -->
+  <bean id="registryManager" class="org.apache.jetspeed.components.portletregistry.jpa.RegistryManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+  </bean>
+  <bean class="org.apache.jetspeed.components.portletpreferences.jpa.PortletPreferencesProviderImpl" init-method="init" destroy-method="destroy">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+    <meta key="j2:alias" value="org.apache.pluto.services.PreferencesService,PortletPreferencesProviderImpl,org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider,portletPreferencesProvider"/>
+    <constructor-arg index="0"><ref bean="registryManager"/></constructor-arg>
+    <constructor-arg index="1"><ref bean="portletFactory"/></constructor-arg>
+    <property name="useEntityPreferences"><value>true</value></property>
+  </bean>
+  <bean class="org.apache.jetspeed.components.portletentity.jpa.PortletEntityAccessComponentImpl">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent,portletEntityAccess,portletEntityAccessImpl" />
+    <constructor-arg index="0"><ref bean="registryManager"/></constructor-arg>
+    <constructor-arg index="1"><ref bean="portletRegistry"/></constructor-arg>
+    <constructor-arg index="2"><value>false</value></constructor-arg>
+  </bean>
+  <bean class="org.apache.jetspeed.components.portletregistry.jpa.OpenJPAPortletRegistryImpl" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.components.portletregistry.PortletRegistry,portletRegistry,portletRegistryImpl" />
+    <constructor-arg index="0"><ref bean="registryManager"/></constructor-arg>
+    <constructor-arg index="1"><ref bean="portletPreferencesProvider"/></constructor-arg>
+  </bean>
+
+  <!-- JPA Registry Manager Context -->
+  <bean id="registryManagerContext" class="org.apache.jetspeed.components.portletregistry.jpa.RegistryManagerContext" scope="prototype" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+    <property name="registryManager" ref="registryManager"/>
+  </bean>
+
+  <!-- OpenJPA/Atomikos Configuration -->
+  <bean id="jpaRegistryProperties" class="org.apache.jetspeed.components.rdbms.jpa.OpenJPAConfigurationProperties">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+    <property name="jpaProperties">
+      <props>
+        <prop key="openjpa.ConnectionFactoryMode">managed</prop>
+        <prop key="openjpa.TransactionMode">managed</prop>
+        <prop key="openjpa.ManagedRuntime">invocation(TransactionManagerMethod=com.atomikos.icatch.jta.TransactionManagerImp.getTransactionManager)</prop>
+      </props>
+    </property>
+  </bean>
+  <bean id="registryEntityManagerFactory" parent="abstractEntityManagerFactory">
+    <meta key="j2:cat" value="jpa and (default or registry)"/>
+    <property name="persistenceUnitName" value="jetspeed-registry"/>
+    <property name="jpaProperties" ref="jpaRegistryProperties"/>
+  </bean>
+
+</beans>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/search.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/search.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/search.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml Fri Feb 20 16:32: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/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Fri Feb 20 16:32:05 2009
@@ -18,9 +18,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.user"
-    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
     <constructor-arg index="0" value="user" />
     <constructor-arg index="1" value="org.apache.jetspeed.security.impl.UserImpl" />
     <constructor-arg index="2">
@@ -55,9 +55,9 @@
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.role"
-    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
     <constructor-arg index="0" value="role" />
     <constructor-arg index="1" value="org.apache.jetspeed.security.impl.RoleImpl" />
     <constructor-arg index="2">
@@ -80,9 +80,9 @@
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.group"
-    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
     <constructor-arg index="0" value="group" />
     <constructor-arg index="1" value="org.apache.jetspeed.security.impl.GroupImpl" />
     <constructor-arg index="2">
@@ -107,8 +107,20 @@
 
   <!-- Security: User Manager -->
 
-  <bean id="org.apache.jetspeed.security.UserManager" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.UserManagerImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.impl.UserManagerImpl" />
+    <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" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+    <constructor-arg index="5" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
+  </bean>
+
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.UserManager" />
     <property name="proxyInterfaces">
       <value>
         org.apache.jetspeed.security.UserManager, org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -129,20 +141,9 @@
     </property>
   </bean>
 
-  <bean id="org.apache.jetspeed.security.impl.UserManagerImpl"
-    class="org.apache.jetspeed.security.impl.UserManagerImpl">
-    <meta key="j2:cat" value="default,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" />
-    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
-    <constructor-arg index="5" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
-  </bean>
-
   <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <meta key="j2:cat" value="default,security" />
-    <property name="targetObject"><ref local="org.apache.jetspeed.security.impl.UserManagerImpl"/></property>
+    <meta key="j2:cat" value="default or security" />
+    <property name="targetObject"><ref bean="org.apache.jetspeed.security.impl.UserManagerImpl"/></property>
     <property name="targetMethod"><value>addListener</value></property>
     <property name="arguments">
       <ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
@@ -151,8 +152,19 @@
 
   <!-- Security: Group Manager -->
 
-  <bean id="org.apache.jetspeed.security.GroupManager" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.GroupManagerImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.impl.GroupManagerImpl" />
+    <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" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+  </bean>
+
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.GroupManager" />
     <property name="proxyInterfaces">
       <value>
         org.apache.jetspeed.security.GroupManager,org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -172,19 +184,9 @@
     </property>
   </bean>
 
-  <bean id="org.apache.jetspeed.security.impl.GroupManagerImpl"
-    class="org.apache.jetspeed.security.impl.GroupManagerImpl">
-    <meta key="j2:cat" value="default,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" />
-    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
-  </bean>
-
   <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <meta key="j2:cat" value="default,security" />
-    <property name="targetObject"><ref local="org.apache.jetspeed.security.impl.GroupManagerImpl"/></property>
+    <meta key="j2:cat" value="default or security" />
+    <property name="targetObject"><ref bean="org.apache.jetspeed.security.impl.GroupManagerImpl"/></property>
     <property name="targetMethod"><value>addListener</value></property>
     <property name="arguments">
       <ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
@@ -193,8 +195,19 @@
 
   <!-- Security: Role Manager -->
 
-  <bean id="org.apache.jetspeed.security.RoleManager" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.RoleManagerImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.impl.RoleManagerImpl" />
+    <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" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+  </bean>
+
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.RoleManager" />
     <property name="proxyInterfaces">
       <value>
         org.apache.jetspeed.security.RoleManager,org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -214,19 +227,9 @@
     </property>
   </bean>
 
-  <bean id="org.apache.jetspeed.security.impl.RoleManagerImpl"
-    class="org.apache.jetspeed.security.impl.RoleManagerImpl">
-    <meta key="j2:cat" value="default,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" />
-    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
-  </bean>
-
   <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <meta key="j2:cat" value="default,security" />
-    <property name="targetObject"><ref local="org.apache.jetspeed.security.impl.RoleManagerImpl"/></property>
+    <meta key="j2:cat" value="default or security" />
+    <property name="targetObject"><ref bean="org.apache.jetspeed.security.impl.RoleManagerImpl"/></property>
     <property name="targetMethod"><value>addListener</value></property>
     <property name="arguments">
       <ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
@@ -235,8 +238,28 @@
 
   <!-- Security: Permission Manager -->
 
-  <bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean class="org.apache.jetspeed.security.impl.PermissionManagerImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.impl.PermissionManagerImpl" />
+    <constructor-arg index="0">
+      <list>
+        <bean class="org.apache.jetspeed.security.spi.impl.FolderPermission$Factory" />
+        <bean class="org.apache.jetspeed.security.spi.impl.FragmentPermission$Factory" />
+        <bean class="org.apache.jetspeed.security.spi.impl.PagePermission$Factory" />
+        <bean class="org.apache.jetspeed.security.spi.impl.PortletPermission$Factory" />
+      </list>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    </constructor-arg>
+  </bean>
+
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.PermissionManager" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.security.PermissionManager</value>
     </property>
@@ -256,28 +279,9 @@
     </property>
   </bean>
 
-  <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl"
-    class="org.apache.jetspeed.security.impl.PermissionManagerImpl">
-    <meta key="j2:cat" value="default,security" />
-    <constructor-arg index="0">
-      <list>
-        <bean class="org.apache.jetspeed.security.spi.impl.FolderPermission$Factory" />
-        <bean class="org.apache.jetspeed.security.spi.impl.FragmentPermission$Factory" />
-        <bean class="org.apache.jetspeed.security.spi.impl.PagePermission$Factory" />
-        <bean class="org.apache.jetspeed.security.spi.impl.PortletPermission$Factory" />
-      </list>
-    </constructor-arg>
-    <constructor-arg index="1">
-      <ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-    </constructor-arg>
-    <constructor-arg index="2">
-      <ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-    </constructor-arg>
-  </bean>
-
   <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 +294,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 +302,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 +310,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 +318,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 +382,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 +425,123 @@
     </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
+
+  <!-- JPA/OpenJPA Security Components -->
+  <bean class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.JetspeedPrincipalType.user"/>
+    <constructor-arg index="0" value="user"/>
+    <constructor-arg index="1" value="org.apache.jetspeed.security.jpa.UserImpl"/>
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0"><value>true</value></constructor-arg>
+        <constructor-arg index="1"><value>false</value></constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.user.subsite"/>
+              <constructor-arg index="1" value="jetspeed"/>
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.prefered.locale"/>
+              <constructor-arg index="1" value="jetspeed"/>
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="user.name.given"/>
+              <constructor-arg index="1" value="info"/>
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="user.name.family"/>
+              <constructor-arg index="1" value="info"/>
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+  <bean class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.JetspeedPrincipalType.role"/>
+    <constructor-arg index="0" value="role"/>
+    <constructor-arg index="1" value="org.apache.jetspeed.security.jpa.RoleImpl"/>
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0"><value>true</value></constructor-arg>
+        <constructor-arg index="1"><value>false</value></constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="role.display.name"/>
+              <constructor-arg index="1" value="info"/>
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+  <bean class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.JetspeedPrincipalType.group"/>
+    <constructor-arg index="0" value="group"/>
+    <constructor-arg index="1" value="org.apache.jetspeed.security.jpa.GroupImpl"/>
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0"><value>true</value></constructor-arg>
+        <constructor-arg index="1"><value>false</value></constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="group.display.name"/>
+              <constructor-arg index="1" value="info"/>
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+  <bean class="org.apache.jetspeed.security.jpa.UserManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.UserManager,org.apache.jetspeed.security.impl.UserManagerImpl"/>
+    <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"/>
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+    <constructor-arg index="5" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
+  </bean>
+  <bean class="org.apache.jetspeed.security.jpa.GroupManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.GroupManager,org.apache.jetspeed.security.impl.GroupManagerImpl"/>
+    <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" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+  </bean>
+  <bean class="org.apache.jetspeed.security.jpa.RoleManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.RoleManager,org.apache.jetspeed.security.impl.RoleManagerImpl"/>
+    <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" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+  </bean>
+  <bean class="org.apache.jetspeed.security.jpa.PermissionManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.security.PermissionManager,org.apache.jetspeed.security.impl.PermissionManagerImpl"/>
+    <constructor-arg index="0">
+      <list>
+        <bean class="org.apache.jetspeed.security.spi.impl.FolderPermission$Factory"/>
+        <bean class="org.apache.jetspeed.security.spi.impl.FragmentPermission$Factory"/>
+        <bean class="org.apache.jetspeed.security.spi.impl.PagePermission$Factory"/>
+        <bean class="org.apache.jetspeed.security.spi.impl.PortletPermission$Factory"/>
+      </list>
+    </constructor-arg>
+    <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/></constructor-arg>
+    <constructor-arg index="2"><ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/></constructor-arg>
+  </bean>
+
+</beans>

Modified: portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml (original)
+++ portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml Fri Feb 20 16:32: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>



---------------------------------------------------------------------
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