You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by mr...@apache.org on 2006/01/25 20:37:50 UTC
svn commit: r372298 - in /incubator/roller/trunk: ./ metadata/xdoclet/
src/org/roller/presentation/ tools/spring-1.2/ web/ web/WEB-INF/
web/WEB-INF/classes/
Author: mraible
Date: Wed Jan 25 11:37:38 2006
New Revision: 372298
URL: http://svn.apache.org/viewcvs?rev=372298&view=rev
Log:
Upgraded to Acegi Security 1.0 RC1
Added:
incubator/roller/trunk/tools/spring-1.2/acegi-security-1.0.0-RC1.jar (with props)
Removed:
incubator/roller/trunk/tools/spring-1.2/acegi-security-0.9.0.jar
Modified:
incubator/roller/trunk/.classpath
incubator/roller/trunk/metadata/xdoclet/filters.xml
incubator/roller/trunk/src/org/roller/presentation/RollerContext.java
incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
incubator/roller/trunk/web/WEB-INF/security.xml
incubator/roller/trunk/web/logout-redirect.jsp
Modified: incubator/roller/trunk/.classpath
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/.classpath?rev=372298&r1=372297&r2=372298&view=diff
==============================================================================
--- incubator/roller/trunk/.classpath (original)
+++ incubator/roller/trunk/.classpath Wed Jan 25 11:37:38 2006
@@ -73,6 +73,6 @@
<classpathentry kind="lib" path="tools/lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="tools/lib/rome-fetcher-0.7.jar"/>
<classpathentry kind="lib" path="tools/spring-1.2/spring.jar"/>
- <classpathentry kind="lib" path="tools/spring-1.2/acegi-security-0.9.0.jar"/>
+ <classpathentry kind="lib" path="tools/spring-1.2/acegi-security-1.0.0-RC1.jar"/>
<classpathentry kind="output" path="classes.eclipse"/>
</classpath>
Modified: incubator/roller/trunk/metadata/xdoclet/filters.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/filters.xml?rev=372298&r1=372297&r2=372298&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/filters.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/filters.xml Wed Jan 25 11:37:38 2006
@@ -1,9 +1,9 @@
<filter>
<filter-name>securityFilter</filter-name>
- <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class>
+ <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
<init-param>
<param-name>targetClass</param-name>
- <param-value>net.sf.acegisecurity.util.FilterChainProxy</param-value>
+ <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
</init-param>
</filter>
Modified: incubator/roller/trunk/src/org/roller/presentation/RollerContext.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/RollerContext.java?rev=372298&r1=372297&r2=372298&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/RollerContext.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/RollerContext.java Wed Jan 25 11:37:38 2006
@@ -9,6 +9,7 @@
import java.sql.SQLException;
import java.util.Properties;
import java.util.TimerTask;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletContext;
@@ -17,12 +18,17 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSessionEvent;
import javax.sql.DataSource;
-import net.sf.acegisecurity.providers.ProviderManager;
-import net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider;
-import net.sf.acegisecurity.providers.encoding.Md5PasswordEncoder;
-import net.sf.acegisecurity.providers.encoding.PasswordEncoder;
-import net.sf.acegisecurity.providers.encoding.ShaPasswordEncoder;
-import net.sf.acegisecurity.securechannel.ChannelProcessingFilter;
+
+import org.acegisecurity.ConfigAttributeDefinition;
+import org.acegisecurity.SecurityConfig;
+import org.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap;
+import org.acegisecurity.providers.ProviderManager;
+import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
+import org.acegisecurity.providers.encoding.Md5PasswordEncoder;
+import org.acegisecurity.providers.encoding.PasswordEncoder;
+import org.acegisecurity.providers.encoding.ShaPasswordEncoder;
+import org.acegisecurity.securechannel.ChannelProcessingFilter;
+import org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.util.RequestUtils;
@@ -39,18 +45,13 @@
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.pings.PingQueueTask;
-import org.roller.presentation.velocity.CommentAuthenticator;
-import org.roller.presentation.velocity.DefaultCommentAuthenticator;
import org.roller.util.StringUtils;
import org.roller.util.Utilities;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.support.WebApplicationContextUtils;
+
import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-import net.sf.acegisecurity.ConfigAttributeDefinition;
-import net.sf.acegisecurity.SecurityConfig;
-import net.sf.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap;
-import net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint;
/**
Added: incubator/roller/trunk/tools/spring-1.2/acegi-security-1.0.0-RC1.jar
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tools/spring-1.2/acegi-security-1.0.0-RC1.jar?rev=372298&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/tools/spring-1.2/acegi-security-1.0.0-RC1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/log4j.properties?rev=372298&r1=372297&r2=372298&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/log4j.properties Wed Jan 25 11:37:38 2006
@@ -15,7 +15,7 @@
log4j.category.org.apache.struts=ERROR
log4j.category.org.tuckey.web.filters.urlrewrite=DEBUG
log4j.category.org.springframework=WARN
-log4j.category.net.sf.acegisecurity=ERROR
+log4j.category.org.acegisecurity=ERROR
# Tomcat's ClientAbortExceptions cause Velocity to talk way
# too much so by default Velocity is set to STFU mode.
Modified: incubator/roller/trunk/web/WEB-INF/security.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/security.xml?rev=372298&r1=372297&r2=372298&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/security.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/security.xml Wed Jan 25 11:37:38 2006
@@ -5,14 +5,13 @@
<beans>
<!-- ======================== FILTER CHAIN ======================= -->
- <bean id="filterChainProxy" class="net.sf.acegisecurity.util.FilterChainProxy">
+ <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
<property name="filterInvocationDefinitionSource">
<value>
CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
PATTERN_TYPE_APACHE_ANT
/**=httpSessionContextIntegrationFilter,authenticationProcessingFilter,rememberMeProcessingFilter,channelProcessingFilter,remoteUserFilter,anonymousProcessingFilter,securityEnforcementFilter
</value>
- <!-- Note that channelProcessingFilter before remoteUserFilter to turn on SSL switching, it's off by default -->
</property>
</bean>
@@ -21,7 +20,7 @@
<!-- Note the order that entries are placed against the objectDefinitionSource is critical.
The FilterSecurityInterceptor will work from the top of the list down to the FIRST pattern that matches the request URL.
Accordingly, you should place MOST SPECIFIC (ie a/b/c/d.*) expressions first, with LEAST SPECIFIC (ie a/.*) expressions last -->
- <bean id="filterInvocationInterceptor" class="net.sf.acegisecurity.intercept.web.FilterSecurityInterceptor">
+ <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="accessDecisionManager" ref="accessDecisionManager"/>
<property name="objectDefinitionSource">
@@ -35,7 +34,7 @@
</property>
</bean>
- <bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+ <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
<property name="providers">
<list>
<ref local="daoAuthenticationProvider"/>
@@ -46,15 +45,15 @@
</bean>
<!-- Log failed authentication attempts to commons-logging -->
- <bean id="loggerListener" class="net.sf.acegisecurity.event.authentication.LoggerListener"/>
+ <bean id="loggerListener" class="org.acegisecurity.event.authentication.LoggerListener"/>
- <bean id="daoAuthenticationProvider" class="net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider">
- <property name="authenticationDao" ref="jdbcAuthenticationDao"/>
+ <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
+ <property name="userDetailsService" ref="jdbcAuthenticationDao"/>
<property name="userCache" ref="userCache"/>
</bean>
<!-- Read users from database -->
- <bean id="jdbcAuthenticationDao" class="net.sf.acegisecurity.providers.dao.jdbc.JdbcDaoImpl">
+ <bean id="jdbcAuthenticationDao" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource">
<bean class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="java:comp/env/jdbc/rollerdb"/>
@@ -68,7 +67,7 @@
</property>
</bean>
- <bean id="userCache" class="net.sf.acegisecurity.providers.dao.cache.EhCacheBasedUserCache">
+ <bean id="userCache" class="org.acegisecurity.providers.dao.cache.EhCacheBasedUserCache">
<property name="cache">
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
<property name="cacheManager">
@@ -79,15 +78,15 @@
</property>
</bean>
- <bean id="anonymousAuthenticationProvider" class="net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
+ <bean id="anonymousAuthenticationProvider" class="org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
<property name="key" value="anonymous"/>
</bean>
- <bean id="roleVoter" class="net.sf.acegisecurity.vote.RoleVoter">
+ <bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter">
<property name="rolePrefix" value=""/>
</bean>
- <bean id="accessDecisionManager" class="net.sf.acegisecurity.vote.AffirmativeBased">
+ <bean id="accessDecisionManager" class="org.acegisecurity.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="false"/>
<property name="decisionVoters">
<list>
@@ -97,9 +96,9 @@
</bean>
<!-- ===================== HTTP REQUEST SECURITY ==================== -->
- <bean id="httpSessionContextIntegrationFilter" class="net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter"/>
+ <bean id="httpSessionContextIntegrationFilter" class="org.acegisecurity.context.HttpSessionContextIntegrationFilter"/>
- <bean id="authenticationProcessingFilter" class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
+ <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="authenticationFailureUrl" value="/loginerror.jsp"/>
<property name="defaultTargetUrl" value="/"/>
@@ -107,40 +106,40 @@
<property name="rememberMeServices" ref="rememberMeServices"/>
</bean>
- <bean id="anonymousProcessingFilter" class="net.sf.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
+ <bean id="anonymousProcessingFilter" class="org.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
<property name="key" value="anonymous"/>
<property name="userAttribute" value="anonymous,ROLE_ANONYMOUS"/>
</bean>
- <bean id="securityEnforcementFilter" class="net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter">
+ <bean id="securityEnforcementFilter" class="org.acegisecurity.intercept.web.SecurityEnforcementFilter">
<property name="filterSecurityInterceptor" ref="filterInvocationInterceptor"/>
<property name="authenticationEntryPoint" ref="authenticationProcessingFilterEntryPoint"/>
- </bean>
+ </bean>
- <bean id="remoteUserFilter" class="net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter"/>
+ <bean id="remoteUserFilter" class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter"/>
- <bean id="authenticationProcessingFilterEntryPoint" class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+ <bean id="authenticationProcessingFilterEntryPoint" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
<property name="loginFormUrl" value="/login.jsp"/>
<property name="forceHttps" value="false"/>
</bean>
<!-- ===================== REMEMBER ME ==================== -->
- <bean id="rememberMeProcessingFilter" class="net.sf.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
+ <bean id="rememberMeProcessingFilter" class="org.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
<property name="rememberMeServices" ref="rememberMeServices"/>
</bean>
- <bean id="rememberMeServices" class="net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices">
- <property name="authenticationDao" ref="jdbcAuthenticationDao"/>
+ <bean id="rememberMeServices" class="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices">
+ <property name="userDetailsService" ref="jdbcAuthenticationDao"/>
<property name="key" value="rollerlovesacegi"/>
<property name="parameter" value="rememberMe"/>
</bean>
- <bean id="rememberMeAuthenticationProvider" class="net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
+ <bean id="rememberMeAuthenticationProvider" class="org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
<property name="key" value="rollerlovesacegi"/>
</bean>
<!-- ===================== SSL SWITCHING ==================== -->
- <bean id="channelProcessingFilter" class="net.sf.acegisecurity.securechannel.ChannelProcessingFilter">
+ <bean id="channelProcessingFilter" class="org.acegisecurity.securechannel.ChannelProcessingFilter">
<property name="channelDecisionManager" ref="channelDecisionManager"/>
<property name="filterInvocationDefinitionSource">
<value>
@@ -149,11 +148,11 @@
</property>
</bean>
- <bean id="channelDecisionManager" class="net.sf.acegisecurity.securechannel.ChannelDecisionManagerImpl">
+ <bean id="channelDecisionManager" class="org.acegisecurity.securechannel.ChannelDecisionManagerImpl">
<property name="channelProcessors">
<list>
- <bean class="net.sf.acegisecurity.securechannel.SecureChannelProcessor"/>
- <bean class="net.sf.acegisecurity.securechannel.InsecureChannelProcessor"/>
+ <bean class="org.acegisecurity.securechannel.SecureChannelProcessor"/>
+ <bean class="org.acegisecurity.securechannel.InsecureChannelProcessor"/>
</list>
</property>
</bean>
Modified: incubator/roller/trunk/web/logout-redirect.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/logout-redirect.jsp?rev=372298&r1=372297&r2=372298&view=diff
==============================================================================
--- incubator/roller/trunk/web/logout-redirect.jsp (original)
+++ incubator/roller/trunk/web/logout-redirect.jsp Wed Jan 25 11:37:38 2006
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
<%@ page import="org.roller.presentation.RollerSession" %>
<%@ page import="javax.servlet.http.Cookie" %>
-<%@ page import="net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices" %>
+<%@ page import="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices" %>
<%
request.getSession().removeAttribute(RollerSession.ROLLER_SESSION);