portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r702332 - in /portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources: assembly/security-ldap.xml assembly/security-spi.xml conf/jetspeed/spring-filter.properties
Date Tue, 07 Oct 2008 03:06:25 GMT
Author: ate
Date: Mon Oct  6 20:06:25 2008
New Revision: 702332

URL: http://svn.apache.org/viewvc?rev=702332&view=rev
Log:
Fix Spring bean aliasing for handling default dbSecurity or ldap

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml?rev=702332&r1=702331&r2=702332&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
Mon Oct  6 20:06:25 2008
@@ -18,7 +18,7 @@
 <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="JetspeedPrincipalStorageManager" class="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager">
+  <bean id="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager"
class="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager">
   	<meta key="j2:cat" value="ldap" />
     	<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"
/>
     	<constructor-arg index="1" ref="org.apache.jetspeed.security.mapping.SecurityEntityManager"
/>
@@ -30,7 +30,7 @@
       <value>org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager</value>
     </property>
     <property name="target">
-      <ref bean="JetspeedPrincipalStorageManager" />
+      <ref bean="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager"
/>
     </property>
     <property name="transactionAttributes">
       <props>

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml?rev=702332&r1=702331&r2=702332&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
Mon Oct  6 20:06:25 2008
@@ -29,9 +29,7 @@
     </constructor-arg>
   </bean>
   
-  <bean id="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" 
-  name="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager,org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"

-  parent="baseTransactionProxy">
+  <bean id="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" parent="baseTransactionProxy">
     <meta key="j2:cat" value="default,security" />
     <property name="proxyInterfaces">
       <value>
@@ -60,6 +58,30 @@
       </props>
     </property>
   </bean>
+
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbSecurity" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager"
/>
+    <property name="targetBeanName" value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"
/>
+  </bean>
+  
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbSecurity" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"
/>
+    <property name="targetBeanName" value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"
/>
+  </bean>
+  
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbSecurity" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.spi.JetspeedPermissionStorageManager"
/>
+    <property name="targetBeanName" value="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"
/>
+  </bean>
+  
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbSecurity" />
+    <meta key="j2:alias" value="org.apache.jetspeed.security.spi.UserPasswordCredentialStorageManager"
/>
+    <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">

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties?rev=702332&r1=702331&r2=702332&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
Mon Oct  6 20:06:25 2008
@@ -27,11 +27,14 @@
 # default filter 
 default=default
 
-portal=${default},jndiDS,xmlPageManager
-portal.dbPageManager=${default},jndiDS,dbPageManager
-serializer=jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
-pageSerializer=jdbcDS,base,pageSerializer,transaction,springProperties
+basePortal=${default},jndiDS,xmlPageManager
+portal=${basePortal},dbSecurity
+portal.ldap=${basePortal},ldap
+portal.dbPageManager=${default},jndiDS,dbPageManager,dbSecurity
+portal.dbPageManager.ldap=${default},jndiDS,dbPageManager,ldap
+
+baseSerializer=jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
+serializer=${baseSerializer},dbSecurity
+serializer.ldap=${baseSerializer},ldap
 
-portal.ldap=${portal},ldap
-portal.dbPageManager.ldap=${portal.dbPageManager},ldap
-serializer.ldap=${serializer},ldap
+pageSerializer=jdbcDS,base,pageSerializer,transaction,springProperties



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