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 ta...@apache.org on 2005/07/08 03:05:59 UTC
svn commit: r209691 - in
/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly:
jetspeed-spring.xml userinfo.xml
Author: taylor
Date: Thu Jul 7 18:05:59 2005
New Revision: 209691
URL: http://svn.apache.org/viewcvs?rev=209691&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-301
moved user info assembly into its own configuration file
left default as single source assembly impl
commented out multi source assembly impl
Added:
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/userinfo.xml
Modified:
portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/jetspeed-spring.xml?rev=209691&r1=209690&r2=209691&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/jetspeed-spring.xml Thu Jul 7 18:05:59 2005
@@ -317,15 +317,6 @@
</property>
</bean>
- <!-- User Info -->
- <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
- class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
-
- </bean>
-
<!-- Navigational State component -->
<bean id="org.apache.jetspeed.container.state.NavigationalStateComponent"
class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent"
@@ -334,7 +325,7 @@
<constructor-arg index="1"><value>org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL</value></constructor-arg>
<constructor-arg index="2"><value>org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec</value></constructor-arg>
</bean>
-
+
<!-- Request Context -->
<bean id="org.apache.jetspeed.request.RequestContextComponent"
class="org.apache.jetspeed.request.JetspeedRequestContextComponent"
Added: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/userinfo.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/userinfo.xml?rev=209691&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/userinfo.xml (added)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/userinfo.xml Thu Jul 7 18:05:59 2005
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+<!-- Single Source User Info -->
+ <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
+ >
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
+ <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+ </bean>
+
+
+<!-- Multi-source User Info Manager
+
+ <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
+ <property name="portletRegistry">
+ <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
+ </property>
+ <property name="sources">
+ <list>
+ <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"
+ class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">
+ <property name="userManager">
+ <ref bean="org.apache.jetspeed.security.UserManager"/>
+ </property>
+ </bean>
+ -->
+
+</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org