Should we upgrade Acegi to 1.0.0-RC1 before we do a 2.1 release? It's
probably a good idea to do it sooner than later, especially since they
changed their package names. I've done the upgrade in my workspace -
here's the patch.
Index: C:/Source/roller/metadata/xdoclet/filters.xml
===================================================================
--- C:/Source/roller/metadata/xdoclet/filters.xml (revision 371815)
+++ C:/Source/roller/metadata/xdoclet/filters.xml (working copy)
@@ -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>
Index: C:/Source/roller/src/org/roller/presentation/RollerContext.java
===================================================================
--- C:/Source/roller/src/org/roller/presentation/RollerContext.java
(revision
371815)
+++ C:/Source/roller/src/org/roller/presentation/RollerContext.java (working
copy)
@@ -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;
/**
Index: C:/Source/roller/.classpath
===================================================================
--- C:/Source/roller/.classpath (revision 371815)
+++ C:/Source/roller/.classpath (working copy)
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="sandbox/jdobackend/src"/>
- <classpathentry kind="src" path="sandbox/atomprotocol/src"/>
- <classpathentry kind="src" path="sandbox/standalone/src"/>
- <classpathentry kind="src" path="contrib/plugins/src"/>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="src" path="build/generated/src.business"/>
- <classpathentry kind="src" path="build/generated/src.presentation"/>
- <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
- <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/nekohtml.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/mockrunner.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/tomcat-5.0.28/servlet-api.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/tomcat-5.0.28/jsp-api.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/xmlParserAPIs-2.3.0.jar"/>
- <classpathentry kind="lib" path="tools/buildtime/xercesImpl-2.3.0.jar"/>
- <classpathentry kind="lib" path="tools/buildtime/hsqldb.jar"/>
- <classpathentry kind="lib" path="tools/buildtime/ejb-1.1.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/jakarta-oro-2.0.8.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/commons-net-1.2.2.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/ant-launcher.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/ant-junit.jar"/>
- <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/ant-commons-net.jar"/>
- <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant.jar"/>
- <classpathentry kind="lib" path="tools/lib/xmlrpc-1.2-b1.jar"/>
- <classpathentry kind="lib" path="tools/lib/velocity-tools-1.1.jar"/>
- <classpathentry kind="lib" path="tools/lib/velocity-dep-1.4.jar"/>
- <classpathentry kind="lib" path="tools/lib/velocity-1.4.jar"/>
- <classpathentry kind="lib" path="tools/lib/taglibs-string.jar"/>
- <classpathentry kind="lib" path="tools/lib/mail.jar"/>
- <classpathentry kind="lib" path="tools/lib/lucene-1.4.3.jar"/>
- <classpathentry kind="lib" path="tools/lib/jazzy-core.jar"/>
- <classpathentry kind="lib" path="tools/lib/ekitapplet.jar"/>
- <classpathentry kind="lib" path="tools/lib/concurrent-1.3.2.jar"/>
- <classpathentry kind="lib"
path="tools/lib/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="lib"
path="tools/lib/commons-betwixt-1.0-beta-1.jar"/>
- <classpathentry kind="lib" path="tools/lib/activation.jar"/>
- <classpathentry kind="lib"
path="tools/standard-1.0.3/lib/standard.jar"/>
- <classpathentry kind="lib" path="tools/standard-1.0.3/lib/jstl.jar"/>
- <classpathentry kind="lib"
path="tools/standard-1.0.3/lib/jaxen-full.jar"/>
- <classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts-el.jar"/>
- <classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/jakarta-oro.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-validator.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-logging.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-lang-2.0.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-fileupload.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-digester.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-collections.jar"/>
- <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-beanutils.jar"/>
- <classpathentry kind="lib" path="tools/struts-1.2.4/lib/antlr.jar"/>
- <classpathentry kind="lib" path="contrib/lib/textile4j-1.20.jar"/>
- <classpathentry kind="lib" path="contrib/lib/radeox.jar"/>
- <classpathentry kind="lib" path="contrib/lib/jython.jar"/>
- <classpathentry kind="lib" path="contrib/lib/JSPWiki.jar"/>
- <classpathentry kind="lib" path="tools/buildtime/junit-3.8.1.jar"/>
- <classpathentry sourcepath="/Applications/Java/hibernate-3.0/src"
kind="lib" path="tools/hibernate-3.0/hibernate3.jar"/>
- <classpathentry kind="lib" path="tools/hibernate-3.0/lib/jta.jar"/>
- <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/jdbc2_0-stdext.jar"/>
- <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/ehcache-1.1.jar"/>
- <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/dom4j-1.6.jar"/>
- <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/cglib-2.1.jar"/>
- <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/asm-attrs.jar"/>
- <classpathentry kind="lib" path="tools/hibernate-3.0/lib/asm.jar"/>
- <classpathentry kind="lib" path="tools/lib/jdom.jar"/>
- <classpathentry kind="lib"
path="sandbox/atomprotocol/lib/rome-fetcher-0.8.jar"/>
- <classpathentry kind="lib"
path="sandbox/atomprotocol/lib/rome-0.8.jar"/>
- <classpathentry kind="lib" path="sandbox/standalone/lib/catalina.jar"/>
- <classpathentry kind="lib" path="tools/lib/log4j-1.2.11.jar"/>
- <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="output" path="classes.eclipse"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="sandbox/jdobackend/src"/>
+ <classpathentry kind="src" path="sandbox/atomprotocol/src"/>
+ <classpathentry kind="src" path="sandbox/standalone/src"/>
+ <classpathentry kind="src" path="contrib/plugins/src"/>
+ <classpathentry kind="src" path="tests"/>
+ <classpathentry kind="src" path="build/generated/src.business"/>
+ <classpathentry kind="src" path="build/generated/src.presentation"/>
+ <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
+ <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/nekohtml.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/mockrunner-0.35/lib/mockrunner.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/tomcat-5.0.28/servlet-api.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/tomcat-5.0.28/jsp-api.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/xmlParserAPIs-2.3.0.jar"/>
+ <classpathentry kind="lib" path="tools/buildtime/xercesImpl-2.3.0.jar"/>
+ <classpathentry kind="lib" path="tools/buildtime/hsqldb.jar"/>
+ <classpathentry kind="lib" path="tools/buildtime/ejb-1.1.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/jakarta-oro-2.0.8.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/commons-net-1.2.2.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/ant-launcher.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/ant-junit.jar"/>
+ <classpathentry kind="lib"
path="tools/buildtime/ant-1.6.2/ant-commons-net.jar"/>
+ <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant.jar"/>
+ <classpathentry kind="lib" path="tools/lib/xmlrpc-1.2-b1.jar"/>
+ <classpathentry kind="lib" path="tools/lib/velocity-tools-1.1.jar"/>
+ <classpathentry kind="lib" path="tools/lib/velocity-dep-1.4.jar"/>
+ <classpathentry kind="lib" path="tools/lib/velocity-1.4.jar"/>
+ <classpathentry kind="lib" path="tools/lib/taglibs-string.jar"/>
+ <classpathentry kind="lib" path="tools/lib/mail.jar"/>
+ <classpathentry kind="lib" path="tools/lib/lucene-1.4.3.jar"/>
+ <classpathentry kind="lib" path="tools/lib/jazzy-core.jar"/>
+ <classpathentry kind="lib" path="tools/lib/ekitapplet.jar"/>
+ <classpathentry kind="lib" path="tools/lib/concurrent-1.3.2.jar"/>
+ <classpathentry kind="lib"
path="tools/lib/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="lib"
path="tools/lib/commons-betwixt-1.0-beta-1.jar"/>
+ <classpathentry kind="lib" path="tools/lib/activation.jar"/>
+ <classpathentry kind="lib"
path="tools/standard-1.0.3/lib/standard.jar"/>
+ <classpathentry kind="lib" path="tools/standard-1.0.3/lib/jstl.jar"/>
+ <classpathentry kind="lib"
path="tools/standard-1.0.3/lib/jaxen-full.jar"/>
+ <classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts-el.jar"/>
+ <classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/jakarta-oro.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-validator.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-logging.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-lang-2.0.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-fileupload.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-digester.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-collections.jar"/>
+ <classpathentry kind="lib"
path="tools/struts-1.2.4/lib/commons-beanutils.jar"/>
+ <classpathentry kind="lib" path="tools/struts-1.2.4/lib/antlr.jar"/>
+ <classpathentry kind="lib" path="contrib/lib/textile4j-1.20.jar"/>
+ <classpathentry kind="lib" path="contrib/lib/radeox.jar"/>
+ <classpathentry kind="lib" path="contrib/lib/jython.jar"/>
+ <classpathentry kind="lib" path="contrib/lib/JSPWiki.jar"/>
+ <classpathentry kind="lib" path="tools/buildtime/junit-3.8.1.jar"/>
+ <classpathentry sourcepath="/Applications/Java/hibernate-3.0/src"
kind="lib" path="tools/hibernate-3.0/hibernate3.jar"/>
+ <classpathentry kind="lib" path="tools/hibernate-3.0/lib/jta.jar"/>
+ <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/jdbc2_0-stdext.jar"/>
+ <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/ehcache-1.1.jar"/>
+ <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/dom4j-1.6.jar"/>
+ <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/cglib-2.1.jar"/>
+ <classpathentry kind="lib"
path="tools/hibernate-3.0/lib/asm-attrs.jar"/>
+ <classpathentry kind="lib" path="tools/hibernate-3.0/lib/asm.jar"/>
+ <classpathentry kind="lib" path="tools/lib/jdom.jar"/>
+ <classpathentry kind="lib"
path="sandbox/atomprotocol/lib/rome-fetcher-0.8.jar"/>
+ <classpathentry kind="lib"
path="sandbox/atomprotocol/lib/rome-0.8.jar"/>
+ <classpathentry kind="lib" path="sandbox/standalone/lib/catalina.jar"/>
+ <classpathentry kind="lib" path="tools/lib/log4j-1.2.11.jar"/>
+ <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-1.0.0-RC1.jar"/>
+ <classpathentry kind="output" path="classes.eclipse"/>
+</classpath>
Index: C:/Source/roller/web/WEB-INF/security.xml
===================================================================
--- C:/Source/roller/web/WEB-INF/security.xml (revision 371815)
+++ C:/Source/roller/web/WEB-INF/security.xml (working copy)
@@ -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,56 @@
<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"/>
+ <property name="authenticationEntryPoint"
ref="authenticationProcessingFilterEntryPoint"/>
+ <property name="portResolver" ref="portResolver"/>
</bean>
+
+ <bean id="portResolver" class="org.acegisecurity.util.PortResolverImpl">
+ <property name="portMapper" ref="portMapper"/>
+ </bean>
+
+ <bean id="portMapper" class="org.acegisecurity.util.PortMapperImpl">
+ <property name="portMappings">
+ <map>
+ <entry key="8080" value="8443"/>
+ <entry key="80" value="443"/>
+ <entry key="9080" value="9443"/>
+ </map>
+ </property>
+ </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"/>
+ <property name="forceHttps" value="false"/>
+ <property name="portMapper" ref="portMapper"/>
</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 +164,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>
On 1/23/06, Henri Yandell <[EMAIL PROTECTED]> wrote:
> * The roller-tools tar.gz unpacks as roller-src instead of roller-tools.
>
> * Need to add Elias to the list of committers in README.txt. (Matt's
> not got an account yet does he?)
>
> * When I install Roller, I get the following in my localhost log file:
>
> 2006-01-24 00:19:19 StandardContext[/roller]Error configuring
> application listener of class org.roller.presentation.RollerSession
> java.lang.UnsupportedClassVersionError:
> org/roller/presentation/RollerSession (Unsupported major.minor version
> 49.0)
>
> Compiled under JDK 1.5?
>
> Hen
>
> On 1/20/06, Dave Johnson <[EMAIL PROTECTED]> wrote:
> >
> > I've prepared a Roller 2.1 release candidate (RC1) for testing.
> > If you have time please try it out, give it some testing and report
> > problems to JIRA.
> >
> >
> > Release file are here:
> > http://people.apache.org/~snoopdave/release_candidates/
> >
> > Installation Guide on the wiki appears to be up-to-date:
> > http://rollerweblogger.org/wiki/Wiki.jsp?page=InstallationGuide_2.x
> >
> > User guide includes 2.1 changes:
> > http://people.apache.org/~snoopdave/doc_drafts/
> >
> >
> > And I'm working on a doc that summarizes all the cool new stuff in 2.1.
> >
> > - Dave
> >
> >
>
