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 at...@apache.org on 2009/01/08 10:23:51 UTC
svn commit: r732659 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
Author: ate
Date: Thu Jan 8 01:23:50 2009
New Revision: 732659
URL: http://svn.apache.org/viewvc?rev=732659&view=rev
Log:
Dropping setListener method on BaseJetspeedPrincipalManager again and providing the appropriate Spring (MethodInvokingFactoryBean) configuration for calling the addListener method instead.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java?rev=732659&r1=732658&r2=732659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java Thu Jan 8 01:23:50 2009
@@ -355,10 +355,6 @@
listeners.add(listener);
}
}
- public void setListener(PrincipalManagerEventListener listener)
- {
- addListener(listener);
- }
/**
* removeListener - remove principal manager event listener
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=732659&r1=732658&r2=732659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Thu Jan 8 01:23:50 2009
@@ -138,9 +138,15 @@
<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" />
- <property name="listener">
+ </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>
+ <property name="targetMethod"><value>addListener</value></property>
+ <property name="arguments">
<ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
- </property>
+ </property>
</bean>
<!-- Security: Group Manager -->
@@ -174,9 +180,15 @@
<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" />
- <property name="listener">
+ </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>
+ <property name="targetMethod"><value>addListener</value></property>
+ <property name="arguments">
<ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
- </property>
+ </property>
</bean>
<!-- Security: Role Manager -->
@@ -210,9 +222,15 @@
<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" />
- <property name="listener">
+ </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>
+ <property name="targetMethod"><value>addListener</value></property>
+ <property name="arguments">
<ref bean="org.apache.jetspeed.security.PrincipalManagerEventAdapter" />
- </property>
+ </property>
</bean>
<!-- Security: Permission Manager -->
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org