Loading...

jetspeed-dev@portals.apache.org

[Prev] Thread [Next]  |  [Prev] Date [Next]

svn commit: r746287 [4/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... rwatler Fri Feb 20 09:00:50 2009

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi-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-spi-atn.xml
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
 Fri Feb 20 16:32:05 2009
@@ -23,7 +23,7 @@
   <!-- require a non-empty password -->
   <bean id="org.apache.jetspeed.security.spi.CredentialPasswordValidator"
     
class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
 
     <!-- UNCOMMENT TO TURN ON Regex-based password validation. The pattern 
below gives:
       * Must be at least 6 characters
@@ -36,7 +36,7 @@
   <!-- MessageDigest encode passwords using SHA-1 -->
   <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
     
class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0">
       <value>SHA-1</value>
     </constructor-arg>
@@ -53,7 +53,7 @@
   <!--
     <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
     
class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0">
     <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator" />
     </constructor-arg>
@@ -104,7 +104,7 @@
   <!--
     <bean 
id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
     
class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0">
     <list>
     
@@ -120,7 +120,7 @@
   <!--
     <bean id="org.apache.jetspeed.security.spi.CredentialHandler"
     class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0">
     <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
     </constructor-arg>
@@ -138,7 +138,7 @@
     may demarcate its own transactions -->
   <!--<bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"
     class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg>
     <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
     </constructor-arg>
@@ -146,7 +146,7 @@
     
     <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" 
parent="baseTransactionProxy"
     name="userSecurityHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="proxyInterfaces">
     <value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
     </property>

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
 Fri Feb 20 16:32:05 2009
@@ -21,16 +21,17 @@
   <!-- ************** Security SPI Handlers ************** -->
   <!-- Security SPI: CommonQueries -->
 
-  <bean 
id="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager"
-    
class="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager"
 init-method="init">
-    <meta key="j2:cat" value="default,security" />
+  <bean 
class="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager"
 init-method="init">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager"
 />
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/security_repository.xml</value>
     </constructor-arg>
   </bean>
   
-  <bean 
id="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" 
parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
     <property name="proxyInterfaces">
       <value>
         org.apache.jetspeed.security.spi.JetspeedPermissionAccessManager,
@@ -98,16 +99,17 @@
     <property name="targetBeanName" 
value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
   </bean>
   
-  <bean 
id="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl"
-    
class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl">
-    <meta key="j2:cat" value="default,security" />
+  <bean 
class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.UserPasswordCredentialManagerImpl" />
     <constructor-arg index="0" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
     <constructor-arg index="1" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
     <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" />
   </bean>
 
-  <bean id="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" 
parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
     <property name="proxyInterfaces">
       
<value>org.apache.jetspeed.security.spi.UserPasswordCredentialManager</value>
     </property>
@@ -121,9 +123,9 @@
     </property>
   </bean>
   
-  <bean 
id="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl"
-    
class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl">
-    <meta key="j2:cat" value="default,security" />
+  <bean 
class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl"
 />
     <constructor-arg index="0" 
ref="org.apache.jetspeed.security.CredentialPasswordEncoder" />
     <constructor-arg index="1" 
ref="org.apache.jetspeed.security.CredentialPasswordValidator" />
     <constructor-arg index="2">
@@ -136,8 +138,9 @@
     </constructor-arg>
   </bean>
 
-  <bean 
id="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" 
parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" />
     <property name="proxyInterfaces">
       
<value>org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager</value>
     </property>
@@ -154,7 +157,7 @@
   
   <bean id="org.apache.jetspeed.security.CredentialPasswordEncoder"
     
class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0">
       <value>SHA-1</value>
     </constructor-arg>
@@ -162,12 +165,12 @@
 
   <bean id="org.apache.jetspeed.security.CredentialPasswordValidator"
     
class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
   </bean>
 
   <bean id="org.apache.jetspeed.security.spi.AuthorizationProvider"
     class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
-    <meta key="j2:cat" value="default,security,AuthorizationProvider" />
+    <meta key="j2:cat" value="default or security or AuthorizationProvider" />
     <constructor-arg index="0">
       <ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy" />
     </constructor-arg>
@@ -176,4 +179,52 @@
     </constructor-arg>
   </bean>
 
+  <!-- JPA/OpenJPA Security Components -->
+  <bean 
class="org.apache.jetspeed.security.spi.jpa.OpenJPAJetspeedSecurityPersistenceManager"
 init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager,org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager"/>
+  </bean>
+  <bean 
class="org.apache.jetspeed.security.spi.jpa.UserPasswordCredentialPolicyManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager,org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl"/>
+    <constructor-arg index="0" 
ref="org.apache.jetspeed.security.CredentialPasswordEncoder"/>
+    <constructor-arg index="1" 
ref="org.apache.jetspeed.security.CredentialPasswordValidator"/>
+    <constructor-arg index="2">
+      <list>
+        <bean 
class="org.apache.jetspeed.security.spi.impl.ValidatePasswordOnLoadInterceptor"/>
+        <bean 
class="org.apache.jetspeed.security.spi.impl.EncodePasswordOnFirstLoadInterceptor"/>
+      </list>
+    </constructor-arg>
+  </bean>
+  <bean 
class="org.apache.jetspeed.security.spi.jpa.UserPasswordCredentialManagerImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" 
value="org.apache.jetspeed.security.spi.UserPasswordCredentialManager,org.apache.jetspeed.security.spi.UserPasswordCredentialManagerImpl"/>
+    <constructor-arg index="0" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
+    <constructor-arg index="1" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
+    <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager"/>
+  </bean>
+
+  <!-- OpenJPA/Atomikos Configuration -->
+  <bean id="jpaSecurityProperties" 
class="org.apache.jetspeed.components.rdbms.jpa.OpenJPAConfigurationProperties">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <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="securityEntityManagerFactory" 
parent="abstractEntityManagerFactory">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <property name="persistenceUnitName" value="jetspeed-security"/>
+    <property name="jpaProperties" ref="jpaSecurityProperties"/>
+  </bean>
+
+  <!-- JPA Security Manager Context -->
+  <bean id="securityManagerContext" 
class="org.apache.jetspeed.security.spi.jpa.SecurityManagerContext" 
scope="prototype" init-method="initialize" destroy-method="terminate">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <property name="securityManager" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
+  </bean>
+
 </beans>

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
 Fri Feb 20 16:32:05 2009
@@ -4,7 +4,7 @@
 
   <bean id="org.apache.jetspeed.serializer.JetspeedSerializer" 
name="JetspeedSerializer"
     class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
-    <meta key="j2:cat" value="default,serializer" />
+    <meta key="j2:cat" value="default or serializer" />
     <constructor-arg index="0">
       <list>
         <bean 
class="org.apache.jetspeed.serializer.JetspeedCapabilitiesSerializer">

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
 Fri Feb 20 16:32:05 2009
@@ -21,20 +21,21 @@
 
   <!-- SSO Implementation -->
 
-  <bean id="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl" 
class="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl">
-      <meta key="j2:cat" value="default,security" />
-      <constructor-arg index="0" 
ref="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user" />
-      <constructor-arg index="1" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-      <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
-      <constructor-arg index="3" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-      <constructor-arg index="4" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-      <constructor-arg index="5" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-      <constructor-arg index="6" 
ref="org.apache.jetspeed.security.spi.SecurityDomainAccessManager" />    
+  <bean class="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" 
value="org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl" />
+    <constructor-arg index="0" 
ref="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user" />
+    <constructor-arg index="1" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+    <constructor-arg index="3" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="5" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="6" 
ref="org.apache.jetspeed.security.spi.SecurityDomainAccessManager" />    
   </bean>
     
-  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.sso_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.sso_user" />
     <constructor-arg index="0" value="sso_user" />
     <constructor-arg index="1" 
value="org.apache.jetspeed.sso.impl.SSOUserImpl" />
     <constructor-arg index="2">
@@ -73,8 +74,9 @@
     </constructor-arg>
   </bean>
   
-  <bean id="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" 
parent="baseTransactionProxy">
-    <meta key="j2:cat" value="default,security" />
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" 
/>
     <property name="proxyInterfaces">
       <value>
         org.apache.jetspeed.sso.spi.SSOUserManagerSPI, 
org.apache.jetspeed.security.JetspeedPrincipalManager,
@@ -96,7 +98,7 @@
 
   <bean id="ssoUserIsOwnedByUserAssociationHandler"
     class="org.apache.jetspeed.sso.impl.IsOwnedByPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" 
ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" 
/>
     <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"
 />
@@ -104,7 +106,7 @@
 
   <bean id="ssoUserIsOwnedByGroupAssociationHandler"
     class="org.apache.jetspeed.sso.impl.IsOwnedByPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" 
ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" 
/>
     <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"
 />
@@ -112,7 +114,7 @@
   
   <bean id="ssoUserIsRelatedToUserAssociationHandler"
     
class="org.apache.jetspeed.sso.impl.IsRemoteIdentityForPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" 
ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" 
/>
     <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"
 />
@@ -120,14 +122,14 @@
 
   <bean id="ssoUserIsRelatedGroupAssociationHandler"
     
class="org.apache.jetspeed.sso.impl.IsRemoteIdentityForPrincipalAssociationHandler">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <constructor-arg index="0" 
ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI" />
     <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" 
/>
     <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"
 />
   </bean>
   
   <bean id="org.apache.jetspeed.sso.SSOManager" 
class="org.apache.jetspeed.sso.impl.SSOManagerImpl">
-    <meta key="j2:cat" value="default,security"/>
+    <meta key="j2:cat" value="default or security"/>
     <property name="userManager" 
ref="org.apache.jetspeed.security.UserManager"/>
     <property name="SSOUserManagerSPI" 
ref="org.apache.jetspeed.sso.spi.SSOUserManagerSPI"/>
     <property name="domainAccessManager" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
@@ -135,16 +137,17 @@
     <property name="SSOSiteManagerSPI" 
ref="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI"/>
   </bean>
   
-  <bean id="PersistenceBrokerSSOSiteManager"
-    class="org.apache.jetspeed.sso.spi.impl.JetspeedPersistentSSOSiteManager" 
init-method="init">
-    <meta key="j2:cat" value="default,security"/>
+  <bean 
class="org.apache.jetspeed.sso.spi.impl.JetspeedPersistentSSOSiteManager" 
init-method="init">
+    <meta key="j2:cat" value="ojb and (default or security)" />
+    <meta key="j2:alias" value="PersistenceBrokerSSOSiteManager" />
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/sso_repository.xml</value>
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI" 
parent="baseTransactionProxy" name="ssoSiteManager">
-    <meta key="j2:cat" value="default,security"/>
+  <bean parent="baseTransactionProxy">
+    <meta key="j2:cat" value="ojb and (default or security)"/>
+    <meta key="j2:alias" 
value="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI,ssoSiteManager" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.sso.spi.SSOSiteManagerSPI</value>
     </property>
@@ -164,6 +167,60 @@
         <prop key="*">PROPAGATION_SUPPORTS</prop>
       </props>
     </property>
+  </bean>
 
+  <!-- JPA/OpenJPA Security/SSO Components -->
+  <bean 
class="org.apache.jetspeed.sso.spi.jpa.JetspeedPersistentSSOSiteManager">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" 
value="org.apache.jetspeed.sso.spi.SSOSiteManagerSPI,ssoSiteManager,PersistenceBrokerSSOSiteManager"/>
+    <constructor-arg index="0" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
+  </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.sso_user"/>
+    <constructor-arg index="0" value="sso_user"/>
+    <constructor-arg index="1" 
value="org.apache.jetspeed.sso.jpa.SSOUserImpl"/>
+    <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="org.apache.jetspeed.sso.user.shared"/>
+              <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.sso.spi.jpa.SSOUserManagerSPIImpl">
+    <meta key="j2:cat" value="jpa and (default or security)"/>
+    <meta key="j2:alias" 
value="org.apache.jetspeed.sso.spi.SSOUserManagerSPI,org.apache.jetspeed.sso.spi.impl.SSOUserManagerSPIImpl"/>
+    <constructor-arg index="0" 
ref="org.apache.jetspeed.security.JetspeedPrincipalType.sso_user" />
+    <constructor-arg index="1" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="2" 
ref="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" />
+    <constructor-arg index="3" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="4" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="5" 
ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="6" 
ref="org.apache.jetspeed.security.spi.SecurityDomainAccessManager" />    
+  </bean>
+
 </beans>

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
 Fri Feb 20 16:32:05 2009
@@ -20,7 +20,7 @@
 
   <bean id="_portletDefinitionImplPortletFactoryInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,registry" />
+    <meta key="j2:cat" value="default or registry" />
     <property name="className" 
value="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl" />
     <property name="methodName" value="setPortletFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.factory.PortletFactory" />
@@ -31,7 +31,7 @@
 
   <bean id="_portletDefinitionImplPortletPreferencesProviderInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,registry" />
+    <meta key="j2:cat" value="default or registry" />
     <property name="className" 
value="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl" />
     <property name="methodName" value="setPortletPreferencesProvider" />
     <property name="typeName" 
value="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider"
 />
@@ -42,7 +42,7 @@
 
   <bean id="_portletEntityImplPortletRegistryInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,registry" />
+    <meta key="j2:cat" value="default or registry" />
     <property name="className" 
value="org.apache.jetspeed.components.portletentity.PortletEntityImpl" />
     <property name="methodName" value="setPortletRegistry" />
     <property name="typeName" 
value="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
@@ -53,7 +53,7 @@
 
   <bean id="_abstractBaseElementInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or xmlPageManager or pageSerializer" />
     <property name="className" 
value="org.apache.jetspeed.om.page.psml.AbstractBaseElement" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.security.PermissionFactory" />
@@ -63,7 +63,7 @@
   </bean>
 
   <bean id="_baseElementImplInitializer" 
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or dbPageManager or pageSerializer" />
     <property name="className" 
value="org.apache.jetspeed.om.page.impl.BaseElementImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.security.PermissionFactory" />
@@ -73,7 +73,7 @@
   </bean>
 
   <bean id="_dbFolderImplInitializer" 
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or dbPageManager or pageSerializer" />
     <property name="className" 
value="org.apache.jetspeed.om.folder.impl.FolderImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.security.PermissionFactory" />
@@ -83,7 +83,7 @@
   </bean>
 
   <bean id="_xmlFolderImplInitializer" 
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or xmlPageManager or pageSerializer" />
     <property name="className" 
value="org.apache.jetspeed.om.folder.psml.FolderImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.security.PermissionFactory" />
@@ -93,7 +93,7 @@
   </bean>
 
   <bean id="_dbFragmentImplInitializer" 
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or dbPageManager or pageSerializer" />
     <property name="className" 
value="org.apache.jetspeed.om.page.impl.FragmentImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.security.PermissionFactory" />
@@ -103,7 +103,7 @@
   </bean>
 
   <bean id="_xmlFragmentImplInitializer" 
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
+    <meta key="j2:cat" value="default or xmlPageManager or pageSerializer" />
     <property name="className" 
value="org.apache.jetspeed.om.page.psml.FragmentImpl" />
     <property name="methodName" value="setPermissionsFactory" />
     <property name="typeName" 
value="org.apache.jetspeed.security.PermissionFactory" />
@@ -114,7 +114,7 @@
 
   <bean id="_jetspeedPrincipalConcreteClassRowReaderInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="className" 
value="org.apache.jetspeed.security.util.ojb.JetspeedPrincipalConcreteClassRowReader"
 />
     <property name="methodName" value="setJetspeedPrincipalManagerProvider" />
     <property name="typeName" 
value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider" />
@@ -125,7 +125,7 @@
 
   <bean id="_transientJetspeedPrincipalInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="className" 
value="org.apache.jetspeed.security.impl.TransientJetspeedPrincipal" />
     <property name="methodName" value="setJetspeedPrincipalManagerProvider" />
     <property name="typeName" 
value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider" />
@@ -136,7 +136,7 @@
 
   <bean id="_baseJetspeedPrincipalManagerInitializer"
     
class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
-    <meta key="j2:cat" value="default,security" />
+    <meta key="j2:cat" value="default or security" />
     <property name="className" 
value="org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager" />
     <property name="methodName" value="setJetspeedPrincipalManagerProvider" />
     <property name="typeName" 
value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider" />

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
 Fri Feb 20 16:32:05 2009
@@ -24,7 +24,7 @@
 
   <!-- Transaction manager for a single OJB PersistenceBroker (alternative to 
JTA) -->
   <bean id="transactionManager" 
class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
-    <meta key="j2:cat" value="default,transaction" />
+    <meta key="j2:cat" value="default or transaction" />
   </bean>
 
   <!-- Transaction manager that delegates to JTA (for a transactional JNDI 
DataSource) -->
@@ -40,7 +40,7 @@
   -->
   <bean id="baseTransactionProxy" 
class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
     abstract="true">
-    <meta key="j2:cat" value="default,transaction" />
+    <meta key="j2:cat" value="default or transaction" />
     <property name="transactionManager">
       <ref bean="transactionManager" />
     </property>
@@ -51,4 +51,4 @@
     </property>
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
 (original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
 Fri Feb 20 16:32:05 2009
@@ -25,7 +25,7 @@
 #   jndiDS (default), jdbcDS, schemaAwareDS, ojbConnectionRepositoryDS
 
 # default filter 
-default=default
+default=default,ojb
 
 basePortal=${default},jndiDS,xmlPageManager
 portal=${basePortal},dbSecurity
@@ -33,8 +33,8 @@
 portal.dbPageManager=${default},jndiDS,dbPageManager,dbSecurity
 portal.dbPageManager.ldap=${default},jndiDS,dbPageManager,ldapSecurity
 
-baseSerializer=jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
+baseSerializer=ojb,jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
 serializer=${baseSerializer},dbSecurity
 serializer.ldap=${baseSerializer},ldapSecurity
 
-pageSerializer=jdbcDS,base,pageSerializer,transaction,springProperties,security,dbSecurity,cache
+pageSerializer=ojb,jdbcDS,base,pageSerializer,transaction,springProperties,security,dbSecurity,cache

Modified: 
portals/jetspeed-2/portal/branches/JPA_BRANCH/src/site/xdoc/spring-config.xml
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JPA_BRANCH/src/site/xdoc/spring-config.xml?rev=746287&r1=746286&r2=746287&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/branches/JPA_BRANCH/src/site/xdoc/spring-config.xml 
(original)
+++ 
portals/jetspeed-2/portal/branches/JPA_BRANCH/src/site/xdoc/spring-config.xml 
Fri Feb 20 16:32:05 2009
@@ -41,11 +41,11 @@
                 <p>
                     In Jetspeed assembly files, a bean definition should have 
<strong><code>j2:cat</code></strong> meta data like the following example:
                     <div class="source"><pre>&lt;bean name="xmlPageManager" 
class="org.apache.jetspeed.page.psml.CastorXmlPageManager"&gt;
-    &lt;meta key="j2:cat" value="xmlPageManager,pageSerializer" /&gt;
+    &lt;meta key="j2:cat" value="xmlPageManager or pageSerializer" /&gt;
     ...
 &lt;/bean&gt;</pre></div>
-                    In the above example, the 
<strong><code>xmlPageManager</code></strong> bean definition has two 
categories: <strong><code>xmlPageManager</code></strong> and 
<strong><code>pageSerializer</code></strong>.
-                    If the Spring filter key setting of Jetspeed contains one 
of the categories, then the <strong><code>xmlPageManager</code></strong> bean 
definition will be registered. Otherwise, the bean definition will be ignored. 
By the Spring filter key setting, bean definitions in assembly files will be 
filtered according to their cateogories.
+                    In the above example, the 
<strong><code>xmlPageManager</code></strong> bean definition is included for 
two categories: <strong><code>xmlPageManager</code></strong> and 
<strong><code>pageSerializer</code></strong>.
+                    If the Spring filter key setting of Jetspeed contains one 
of the categories, then the <strong><code>xmlPageManager</code></strong> bean 
definition will be registered. Otherwise, the bean definition will be ignored. 
By the Spring filter key setting, bean definitions in assembly files will be 
filtered according to their categories.
                 </p>
             </subsection>
             <subsection name="Spring Filter Keys and Categories Settings">



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]