You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2008/10/07 14:50:07 UTC
svn commit: r702462 - in
/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources:
assembly/security-ldap.xml conf/jetspeed/spring-filter.properties
Author: vkumar
Date: Tue Oct 7 05:50:07 2008
New Revision: 702462
URL: http://svn.apache.org/viewvc?rev=702462&view=rev
Log:
Renaming spring filter key ldap to ldapsecurity to make is consistent with others
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/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=702462&r1=702461&r2=702462&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 Tue Oct 7 05:50:07 2008
@@ -19,13 +19,13 @@
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.spi.impl.JetspeedPrincipalLdapStorageManager" class="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.mapping.SecurityEntityManager" />
</bean>
<bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager" parent="baseTransactionProxy">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="proxyInterfaces">
<value>org.apache.jetspeed.security.spi.JetspeedPrincipalStorageManager</value>
</property>
@@ -41,7 +41,7 @@
<bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager"
class="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapAssociationStorageManager">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.mapping.SecurityEntityManager" />
</bean>
@@ -52,7 +52,7 @@
This bean is wrapped in a ContextRefreshableBeanInitializer to kickstart it once the complete Spring context is initialized.
-->
<bean id="_ldapOnStartupSecuritySynchronizer" class="org.apache.jetspeed.components.ContextRefreshableBeanInitializer">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg>
<bean class="org.apache.jetspeed.security.spi.impl.OnStartupSecuritySynchronizationBean">
<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedSecuritySynchronizer" />
@@ -65,14 +65,14 @@
<bean id="org.apache.jetspeed.security.spi.JetspeedSecuritySynchronizer"
class="org.apache.jetspeed.security.spi.impl.DefaultJetspeedSecuritySynchronizer">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalManagerProvider" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.mapping.SecurityEntityManager" />
</bean>
<bean id="org.apache.jetspeed.security.AuthenticationProvider"
class="org.apache.jetspeed.security.impl.LdapAuthenticationProvider">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg index="0" value="ldapAuthenticationProvider" />
<constructor-arg index="1" value="Ldap Authentication Provider" />
<constructor-arg index="2">
@@ -86,7 +86,7 @@
<bean id="org.apache.jetspeed.security.mapping.SecurityEntityManager"
class="org.apache.jetspeed.security.mapping.ldap.dao.DefaultLDAPEntityManager">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="entityDAOs">
<map>
<entry key="user" value-ref="UserDao" />
@@ -104,7 +104,7 @@
</bean>
<bean id="UserDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration" init-method="initialize">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="baseDN" value="${ldap.base}" />
<property name="searchDN" value="" />
<property name="searchFilter">
@@ -148,7 +148,7 @@
<property name="entityType" value="user" />
</bean>
<bean id="RoleDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration" init-method="initialize">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="baseDN" value="${ldap.base}" />
<property name="searchDN" value="${ldap.role.searchBase}" />
<property name="searchFilter">
@@ -193,7 +193,7 @@
</bean>
<bean id="GroupDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration" init-method="initialize">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="baseDN" value="${ldap.base}" />
<property name="searchDN" value="${ldap.group.searchBase}" />
<property name="searchFilter">
@@ -237,7 +237,7 @@
<property name="entityType" value="group" />
</bean>
<bean id="UserDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg ref="UserDaoConfiguration"/>
<property name="ldapTemplate">
<bean class="org.springframework.ldap.core.LdapTemplate">
@@ -247,7 +247,7 @@
</bean>
<bean id="UserRoleRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="ldapTemplate">
<bean class="org.springframework.ldap.core.LdapTemplate">
<property name="contextSource" ref="LdapSpringContext" />
@@ -266,7 +266,7 @@
</bean>
<bean id="UserGroupRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="ldapTemplate">
<bean class="org.springframework.ldap.core.LdapTemplate">
<property name="contextSource" ref="LdapSpringContext" />
@@ -285,7 +285,7 @@
</bean>
<bean id="RoleGroupRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="ldapTemplate">
<bean class="org.springframework.ldap.core.LdapTemplate">
<property name="contextSource" ref="LdapSpringContext" />
@@ -304,7 +304,7 @@
</bean>
<bean id="RoleDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg ref="RoleDaoConfiguration"/>
<property name="ldapTemplate">
<bean class="org.springframework.ldap.core.LdapTemplate">
@@ -314,7 +314,7 @@
</bean>
<bean id="GroupDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg ref="GroupDaoConfiguration"/>
<property name="ldapTemplate">
<bean class="org.springframework.ldap.core.LdapTemplate">
@@ -324,7 +324,7 @@
</bean>
<bean id="LdapSpringContext" class="org.springframework.ldap.core.support.LdapContextSource">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<property name="url">
<value>${ldap.url}</value>
</property>
@@ -341,7 +341,7 @@
<bean id="ldapContext" class="org.apache.jetspeed.security.spi.impl.ldap.LdapContextProxy"
depends-on="LdapSpringContext">
- <meta key="j2:cat" value="ldap" />
+ <meta key="j2:cat" value="ldapSecurity" />
<constructor-arg index="0" ref="LdapSpringContext" />
<constructor-arg index="1">
<value>${ldap.context.factory}</value>
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=702462&r1=702461&r2=702462&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 Tue Oct 7 05:50:07 2008
@@ -29,12 +29,12 @@
basePortal=${default},jndiDS,xmlPageManager
portal=${basePortal},dbSecurity
-portal.ldap=${basePortal},ldap
+portal.ldap=${basePortal},ldapSecurity
portal.dbPageManager=${default},jndiDS,dbPageManager,dbSecurity
-portal.dbPageManager.ldap=${default},jndiDS,dbPageManager,ldap
+portal.dbPageManager.ldap=${default},jndiDS,dbPageManager,ldapSecurity
baseSerializer=jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
serializer=${baseSerializer},dbSecurity
-serializer.ldap=${baseSerializer},ldap
+serializer.ldap=${baseSerializer},ldapSecurity
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