You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by ta...@apache.org on 2005/06/09 20:15:00 UTC
svn commit: r189809 - in
/incubator/graffito/trunk/jetspeed2-deploy/src/assembly:
jetspeed-spring.xml pipelines.xml
Author: taylor
Date: Thu Jun 9 13:15:00 2005
New Revision: 189809
URL: http://svn.apache.org/viewcvs?rev=189809&view=rev
Log:
upgraded spring assemblies to jetspeed M3 release
(with M4 the assemblies will change again, simplified)
Modified:
incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml
Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml?rev=189809&r1=189808&r2=189809&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml Thu Jun 9 13:15:00 2005
@@ -37,10 +37,13 @@
class="org.apache.jetspeed.services.JetspeedPortletServices" >
<constructor-arg>
<map>
- <entry key="PermissionManager">
- <ref bean="org.apache.jetspeed.security.PermissionManager"/>
- </entry>
- <entry key="ContentServer"><ref bean="org.apache.portals.graffito.ContentServerService"/></entry><entry key="ContentModel"><ref bean="org.apache.portals.graffito.ContentModelService"/></entry> <entry key="PortletRegistryComponent">
+ <entry key="PermissionManager">
+ <ref bean="org.apache.jetspeed.security.PermissionManager"/>
+ </entry>
+ <entry key="ContentServer">
+ <ref bean="org.apache.portals.graffito.ContentServerService"/></entry><entry key="ContentModel"><ref bean="org.apache.portals.graffito.ContentModelService"/>
+ </entry>
+ <entry key="PortletRegistryComponent">
<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
</entry>
<entry key="SearchComponent">
@@ -80,6 +83,9 @@
<entry key="DeploymentManager">
<ref bean="deploymentManager"/>
</entry>
+ <entry key='IdGenerator'>
+ <ref bean='IdGenerator'/>
+ </entry>
</map>
</constructor-arg>
</bean>
Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml?rev=189809&r1=189808&r2=189809&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml Thu Jun 9 13:15:00 2005
@@ -65,6 +65,21 @@
</constructor-arg>
</bean>
+ <bean id="loginValidationValve"
+ class="org.apache.jetspeed.security.impl.LoginValidationValveImpl"
+ init-method="initialize"
+ >
+ <!-- maxNumberOfAuthenticationFailures
+ This value should be in sync with the value for
+ org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor
+ (if used) to make sense.
+ Any value < 2 will suppress the LoginConststants.ERROR_FINAL_LOGIN_ATTEMPT
+ error code when one one last attempt is possible before the credential
+ will be disabled on failure.
+ -->
+ <constructor-arg index="0"><value>3</value></constructor-arg>
+ </bean>
+
<bean id="profilerValve"
class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
init-method="initialize"
@@ -140,6 +155,7 @@
<ref bean="portalURLValve"/>
<ref bean="securityValve"/>
<ref bean="passwordCredentialValve"/>
+ <ref bean="loginValidationValve"/>
<ref bean="GraffitoContextValve"/>
<ref bean="profilerValve"/>
<ref bean="containerValve"/>