portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r698061 [1/2] - /portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/
Date Tue, 23 Sep 2008 01:44:41 GMT
Author: ate
Date: Mon Sep 22 18:44:41 2008
New Revision: 698061

URL: http://svn.apache.org/viewvc?rev=698061&view=rev
Log:
assembly files layout/format cleanup

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
    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-managers.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.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/assembly/serializer.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml Mon Sep 22 18:44:41 2008
@@ -49,7 +49,7 @@
         </entry>
         <!--<entry key="SSO">
           <ref bean="org.apache.jetspeed.sso.SSOProvider" />
-        </entry>-->
+          </entry>-->
         <entry key="EntityAccessor">
           <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent' />
         </entry>
@@ -127,8 +127,8 @@
           <ref bean="org.apache.jetspeed.serializer.JetspeedSerializer" />
         </entry>
         <!--<entry key="SecurityAttributesProvider">
-        	<ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider" />
-        </entry>-->
+          <ref bean="org.apache.jetspeed.security.attributes.SecurityAttributesProvider" />
+          </entry>-->
         <!-- first uncomment the below service bean in security-spi-atn.xml
           <entry key="PasswordEncodingService">
           <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml Mon Sep 22 18:44:41 2008
@@ -86,10 +86,10 @@
       <ref bean="RequestContextObjects" />
     </constructor-arg>
   </bean>
-  
+
   <bean class="org.apache.jetspeed.components.factorybeans.NullReferenceFactoryBean">
     <meta key="j2:cat" value="noRequestContext" />
-    <meta key="j2:alias" value="org.apache.jetspeed.request.RequestContextComponent"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.request.RequestContextComponent" />
     <property name="objectType" value="org.apache.jetspeed.request.RequestContextComponent"></property>
   </bean>
 

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml Mon Sep 22 18:44:41 2008
@@ -278,16 +278,16 @@
       <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
   </bean>
-  
+
   <!-- PageSerializer, source: xmlPageManager, dest: dbPageMmanager -->
   <bean id="org.apache.jetspeed.page.PageSerializer" class="org.apache.jetspeed.page.PageSerializerImpl">
     <meta key="j2:cat" value="pageSerializer" />
     <constructor-arg index="0">
-      <ref bean="xmlPageManager"/>
+      <ref bean="xmlPageManager" />
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="dbPageManager"/>
-    </constructor-arg>    
+      <ref bean="dbPageManager" />
+    </constructor-arg>
   </bean>
-  
+
 </beans>

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Mon Sep 22 18:44:41 2008
@@ -401,15 +401,16 @@
     </constructor-arg>
   </bean>
 
-  <bean id="portletApplicationValidator" class="org.apache.jetspeed.healthcheck.validators.PortletApplicationAvailableHeathCheckValidator">
+  <bean id="portletApplicationValidator"
+    class="org.apache.jetspeed.healthcheck.validators.PortletApplicationAvailableHeathCheckValidator">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
       <!-- requiredPortletApplications -->
       <list>
         <!-- names of the portlet applications which are required to be available -->
         <!--
-        <value>j2-admin</value>
-         -->
+          <value>j2-admin</value>
+        -->
       </list>
     </constructor-arg>
     <constructor-arg index="1">
@@ -433,35 +434,36 @@
       <value>true</value>
     </constructor-arg>
   </bean>
-  
-  <bean id="databaseValidator" class="org.apache.jetspeed.healthcheck.validators.DatasourceAvailableHealthCheckValidator">
+
+  <bean id="databaseValidator"
+    class="org.apache.jetspeed.healthcheck.validators.DatasourceAvailableHealthCheckValidator">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
       <!-- resources -->
       <map>
         <!-- entries to DataSourceValidationBean instances which should be checked
-             see (commented out) example below -->
+          see (commented out) example below -->
         <!-- 
-        <entry key="mydata">
+          <entry key="mydata">
           <bean class="org.apache.jetspeed.healthcheck.validators.DataSourcesValidationBean">
-            <constructor-arg index="0">
-               <!- - Oracle database specific validation query - ->
-               <value>SELECT * FROM SYS.DUAL</value>
-            </constructor-arg>
-            <constructor-arg index="1">
-              <list>
-                 <!- - list of datasources (all using the same validation query)
-                       which needs to be validated - ->
-                 <bean id="mydataDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-                    <property name="jndiName" value="java:comp/env/jdbc/mydata1" />
-                 </bean>
-                 <bean id="mydataDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-                    <property name="jndiName" value="java:comp/env/jdbc/mydata2" />
-                 </bean>
-              </list>
-            </constructor-arg>
+          <constructor-arg index="0">
+          <!- - Oracle database specific validation query - ->
+          <value>SELECT * FROM SYS.DUAL</value>
+          </constructor-arg>
+          <constructor-arg index="1">
+          <list>
+          <!- - list of datasources (all using the same validation query)
+          which needs to be validated - ->
+          <bean id="mydataDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+          <property name="jndiName" value="java:comp/env/jdbc/mydata1" />
           </bean>
-        </entry>
+          <bean id="mydataDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+          <property name="jndiName" value="java:comp/env/jdbc/mydata2" />
+          </bean>
+          </list>
+          </constructor-arg>
+          </bean>
+          </entry>
         -->
       </map>
     </constructor-arg>

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/registry.xml Mon Sep 22 18:44:41 2008
@@ -87,7 +87,8 @@
   </bean>
 
   <!-- Portlet Preferences Implementation -->
-  <bean id="PortletPreferencesProviderImpl" class="org.apache.jetspeed.components.portletpreferences.PersistenceBrokerPortletPreferencesProvider"
+  <bean id="PortletPreferencesProviderImpl"
+    class="org.apache.jetspeed.components.portletpreferences.PersistenceBrokerPortletPreferencesProvider"
     init-method="init" destroy-method="destroy">
     <meta key="j2:cat" value="default,registry" />
     <constructor-arg index="0">
@@ -95,8 +96,8 @@
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy" name="portletPreferencesProvider"
-    destroy-method="destroy">
+  <bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy"
+    name="portletPreferencesProvider" destroy-method="destroy">
     <meta key="j2:cat" value="default,registry" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider</value>

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=698061&r1=698060&r2=698061&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 Sep 22 18:44:41 2008
@@ -18,197 +18,200 @@
 <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="org.apache.jetspeed.security.mapping.ldap.dao"
-		class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
-        <meta key="j2:cat" value="ldap" />
-		    <property name="contextMapper">
-      			<value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
-    		</property>
-
-		    <property name="configuration">
-      			<ref bean="portletRegistryImpl" />
-    		</property>
-    				
-		    <property name="ldapTemplate">
-      			<ref bean="portletRegistryImpl" />
-    		</property>
-
-		    <property name="configuration">
-    			<bean class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration">
-    				<property name=""></property>
-    				<property name=""></property>
-    			</bean>  			
-    		</property>		
-	</bean>   
-	-->
-  	<bean id="org.apache.jetspeed.security.spi.JetspeedPostContextLoader"
-	class="org.apache.jetspeed.security.spi.JetspeedPostContextLoader" init-method="init"> 
-        <meta key="j2:cat" value="ldap" />
-		<constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalSynchronizer" />
-		<constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
-	</bean>	
-	
-	<bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalSynchronizer"
-	class="org.apache.jetspeed.security.spi.impl.DefaultJetspeedPrincipalSynchronizer"> 
-        <meta key="j2:cat" value="ldap" />
-		<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" />
-		<constructor-arg index="0" value="ldapAuthenticationProvider" />
-		<constructor-arg index="1" value="Ldap Authentication Provider" />
-		<constructor-arg index="2">
-				<value>login.conf</value>
-		</constructor-arg>		
-		<constructor-arg index="3" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
-		<constructor-arg index="4" ref="org.apache.jetspeed.security.UserManager" />
-		<property name="context" ref="ldapContext" />
-		<property name="synchronizer" ref="JetspeedPrincipalSynchronizer" />
-	</bean>
-
-	<bean id="JetspeedPrincipalSynchronizer" class="org.apache.jetspeed.security.spi.impl.DefaultJetspeedPrincipalSynchronizer">
-        <meta key="j2:cat" value="ldap" />
-		<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.mapping.SecurityEntityManager"
-	class="org.apache.jetspeed.security.mapping.ldap.dao.DefaultLDAPEntityManager" >	
-        <meta key="j2:cat" value="ldap" />
-		<property name="entityDAOs">
-		    <map>
-				<entry key="user" value-ref="UserDao"/>
-				<entry key="role" value-ref="RoleDao"/>
-		    </map>
-		</property>
-		<property name="entityRelationDAOs">
-		    <list>
-				<ref bean="UserRoleRelationDAO" />
-		    </list>
-		</property>		
-	</bean>
-	<bean id="UserDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration">
-        <meta key="j2:cat" value="ldap" />
-		<property name="baseDN" value=""/>
-		<property name="baseFilter">
-			<bean class="org.apache.jetspeed.security.mapping.ldap.filter.SimpleFilter">
-				<constructor-arg index="0" value="(objectClass=person)" />
-			</bean>
-		</property>
-		<property name="ldapIdAttribute" value="uid"/>
-		<property name="attributeDefinitions">	
-			<set>
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="uid" />
-					<constructor-arg index="1" value="false" />
-					<constructor-arg index="2" value="true" />
-				</bean>
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="cn" />
-					<constructor-arg index="1" value="false" />
-					<constructor-arg index="2" value="true" />					
-				</bean>				
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="givenName" />
-					<constructor-arg index="1" value="false" />
-					<constructor-arg index="2" value="true" />
-					<constructor-arg index="3" value="user.name.given" />					
-				</bean>					
-			</set>
-		</property>
-		<property name="entityType" value="user"/>
-	</bean>
-	<bean id="RoleDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration">
-        <meta key="j2:cat" value="ldap" />
-		<property name="baseDN" value=""/>
-		<property name="baseFilter">
-			<bean class="org.apache.jetspeed.security.mapping.ldap.filter.SimpleFilter">
-				<constructor-arg index="0" value="(objectClass=groupOfUniqueNames)" />
-			</bean>
-		</property>
-		<property name="ldapIdAttribute" value="cn"/>
-		<property name="attributeDefinitions">	
-			<set>
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="uid" />
-					<constructor-arg index="1" value="false" />
-					<constructor-arg index="2" value="true" />
-				</bean>
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="cn" />
-					<constructor-arg index="1" value="false" />
-					<constructor-arg index="2" value="true" />					
-				</bean>				
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="description" />
-					<constructor-arg index="1" value="false" />
-					<constructor-arg index="2" value="true" />
-					<constructor-arg index="3" value="role.display.name" />					
-				</bean>					
-				<bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
-					<constructor-arg index="0" value="uniqueMember" />
-					<constructor-arg index="1" value="true" />
-					<constructor-arg index="2" value="false" />
-				</bean>					
-			</set>
-		</property>
-		<property name="entityType" value="role"/>
-	</bean>
-	<bean id="UserDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
-        <meta key="j2:cat" value="ldap" />
-		<property name="ldapTemplate">
-			<bean class="org.springframework.ldap.core.LdapTemplate">
-				<property name="contextSource" ref="LdapSpringContext" />
-			</bean>
-		</property>
-		<property name="configuration" ref="UserDaoConfiguration"/>
-	</bean>
-		
-	<bean id="UserRoleRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
-        <meta key="j2:cat" value="ldap" />
-		<property name="ldapTemplate">
-			<bean class="org.springframework.ldap.core.LdapTemplate">
-				<property name="contextSource" ref="LdapSpringContext" />
-			</bean>
-		</property>
-		<property name="relationAttribute" value ="uniqueMember"/>
-		<property name="attributeContainsInternalId" value ="true"/>
-		<property name="useFromEntityAttribute" value="false" />
-		<property name="relationType">		
-			<bean class="org.apache.jetspeed.security.mapping.impl.SecurityEntityRelationTypeImpl">
-				<constructor-arg index="0" value="isMemberOf" />
-				<constructor-arg index="1" value="user" />
-				<constructor-arg index="2" value="role" />
-			</bean>
-		</property>
-	</bean>
-	
-	<bean id="RoleDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
-        <meta key="j2:cat" value="ldap" />
-		<property name="ldapTemplate">
-			<bean class="org.springframework.ldap.core.LdapTemplate">
-				<property name="contextSource" ref="LdapSpringContext" />
-			</bean>
-		</property>
-		<property name="configuration" ref="RoleDaoConfiguration"/>
-	</bean>
-	<bean id="LdapSpringContext" class="org.springframework.ldap.core.support.LdapContextSource">
-        <meta key="j2:cat" value="ldap" />
-		<property name="url" value="ldap://localhost:389"/>
-		<property name="base" value="o=sevenSeas"/>
-		<property name="userDn" value="cn=admin,o=sevenSeas"/>
-		<property name="password" value="secret"/>
-	</bean>	
-	
-	<bean id="ldapContext" class="org.apache.jetspeed.security.spi.impl.ldap.LdapContextProxy" depends-on="LdapSpringContext">
-        <meta key="j2:cat" value="ldap" />
-		<constructor-arg index="0" ref="LdapSpringContext" />
-		<constructor-arg index="1" value="com.sun.jndi.ldap.LdapCtxFactory" />
-		<constructor-arg index="2" value="(objectclass=person)" />
-		<constructor-arg index="3" value="2" />
- 	</bean>	
+  <!--
+    <bean id="org.apache.jetspeed.security.mapping.ldap.dao"
+    class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
+    <meta key="j2:cat" value="ldap" />
+    <property name="contextMapper">
+    <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+    </property>
+    
+    <property name="configuration">
+    <ref bean="portletRegistryImpl" />
+    </property>
+    
+    <property name="ldapTemplate">
+    <ref bean="portletRegistryImpl" />
+    </property>
+    
+    <property name="configuration">
+    <bean class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration">
+    <property name=""></property>
+    <property name=""></property>
+    </bean>  			
+    </property>		
+    </bean>   
+  -->
+  <bean id="org.apache.jetspeed.security.spi.JetspeedPostContextLoader"
+    class="org.apache.jetspeed.security.spi.JetspeedPostContextLoader" init-method="init">
+    <meta key="j2:cat" value="ldap" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalSynchronizer" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
+  </bean>
+
+  <bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalSynchronizer"
+    class="org.apache.jetspeed.security.spi.impl.DefaultJetspeedPrincipalSynchronizer">
+    <meta key="j2:cat" value="ldap" />
+    <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" />
+    <constructor-arg index="0" value="ldapAuthenticationProvider" />
+    <constructor-arg index="1" value="Ldap Authentication Provider" />
+    <constructor-arg index="2">
+      <value>login.conf</value>
+    </constructor-arg>
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
+    <constructor-arg index="4" ref="org.apache.jetspeed.security.UserManager" />
+    <property name="context" ref="ldapContext" />
+    <property name="synchronizer" ref="JetspeedPrincipalSynchronizer" />
+  </bean>
+
+  <bean id="JetspeedPrincipalSynchronizer"
+    class="org.apache.jetspeed.security.spi.impl.DefaultJetspeedPrincipalSynchronizer">
+    <meta key="j2:cat" value="ldap" />
+    <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.mapping.SecurityEntityManager"
+    class="org.apache.jetspeed.security.mapping.ldap.dao.DefaultLDAPEntityManager">
+    <meta key="j2:cat" value="ldap" />
+    <property name="entityDAOs">
+      <map>
+        <entry key="user" value-ref="UserDao" />
+        <entry key="role" value-ref="RoleDao" />
+      </map>
+    </property>
+    <property name="entityRelationDAOs">
+      <list>
+        <ref bean="UserRoleRelationDAO" />
+      </list>
+    </property>
+  </bean>
+  <bean id="UserDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration">
+    <meta key="j2:cat" value="ldap" />
+    <property name="baseDN" value="" />
+    <property name="baseFilter">
+      <bean class="org.apache.jetspeed.security.mapping.ldap.filter.SimpleFilter">
+        <constructor-arg index="0" value="(objectClass=person)" />
+      </bean>
+    </property>
+    <property name="ldapIdAttribute" value="uid" />
+    <property name="attributeDefinitions">
+      <set>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="uid" />
+          <constructor-arg index="1" value="false" />
+          <constructor-arg index="2" value="true" />
+        </bean>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="cn" />
+          <constructor-arg index="1" value="false" />
+          <constructor-arg index="2" value="true" />
+        </bean>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="givenName" />
+          <constructor-arg index="1" value="false" />
+          <constructor-arg index="2" value="true" />
+          <constructor-arg index="3" value="user.name.given" />
+        </bean>
+      </set>
+    </property>
+    <property name="entityType" value="user" />
+  </bean>
+  <bean id="RoleDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration">
+    <meta key="j2:cat" value="ldap" />
+    <property name="baseDN" value="" />
+    <property name="baseFilter">
+      <bean class="org.apache.jetspeed.security.mapping.ldap.filter.SimpleFilter">
+        <constructor-arg index="0" value="(objectClass=groupOfUniqueNames)" />
+      </bean>
+    </property>
+    <property name="ldapIdAttribute" value="cn" />
+    <property name="attributeDefinitions">
+      <set>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="uid" />
+          <constructor-arg index="1" value="false" />
+          <constructor-arg index="2" value="true" />
+        </bean>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="cn" />
+          <constructor-arg index="1" value="false" />
+          <constructor-arg index="2" value="true" />
+        </bean>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="description" />
+          <constructor-arg index="1" value="false" />
+          <constructor-arg index="2" value="true" />
+          <constructor-arg index="3" value="role.display.name" />
+        </bean>
+        <bean class="org.apache.jetspeed.security.mapping.model.impl.AttributeDefImpl">
+          <constructor-arg index="0" value="uniqueMember" />
+          <constructor-arg index="1" value="true" />
+          <constructor-arg index="2" value="false" />
+        </bean>
+      </set>
+    </property>
+    <property name="entityType" value="role" />
+  </bean>
+  <bean id="UserDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
+    <meta key="j2:cat" value="ldap" />
+    <property name="ldapTemplate">
+      <bean class="org.springframework.ldap.core.LdapTemplate">
+        <property name="contextSource" ref="LdapSpringContext" />
+      </bean>
+    </property>
+    <property name="configuration" ref="UserDaoConfiguration" />
+  </bean>
+
+  <bean id="UserRoleRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
+    <meta key="j2:cat" value="ldap" />
+    <property name="ldapTemplate">
+      <bean class="org.springframework.ldap.core.LdapTemplate">
+        <property name="contextSource" ref="LdapSpringContext" />
+      </bean>
+    </property>
+    <property name="relationAttribute" value="uniqueMember" />
+    <property name="attributeContainsInternalId" value="true" />
+    <property name="useFromEntityAttribute" value="false" />
+    <property name="relationType">
+      <bean class="org.apache.jetspeed.security.mapping.impl.SecurityEntityRelationTypeImpl">
+        <constructor-arg index="0" value="isMemberOf" />
+        <constructor-arg index="1" value="user" />
+        <constructor-arg index="2" value="role" />
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="RoleDao" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.SpringLDAPEntityDAO">
+    <meta key="j2:cat" value="ldap" />
+    <property name="ldapTemplate">
+      <bean class="org.springframework.ldap.core.LdapTemplate">
+        <property name="contextSource" ref="LdapSpringContext" />
+      </bean>
+    </property>
+    <property name="configuration" ref="RoleDaoConfiguration" />
+  </bean>
+  <bean id="LdapSpringContext" class="org.springframework.ldap.core.support.LdapContextSource">
+    <meta key="j2:cat" value="ldap" />
+    <property name="url" value="ldap://localhost:389" />
+    <property name="base" value="o=sevenSeas" />
+    <property name="userDn" value="cn=admin,o=sevenSeas" />
+    <property name="password" value="secret" />
+  </bean>
+
+  <bean id="ldapContext" class="org.apache.jetspeed.security.spi.impl.ldap.LdapContextProxy"
+    depends-on="LdapSpringContext">
+    <meta key="j2:cat" value="ldap" />
+    <constructor-arg index="0" ref="LdapSpringContext" />
+    <constructor-arg index="1" value="com.sun.jndi.ldap.LdapCtxFactory" />
+    <constructor-arg index="2" value="(objectclass=person)" />
+    <constructor-arg index="3" value="2" />
+  </bean>
 
 </beans>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Mon Sep 22 18:44:41 2008
@@ -18,98 +18,103 @@
 <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="org.apache.jetspeed.security.JetspeedPrincipalType.user"
-		class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-        <meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0" value="user" />
-		<constructor-arg index="1"
-			value="org.apache.jetspeed.security.impl.UserImpl" />
-		<constructor-arg index="2">
-			<bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
-				<constructor-arg index="0"><value>true</value></constructor-arg>
-				<constructor-arg index="1"><value>false</value></constructor-arg>
-				<constructor-arg index="2">
-					<list>
-						<bean
-							class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
-							<constructor-arg index="0"
-								value="org.apache.jetspeed.user.subsite" />
-							<constructor-arg index="1" value="jetspeed" />
-						</bean>
-						<bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
-						  <constructor-arg index="0" value="org.apache.jetspeed.prefered.locale" />
-						  <constructor-arg index="1" value="jetspeed" />
-						</bean>
-						<bean
-							class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
-							<constructor-arg index="0" value="user.name.given" />
-							<constructor-arg index="1" value="info" />
-						</bean>
-						<bean
-							class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
-							<constructor-arg index="0" value="user.name.family" />
-							<constructor-arg index="1" value="info" />
-						</bean>
-					</list>
-				</constructor-arg>
-			</bean>
-		</constructor-arg>
-	</bean>
-	
-	<bean id="org.apache.jetspeed.security.JetspeedPrincipalType.role"
-		class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-        <meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0" value="role" />
-		<constructor-arg index="1"
-			value="org.apache.jetspeed.security.impl.RoleImpl" />
-		<constructor-arg index="2">
-			<bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
-				<constructor-arg index="0"><value>true</value></constructor-arg>
-				<constructor-arg index="1"><value>false</value></constructor-arg>
-				<constructor-arg index="2">
-					<list>
-						<bean
-							class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
-							<constructor-arg index="0" value="role.display.name" />
-							<constructor-arg index="1" value="info" />
-						</bean>
-					</list>
-				</constructor-arg>
-			</bean>
-		</constructor-arg>
-	</bean>
-
-	<bean id="org.apache.jetspeed.security.JetspeedPrincipalType.group"
-		class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
-        <meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0" value="group" />
-		<constructor-arg index="1"
-			value="org.apache.jetspeed.security.impl.GroupImpl" />
-		<constructor-arg index="2">
-			<bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
-				<constructor-arg index="0"><value>true</value></constructor-arg>
-				<constructor-arg index="1"><value>false</value></constructor-arg>
-				<constructor-arg index="2">
-					<list>
-						<bean
-							class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
-							<constructor-arg index="0" value="group.display.name" />
-							<constructor-arg index="1" value="info" />
-						</bean>
-					</list>
-				</constructor-arg>
-			</bean>
-		</constructor-arg>
-	</bean>
-	
+  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.user"
+    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" value="user" />
+    <constructor-arg index="1" value="org.apache.jetspeed.security.impl.UserImpl" />
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0">
+          <value>true</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+          <value>false</value>
+        </constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.user.subsite" />
+              <constructor-arg index="1" value="jetspeed" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="org.apache.jetspeed.prefered.locale" />
+              <constructor-arg index="1" value="jetspeed" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="user.name.given" />
+              <constructor-arg index="1" value="info" />
+            </bean>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="user.name.family" />
+              <constructor-arg index="1" value="info" />
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.role"
+    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" value="role" />
+    <constructor-arg index="1" value="org.apache.jetspeed.security.impl.RoleImpl" />
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0">
+          <value>true</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+          <value>false</value>
+        </constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="role.display.name" />
+              <constructor-arg index="1" value="info" />
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.group"
+    class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" value="group" />
+    <constructor-arg index="1" value="org.apache.jetspeed.security.impl.GroupImpl" />
+    <constructor-arg index="2">
+      <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypesImpl">
+        <constructor-arg index="0">
+          <value>true</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+          <value>false</value>
+        </constructor-arg>
+        <constructor-arg index="2">
+          <list>
+            <bean class="org.apache.jetspeed.security.impl.SecurityAttributeTypeImpl">
+              <constructor-arg index="0" value="group.display.name" />
+              <constructor-arg index="1" value="info" />
+            </bean>
+          </list>
+        </constructor-arg>
+      </bean>
+    </constructor-arg>
+  </bean>
+
   <!-- Security: User Manager -->
-  
+
   <bean id="org.apache.jetspeed.security.UserManager" parent="baseTransactionProxy">
     <meta key="j2:cat" value="default,security" />
     <property name="proxyInterfaces">
-      <value>org.apache.jetspeed.security.UserManager, org.apache.jetspeed.security.JetspeedPrincipalManager,
-             org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI,
-             org.apache.jetspeed.security.spi.UserSubjectPrincipalsProvider</value>
+      <value>
+        org.apache.jetspeed.security.UserManager, org.apache.jetspeed.security.JetspeedPrincipalManager,
+        org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI,
+        org.apache.jetspeed.security.spi.UserSubjectPrincipalsProvider
+      </value>
     </property>
     <property name="target">
       <ref bean="org.apache.jetspeed.security.impl.UserManagerImpl" />
@@ -123,30 +128,27 @@
       </props>
     </property>
   </bean>
-  
+
   <bean id="org.apache.jetspeed.security.impl.UserManagerImpl"
-  class="org.apache.jetspeed.security.impl.UserManagerImpl">
+    class="org.apache.jetspeed.security.impl.UserManagerImpl">
     <meta key="j2:cat" value="default,security" />
-	<constructor-arg index="0"
-		ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
-	<constructor-arg index="1"
-		ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
-	<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.JetspeedSecurityPersistenceManager" />
-	<constructor-arg index="5"
-		ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
+    <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.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="5" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
   </bean>
 
   <!-- Security: Group Manager -->
 
-    <bean id="org.apache.jetspeed.security.GroupManager" parent="baseTransactionProxy">
+  <bean id="org.apache.jetspeed.security.GroupManager" parent="baseTransactionProxy">
     <meta key="j2:cat" value="default,security" />
     <property name="proxyInterfaces">
-      <value>org.apache.jetspeed.security.GroupManager,org.apache.jetspeed.security.JetspeedPrincipalManager, org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI</value>
+      <value>
+        org.apache.jetspeed.security.GroupManager,org.apache.jetspeed.security.JetspeedPrincipalManager,
+        org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI
+      </value>
     </property>
     <property name="target">
       <ref bean="org.apache.jetspeed.security.impl.GroupManagerImpl" />
@@ -160,28 +162,26 @@
       </props>
     </property>
   </bean>
-  
+
   <bean id="org.apache.jetspeed.security.impl.GroupManagerImpl"
-  class="org.apache.jetspeed.security.impl.GroupManagerImpl">
+    class="org.apache.jetspeed.security.impl.GroupManagerImpl">
     <meta key="j2:cat" value="default,security" />
-	<constructor-arg index="0"
-		ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
-	<constructor-arg index="1"
-		ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
-	<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.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
+    <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.JetspeedSecurityPersistenceManager" />
   </bean>
 
   <!-- Security: Role Manager -->
-  
+
   <bean id="org.apache.jetspeed.security.RoleManager" parent="baseTransactionProxy">
     <meta key="j2:cat" value="default,security" />
     <property name="proxyInterfaces">
-      <value>org.apache.jetspeed.security.RoleManager,org.apache.jetspeed.security.JetspeedPrincipalManager, org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI</value>
+      <value>
+        org.apache.jetspeed.security.RoleManager,org.apache.jetspeed.security.JetspeedPrincipalManager,
+        org.apache.jetspeed.security.spi.JetspeedPrincipalManagerSPI
+      </value>
     </property>
     <property name="target">
       <ref bean="org.apache.jetspeed.security.impl.RoleManagerImpl" />
@@ -195,24 +195,19 @@
       </props>
     </property>
   </bean>
-  
-  <bean id="org.apache.jetspeed.security.impl.RoleManagerImpl" 
-  class="org.apache.jetspeed.security.impl.RoleManagerImpl">
-    <meta key="j2:cat" value="default,security" />
-	<constructor-arg index="0"
-		ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
-	<constructor-arg index="1"
-		ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
-	<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.JetspeedSecurityPersistenceManager" />	
+
+  <bean id="org.apache.jetspeed.security.impl.RoleManagerImpl"
+    class="org.apache.jetspeed.security.impl.RoleManagerImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.user" />
+    <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.JetspeedSecurityPersistenceManager" />
   </bean>
 
   <!-- Security: Permission Manager -->
-  
+
   <bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy" name="permissionManager">
     <meta key="j2:cat" value="default,security" />
     <property name="proxyInterfaces">
@@ -233,83 +228,93 @@
       </props>
     </property>
   </bean>
-  
+
   <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl"
     class="org.apache.jetspeed.security.impl.PermissionManagerImpl">
     <meta key="j2:cat" value="default,security" />
     <constructor-arg index="0">
-      	<list>
-			<bean class="org.apache.jetspeed.security.spi.impl.FolderPermission$Factory" />
-			<bean class="org.apache.jetspeed.security.spi.impl.FragmentPermission$Factory" />
-			<bean class="org.apache.jetspeed.security.spi.impl.PagePermission$Factory" />
-			<bean class="org.apache.jetspeed.security.spi.impl.PortletPermission$Factory" />			
-		</list>
+      <list>
+        <bean class="org.apache.jetspeed.security.spi.impl.FolderPermission$Factory" />
+        <bean class="org.apache.jetspeed.security.spi.impl.FragmentPermission$Factory" />
+        <bean class="org.apache.jetspeed.security.spi.impl.PagePermission$Factory" />
+        <bean class="org.apache.jetspeed.security.spi.impl.PortletPermission$Factory" />
+      </list>
     </constructor-arg>
     <constructor-arg index="1">
-       <ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-    </constructor-arg>    
+      <ref bean="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    </constructor-arg>
   </bean>
-  
-  <bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalManagerProvider" class="org.apache.jetspeed.security.impl.JetspeedPrincipalManagerProviderImpl">
+
+  <bean id="org.apache.jetspeed.security.spi.JetspeedPrincipalManagerProvider"
+    class="org.apache.jetspeed.security.impl.JetspeedPrincipalManagerProviderImpl">
     <meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0">
-			<set>
-				<ref bean="org.apache.jetspeed.security.UserManager" />
-				<ref bean="org.apache.jetspeed.security.GroupManager" />
-				<ref bean="org.apache.jetspeed.security.RoleManager" />
-			</set>
-		</constructor-arg>
+    <constructor-arg index="0">
+      <set>
+        <ref bean="org.apache.jetspeed.security.UserManager" />
+        <ref bean="org.apache.jetspeed.security.GroupManager" />
+        <ref bean="org.apache.jetspeed.security.RoleManager" />
+      </set>
+    </constructor-arg>
   </bean>
-  
+
   <bean id="userIsMemberOfRoleAssociationHandler"
-	  class="org.apache.jetspeed.security.spi.impl.SimpleMemberOfPrincipalAssociationHandler">
-		<meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0" value="isMemberOf"/>
-		<constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager"/>
-		<constructor-arg index="2" ref="org.apache.jetspeed.security.RoleManager"/>
-		<constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
-  </bean>  
-   
+    class="org.apache.jetspeed.security.spi.impl.SimpleMemberOfPrincipalAssociationHandler">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" value="isMemberOf" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.RoleManager" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+  </bean>
+
   <bean id="userIsMemberOfGroupAssociationHandler"
-	  class="org.apache.jetspeed.security.spi.impl.SimpleMemberOfPrincipalAssociationHandler">
-		<meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0" value="isMemberOf"/>
-		<constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager"/>
-		<constructor-arg index="2" ref="org.apache.jetspeed.security.GroupManager"/>
-		<constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
-  </bean>  
-   
+    class="org.apache.jetspeed.security.spi.impl.SimpleMemberOfPrincipalAssociationHandler">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" value="isMemberOf" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.GroupManager" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+  </bean>
+
   <bean id="groupIsMemberOfRoleAssociationHandler"
     class="org.apache.jetspeed.security.spi.impl.SimpleMemberOfPrincipalAssociationHandler">
     <meta key="j2:cat" value="default,security" />
-    <constructor-arg index="0" value="isMemberOf"/>
-    <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager"/>
-    <constructor-arg index="2" ref="org.apache.jetspeed.security.RoleManager"/>
-    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"/>
+    <constructor-arg index="0" value="isMemberOf" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.RoleManager" />
+    <constructor-arg index="3" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
   </bean>
-  
+
   <bean id="userSubjectRolesResolver" class="org.apache.jetspeed.security.spi.impl.UserSubjectPrincipalsResolverImpl">
     <meta key="j2:cat" value="default,security" />
-    <constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager"/>
-    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role"/>
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.role" />
     <constructor-arg index="2">
       <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="targetObject"><ref bean="userIsMemberOfRoleAssociationHandler"/></property>
-        <property name="targetMethod"><value>getAssociationType</value></property>
+        <property name="targetObject">
+          <ref bean="userIsMemberOfRoleAssociationHandler" />
+        </property>
+        <property name="targetMethod">
+          <value>getAssociationType</value>
+        </property>
       </bean>
     </constructor-arg>
   </bean>
-   
-  <bean id="userSubjectGroupsResolver" class="org.apache.jetspeed.security.spi.impl.UserSubjectPrincipalsResolverImpl">
+
+  <bean id="userSubjectGroupsResolver"
+    class="org.apache.jetspeed.security.spi.impl.UserSubjectPrincipalsResolverImpl">
     <meta key="j2:cat" value="default,security" />
-    <constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager"/>
-    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group"/>
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.UserManager" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.JetspeedPrincipalType.group" />
     <constructor-arg index="2">
       <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="targetObject"><ref bean="userIsMemberOfGroupAssociationHandler"/></property>
-        <property name="targetMethod"><value>getAssociationType</value></property>
+        <property name="targetObject">
+          <ref bean="userIsMemberOfGroupAssociationHandler" />
+        </property>
+        <property name="targetMethod">
+          <value>getAssociationType</value>
+        </property>
       </bean>
     </constructor-arg>
   </bean>
-   
+
 </beans>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml Mon Sep 22 18:44:41 2008
@@ -35,7 +35,7 @@
     <constructor-arg index="3">
       <ref bean="org.apache.jetspeed.security.spi.UserPasswordCredentialManager" />
     </constructor-arg>
-	
+
   </bean>
 
   <!-- Security: Authorization Provider -->

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml Mon Sep 22 18:44:41 2008
@@ -50,17 +50,17 @@
     <constructor-arg index="1"><value>base64</value></constructor-arg>
     </bean>       
   -->
-<!--
-  <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
+  <!--
+    <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider"
     class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
     <meta key="j2:cat" value="default,security" />
     <constructor-arg index="0">
-      <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator" />
+    <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" />
+    <ref bean="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" />
     </constructor-arg>
-  </bean>-->
+    </bean>-->
 
   <!-- A Two-way encoding password service which also implements CredentialPasswordEncoder
     this Service can be used instead of for example the default provided MessageDigestCredentialPasswordEncoder
@@ -102,36 +102,36 @@
 
   <!-- allow multiple InternalPasswordCredentialInterceptors to be used for DefaultCredentialHandler -->
   <!--
-  <bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
+    <bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
     class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
     <meta key="j2:cat" value="default,security" />
     <constructor-arg index="0">
-      <list>
-        
-        <bean class="org.apache.jetspeed.security.spi.impl.ValidatePasswordOnLoadInterceptor" />
-
-        
-        <bean class="org.apache.jetspeed.security.spi.impl.EncodePasswordOnFirstLoadInterceptor" />
-      </list>
+    <list>
+    
+    <bean class="org.apache.jetspeed.security.spi.impl.ValidatePasswordOnLoadInterceptor" />
+    
+    
+    <bean class="org.apache.jetspeed.security.spi.impl.EncodePasswordOnFirstLoadInterceptor" />
+    </list>
     </constructor-arg>
-  </bean>-->
+    </bean>-->
 
   <!-- Security SPI: CredentialHandler -->
   <!--
-  <bean id="org.apache.jetspeed.security.spi.CredentialHandler"
+    <bean id="org.apache.jetspeed.security.spi.CredentialHandler"
     class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler">
     <meta key="j2:cat" value="default,security" />
     <constructor-arg index="0">
-      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="org.apache.jetspeed.security.spi.PasswordCredentialProvider" />
+    <ref bean="org.apache.jetspeed.security.spi.PasswordCredentialProvider" />
     </constructor-arg>
     <constructor-arg index="2">
-      <ref bean="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor" />
+    <ref bean="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor" />
     </constructor-arg>
-  </bean>
-
+    </bean>
+    
   -->
   <!-- Security SPI: UserSecurityHandler -->
   <!-- The DefaultUSerSecurityHandler uses the raw SecurityAccessImpl so that it
@@ -140,26 +140,26 @@
     class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler">
     <meta key="j2:cat" value="default,security" />
     <constructor-arg>
-      <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
+    <ref bean="org.apache.jetspeed.security.spi.SecurityAccess" />
     </constructor-arg>
-  </bean>
-
-  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy"
+    </bean>
+    
+    <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy"
     name="userSecurityHandler">
     <meta key="j2:cat" value="default,security" />
     <property name="proxyInterfaces">
-      <value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
+    <value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
     </property>
     <property name="target">
-      <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl" />
+    <ref bean="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl" />
+    </property>
+    <property name="transactionAttributes">
+    <props>				
+    <prop key="add*">PROPAGATION_REQUIRED</prop>
+    <prop key="update*">PROPAGATION_REQUIRED</prop>
+    <prop key="remove*">PROPAGATION_REQUIRED</prop>
+    <prop key="*">PROPAGATION_SUPPORTS</prop>
+    </props>
     </property>
-	<property name="transactionAttributes">
-	   <props>				
-		<prop key="add*">PROPAGATION_REQUIRED</prop>
-		<prop key="update*">PROPAGATION_REQUIRED</prop>
-		<prop key="remove*">PROPAGATION_REQUIRED</prop>
-		<prop key="*">PROPAGATION_SUPPORTS</prop>
-	   </props>
-	 </property>
-  </bean>-->
+    </bean>-->
 </beans>

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=698061&r1=698060&r2=698061&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 Sep 22 18:44:41 2008
@@ -20,48 +20,48 @@
 
   <!-- ************** Security SPI Handlers ************** -->
   <!-- Security SPI: CommonQueries -->
-  
+
   <bean id="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager"
-	class="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager" init-method="init">
-		<meta key="j2:cat" value="default,security" />
-		<constructor-arg index="0">
-			<value>JETSPEED-INF/ojb/security_repository.xml</value>
-		</constructor-arg>
-  </bean>  
-   
+    class="org.apache.jetspeed.security.spi.impl.JetspeedSecurityPersistenceManager" init-method="init">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0">
+      <value>JETSPEED-INF/ojb/security_repository.xml</value>
+    </constructor-arg>
+  </bean>
+
   <bean id="org.apache.jetspeed.security.spi.UserPasswordCredentialManager"
-	class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl">
-	<meta key="j2:cat" value="default,security" />
-	<constructor-arg index="0"
-		ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-	<constructor-arg index="1"
-		ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
-		<constructor-arg index="2"
-		ref="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" />
-  </bean>     	
-  
+    class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialManagerImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" />
+    <constructor-arg index="2" ref="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager" />
+  </bean>
+
   <bean id="org.apache.jetspeed.security.spi.UserPasswordCredentialPolicyManager"
-	class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl">
-	<meta key="j2:cat" value="default,security" />
-	<constructor-arg index="0"
-		ref="org.apache.jetspeed.security.CredentialPasswordEncoder" />
-	<constructor-arg index="1"
-		ref="org.apache.jetspeed.security.CredentialPasswordValidator" />
-	<constructor-arg index="2"><value>null</value></constructor-arg>
-  </bean>  
-
-  <bean id="org.apache.jetspeed.security.CredentialPasswordEncoder" 
-       class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
-  <meta key="j2:cat" value="default,security" />
-       <constructor-arg index="0"><value>SHA-1</value></constructor-arg>       
+    class="org.apache.jetspeed.security.spi.impl.UserPasswordCredentialPolicyManagerImpl">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0" ref="org.apache.jetspeed.security.CredentialPasswordEncoder" />
+    <constructor-arg index="1" ref="org.apache.jetspeed.security.CredentialPasswordValidator" />
+    <constructor-arg index="2">
+      <value>null</value>
+    </constructor-arg>
   </bean>
-  
+
+  <bean id="org.apache.jetspeed.security.CredentialPasswordEncoder"
+    class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
+    <meta key="j2:cat" value="default,security" />
+    <constructor-arg index="0">
+      <value>SHA-1</value>
+    </constructor-arg>
+  </bean>
+
   <bean id="org.apache.jetspeed.security.CredentialPasswordValidator"
-	class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
-	<meta key="j2:cat" value="default,security" />
-  </bean>  
-  
-  <bean id="org.apache.jetspeed.security.spi.AuthorizationProvider" class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
+    class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator">
+    <meta key="j2:cat" value="default,security" />
+  </bean>
+
+  <bean id="org.apache.jetspeed.security.spi.AuthorizationProvider"
+    class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl">
     <meta key="j2:cat" value="default,security,AuthorizationProvider" />
     <constructor-arg index="0">
       <ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy" />
@@ -69,6 +69,6 @@
     <constructor-arg index="1">
       <value>true</value>
     </constructor-arg>
-  </bean> 
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml Mon Sep 22 18:44:41 2008
@@ -12,7 +12,7 @@
         </bean>
         <bean class="org.apache.jetspeed.serializer.JetspeedSecuritySerializer">
           <constructor-arg index="0" ref="org.apache.jetspeed.security.spi.JetspeedPrincipalManagerProvider" />
-		  <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
+          <constructor-arg index="1" ref="org.apache.jetspeed.security.GroupManager" />
           <constructor-arg index="2" ref="org.apache.jetspeed.security.RoleManager" />
           <constructor-arg index="3" ref="org.apache.jetspeed.security.UserManager" />
           <constructor-arg index="4" ref="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" />
@@ -25,16 +25,16 @@
         <bean class="org.apache.jetspeed.serializer.JetspeedRegistrySerializer">
           <constructor-arg index="0" ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
           <constructor-arg index="1" ref="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
-          <constructor-arg index="2" ref="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider"/>
+          <constructor-arg index="2" ref="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" />
           <constructor-arg index="3" ref="org.apache.jetspeed.search.SearchEngine" />
         </bean>
-<!-- 
-        <bean class="org.apache.jetspeed.serializer.JetspeedUserTemplateSerializer">
+        <!-- 
+          <bean class="org.apache.jetspeed.serializer.JetspeedUserTemplateSerializer">
           <constructor-arg index="0" ref="org.apache.jetspeed.page.PageManager" />
           <constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
-		  <constructor-arg index="2" ref="portal_configuration" />          
-        </bean>
- -->        
+          <constructor-arg index="2" ref="portal_configuration" />          
+          </bean>
+        -->
       </list>
     </constructor-arg>
     <constructor-arg index="1">
@@ -63,7 +63,7 @@
         </entry>
         <entry key="process_user_templates">
           <value type="java.lang.Boolean">true</value>
-        </entry>        
+        </entry>
         <!--  following serializers are not yet implemented/available -->
         <entry key="process_portal_preferences">
           <value type="java.lang.Boolean">false</value>
@@ -75,7 +75,7 @@
         <entry key="backup_before_process">
           <value type="java.lang.Boolean">true</value>
         </entry>
-        <entry key="export_indentation" value="  "/>
+        <entry key="export_indentation" value="  " />
       </map>
     </constructor-arg>
   </bean>

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/sso.xml?rev=698061&r1=698060&r2=698061&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/sso.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/sso.xml Mon Sep 22 18:44:41 2008
@@ -20,35 +20,35 @@
 
   <!-- SSO Implementation -->
   <!-- 
-  <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider"
+    <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider"
     init-method="init">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <value>JETSPEED-INF/ojb/sso_repository.xml</value>
+    <value>JETSPEED-INF/ojb/sso_repository.xml</value>
     </constructor-arg>
-  </bean>
-
-  <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
+    </bean>
+    
+    <bean id="org.apache.jetspeed.sso.SSOProvider" parent="baseTransactionProxy" name="ssoProvider">
     <meta key="j2:cat" value="default" />
     <property name="proxyInterfaces">
-      <value>org.apache.jetspeed.sso.SSOProvider</value>
+    <value>org.apache.jetspeed.sso.SSOProvider</value>
     </property>
-
+    
     <property name="target">
-      <ref bean="PersistenceBrokerSSOProvider" />
+    <ref bean="PersistenceBrokerSSOProvider" />
     </property>
     <property name="transactionAttributes">
-      <props>
-        <prop key="addSite*">PROPAGATION_REQUIRED</prop>
-        <prop key="updateSite*">PROPAGATION_REQUIRED</prop>
-        <prop key="removeSite">PROPAGATION_REQUIRED</prop>
-        <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
-        <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
-        <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
-        <prop key="setRealmForSite">PROPAGATION_REQUIRED</prop>
-        <prop key="*">PROPAGATION_SUPPORTS</prop>
-      </props>
+    <props>
+    <prop key="addSite*">PROPAGATION_REQUIRED</prop>
+    <prop key="updateSite*">PROPAGATION_REQUIRED</prop>
+    <prop key="removeSite">PROPAGATION_REQUIRED</prop>
+    <prop key="addCredentialsForSite">PROPAGATION_REQUIRED</prop>
+    <prop key="updateCredentialsForSite">PROPAGATION_REQUIRED</prop>
+    <prop key="removeCredentialsForSite">PROPAGATION_REQUIRED</prop>
+    <prop key="setRealmForSite">PROPAGATION_REQUIRED</prop>
+    <prop key="*">PROPAGATION_SUPPORTS</prop>
+    </props>
     </property>
-
-  </bean>-->
+    
+    </bean>-->
 </beans>
\ No newline at end of file



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