portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r924022 [2/2] - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE: applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/ components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/ components/por...
Date Tue, 16 Mar 2010 22:03:51 GMT
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/administration.xml?rev=924022&r1=924021&r2=924022&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/administration.xml
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/administration.xml
Tue Mar 16 22:03:50 2010
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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
@@ -64,9 +64,12 @@
     		<ref bean="org.apache.jetspeed.profiler.Profiler"/>
     	</constructor-arg>
         <constructor-arg index='6'>
-    		<ref bean="mailSender"/>
+    		<ref bean="org.apache.jetspeed.portalsite.PortalSite"/>
     	</constructor-arg>
         <constructor-arg index='7'>
+    		<ref bean="mailSender"/>
+    	</constructor-arg>
+        <constructor-arg index='8'>
     		<ref bean="adminVelocityEngine"/>
     	</constructor-arg>                                                           

 </bean>
@@ -84,59 +87,59 @@
                 <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException</prop>
             </props>
         </property>
-</bean>
-
-<bean id="org.apache.jetspeed.security.SecurityAccessController"
-      class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
-    	<constructor-arg index='0'>
-    		<ref bean="org.apache.jetspeed.page.PageManager"/> 
-    	</constructor-arg>
-    	<!--
-    	   Security Mode:
-    	      1 = Permissions = use Jetspeed Java Security Policy
-    	      2 = Constraints = use Jetspeed (PageManager) Constraint-based Security  
-    	 -->
-    	 <constructor-arg index="1">
-            <value>2</value>
-        </constructor-arg>
 </bean>
-    
-<bean id='org.apache.jetspeed.administration.PortalAuthenticationConfiguration'
-	class='org.apache.jetspeed.administration.PortalAuthenticationConfigurationImpl'>
-
-   <!--  create new session upon authentication -->   
-   <constructor-arg index='0'>
-   		<value>false</value>
-   </constructor-arg>	
-   <!--  hard session timeout limit in seconds, regardless of (in)activity, setting to
0 turns off this feature 
-   		 note:this feature should be used with 'create new session upon authentication' feature

-   -->   
-   <constructor-arg index='1'>
-   		<value>0</value>
-   </constructor-arg>
-   <!--  redirect location for hard session expiration -->   
-   <constructor-arg index='2'>
-   		<value>/login/logout</value>
-   </constructor-arg>
-</bean>    
-
-<bean id='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProvider'
-	class='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProviderImpl'>
-    <constructor-arg index="0">
-        <ref bean="activeAuthenticationCache" />
-    </constructor-arg>
-    <!--  list of session attribute names that should be saved and restored upon authentication
events -->
-    <constructor-arg>    
-    <list>
-    	<value>org.apache.jetspeed.login.username</value>
-    	<value>org.apache.jetspeed.login.password</value>
-    	<value>org.apache.jetspeed.login.destination</value>
-    	<value>org.apache.jetspeed.login.retrycount</value>
-    	<value>org.apache.jetspeed.login.errorcode</value>
-    	<value>org.apache.jetspeed.login.check</value>    
-    	<value>org.apache.jetspeed.theme.override</value>	
-    </list>    
-    </constructor-arg>
-</bean>    
+
+<bean id="org.apache.jetspeed.security.SecurityAccessController"
+      class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
+    	<constructor-arg index='0'>
+    		<ref bean="org.apache.jetspeed.page.PageManager"/> 
+    	</constructor-arg>
+    	<!--
+    	   Security Mode:
+    	      1 = Permissions = use Jetspeed Java Security Policy
+    	      2 = Constraints = use Jetspeed (PageManager) Constraint-based Security  
+    	 -->
+    	 <constructor-arg index="1">
+            <value>2</value>
+        </constructor-arg>
+</bean>
+    
+<bean id='org.apache.jetspeed.administration.PortalAuthenticationConfiguration'
+	class='org.apache.jetspeed.administration.PortalAuthenticationConfigurationImpl'>
+
+   <!--  create new session upon authentication -->   
+   <constructor-arg index='0'>
+   		<value>false</value>
+   </constructor-arg>	
+   <!--  hard session timeout limit in seconds, regardless of (in)activity, setting to
0 turns off this feature 
+   		 note:this feature should be used with 'create new session upon authentication' feature

+   -->   
+   <constructor-arg index='1'>
+   		<value>0</value>
+   </constructor-arg>
+   <!--  redirect location for hard session expiration -->   
+   <constructor-arg index='2'>
+   		<value>/login/logout</value>
+   </constructor-arg>
+</bean>    
+
+<bean id='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProvider'
+	class='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProviderImpl'>
+    <constructor-arg index="0">
+        <ref bean="activeAuthenticationCache" />
+    </constructor-arg>
+    <!--  list of session attribute names that should be saved and restored upon authentication
events -->
+    <constructor-arg>    
+    <list>
+    	<value>org.apache.jetspeed.login.username</value>
+    	<value>org.apache.jetspeed.login.password</value>
+    	<value>org.apache.jetspeed.login.destination</value>
+    	<value>org.apache.jetspeed.login.retrycount</value>
+    	<value>org.apache.jetspeed.login.errorcode</value>
+    	<value>org.apache.jetspeed.login.check</value>    
+    	<value>org.apache.jetspeed.theme.override</value>	
+    </list>    
+    </constructor-arg>
+</bean>    
 
 </beans>



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