Return-Path: 
 <jetspeed-dev-return-32577-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 84821 invoked from network); 7 Oct 2008 03:06:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Oct 2008 03:06:55 -0000
Received: (qmail 39980 invoked by uid 500); 7 Oct 2008 03:06:53 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 39944 invoked by uid 500); 7 Oct 2008 03:06:53 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 39933 invoked by uid 99); 7 Oct 2008 03:06:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2008 20:06:53 -0700
X-ASF-Spam-Status: No, hits=-1999.9 required=10.0
	tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2008 03:05:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1288B23888A6; Mon,  6 Oct 2008 20:06:26 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: jetspeed-dev@portals.apache.org
From: ate@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081007030626.1288B23888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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