Modify Acegifier to use Maven build and 1.0.0+ package names.

.classpath

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="samples/attributes/src/main/java"/>
+	<classpathentry kind="src" path="samples/acegifier/src/main/resources"/>
+	<classpathentry kind="src" path="samples/acegifier/src/main/java"/>
+	<classpathentry kind="src" path="samples/acegifier/src/test/java"/>
 	<classpathentry kind="src" path="domain/src/main/java"/>
 	<classpathentry kind="src" path="domain/src/main/resource"/>
 	<classpathentry kind="src" path="domain/src/test/java"/>
@@ -64,5 +67,8 @@
 	<classpathentry kind="src" path="samples/annotations/src/test/java"/>
 	<classpathentry kind="src" path="samples/contacts-tiger/src/main/java"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jcifs/jars/jcifs-1.2.6.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xmlParserAPIs-2.6.2.jar"/>
 	<classpathentry kind="output" path="target/eclipseclasses"/>
 </classpath>

samples/acegifier/.cvsignore

@@ -0,0 +1 @@
+target

samples/acegifier/project.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>acegi-security-sample-acegifier</artifactId>
+  <name>Acegi Security System for Spring - Acegifier sample</name>
+  <groupId>acegisecurity</groupId>
+  <siteDirectory>/home/groups/a/ac/acegisecurity/htdocs/multiproject/acegi-security-sample-acegifier</siteDirectory>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/samples/acegifier/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6</version>
+      <type>jar</type>
+      <url>http://www.dom4j.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>
+</project>

samples/acegifier/src/java/acegifier/WebXmlConverter.java → samples/acegifier/src/main/java/acegifier/WebXmlConverter.java

@@ -1,20 +1,25 @@
 package acegifier;
 
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.util.Assert;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamSource;
+
 import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
 import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
 import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-import org.dom4j.io.DocumentSource;
 import org.dom4j.io.DocumentResult;
-
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamSource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
+import org.dom4j.io.DocumentSource;
+import org.dom4j.io.SAXReader;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.Assert;
 
 /**
  * A utility to translate a web.xml file into a set of acegi security spring beans.
@@ -47,15 +52,19 @@ public class WebXmlConverter {
     private Document newWebXml, acegiBeansXml;
 
     public WebXmlConverter() throws IOException, TransformerConfigurationException {
-        TransformerFactory tf = TransformerFactory.newInstance();
-
-        acegiSecurityTransformer = tf.newTransformer(createTransformerSource(WEB_TO_SPRING_XSL_FILE));
+    	TransformerFactory tf = TransformerFactory.newInstance();
+    	Source source = createTransformerSource(WEB_TO_SPRING_XSL_FILE);
+    	System.out.println("1");
+        acegiSecurityTransformer = tf.newTransformer(source);
+        System.out.println("2");
         newWebXmlTransformer = tf.newTransformer(createTransformerSource(NEW_WEB_XSLT_FILE));
+        System.out.println("3");
     }
 
     private Source createTransformerSource(String fileName) throws IOException {
         ClassPathResource resource = new ClassPathResource(fileName);
-        return new StreamSource(resource.getInputStream());
+        Source source = new StreamSource(resource.getInputStream());
+        return source;
     }
 
     /**

samples/acegifier/src/java/acegifier/web/AcegifierController.java → samples/acegifier/src/main/java/acegifier/web/AcegifierController.java

@@ -1,28 +1,28 @@
 package acegifier.web;
 
-import org.springframework.web.servlet.mvc.SimpleFormController;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.validation.BindException;
-import org.springframework.validation.Errors;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.beans.BeansException;
-import net.sf.acegisecurity.util.InMemoryResource;
-
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.io.XMLWriter;
-import org.dom4j.io.OutputFormat;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.TransformerException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sf.acegisecurity.util.FilterChainProxy;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.TransformerException;
+
+import org.acegisecurity.util.FilterChainProxy;
+import org.acegisecurity.util.InMemoryResource;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.validation.BindException;
+import org.springframework.validation.Errors;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.SimpleFormController;
+
 import acegifier.WebXmlConverter;
 
 /**

samples/acegifier/src/webapp/WEB-INF/classes/acegi-web.xsl → samples/acegifier/src/main/resources/acegi-web.xsl

@@ -43,10 +43,10 @@
 
     <filter>
         <filter-name>Acegi Filter Chain Proxy</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>
     <xsl:text>&#xA;&#xA;</xsl:text>

samples/acegifier/src/webapp/WEB-INF/classes/web-to-spring.xsl → samples/acegifier/src/main/resources/web-to-spring.xsl

@@ -71,7 +71,7 @@
 <xsl:template name="authentication-beans">
     <xsl:comment>======================== AUTHENTICATION =======================</xsl:comment>
     
-    <bean id="authenticationManager" class="net.sf.acegisecurity.providers.ProviderManager">
+    <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
       <property name="providers">
          <list>
             <ref local="daoAuthenticationProvider"/>
@@ -81,13 +81,13 @@
       </property>
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
-    <bean id="daoAuthenticationProvider" class="net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider">
+    <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
       <property name="authenticationDao"><ref local="inMemoryDaoImpl"/></property>
       <!-- property name="userCache"><ref local="userCache"/></property-->
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="inMemoryDaoImpl" class="net.sf.acegisecurity.providers.dao.memory.InMemoryDaoImpl">
+    <bean id="inMemoryDaoImpl" class="org.acegisecurity.providers.dao.memory.InMemoryDaoImpl">
         <property name="userMap">
             <value>    
         superuser=password,<xsl:value-of select="$all-roles"/>
@@ -97,32 +97,32 @@
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="anonymousProcessingFilter" class="net.sf.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
+    <bean id="anonymousProcessingFilter" class="org.acegisecurity.providers.anonymous.AnonymousProcessingFilter">
       <property name="key"><value>foobar</value></property>
       <property name="userAttribute"><value>anonymousUser,ROLE_ANONYMOUS</value></property>
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="anonymousAuthenticationProvider" class="net.sf.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
+    <bean id="anonymousAuthenticationProvider" class="org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider">
       <property name="key"><value>foobar</value></property>
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="httpSessionContextIntegrationFilter" class="net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter"/>
+    <bean id="httpSessionContextIntegrationFilter" class="org.acegisecurity.context.HttpSessionContextIntegrationFilter"/>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="rememberMeProcessingFilter" class="net.sf.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
+    <bean id="rememberMeProcessingFilter" class="org.acegisecurity.ui.rememberme.RememberMeProcessingFilter">
       <property name="rememberMeServices"><ref local="rememberMeServices"/></property>
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="rememberMeServices" class="net.sf.acegisecurity.ui.rememberme.TokenBasedRememberMeServices">
+    <bean id="rememberMeServices" class="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices">
       <property name="authenticationDao"><ref local="inMemoryDaoImpl"/></property>
       <property name="key"><value>springRocks</value></property>
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
 
-    <bean id="rememberMeAuthenticationProvider" class="net.sf.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
+    <bean id="rememberMeAuthenticationProvider" class="org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider">
       <property name="key"><value>springRocks</value></property>
     </bean>
     <xsl:text>&#xA;&#xA;</xsl:text>
@@ -134,7 +134,7 @@
  -->
 <xsl:template match="login-config">
 
-   <bean id="securityEnforcementFilter" class="net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter">
+   <bean id="securityEnforcementFilter" class="org.acegisecurity.intercept.web.SecurityEnforcementFilter">
       <property name="filterSecurityInterceptor"><ref local="filterInvocationInterceptor"/></property>
       <property name="authenticationEntryPoint">
     <xsl:choose>
@@ -154,13 +154,13 @@
             <xsl:call-template name="form-login"/>
         </xsl:when>
         <xsl:when test="$auth-method = 'BASIC'">
-   <bean id="basicProcessingFilter" class="net.sf.acegisecurity.ui.basicauth.BasicProcessingFilter">
+   <bean id="basicProcessingFilter" class="org.acegisecurity.ui.basicauth.BasicProcessingFilter">
       <property name="authenticationManager"><ref local="authenticationManager"/></property>
       <property name="authenticationEntryPoint"><ref local="basicProcessingFilterEntryPoint"/></property>
    </bean>
    <xsl:text>&#xA;&#xA;</xsl:text>
 
-   <bean id="basicProcessingFilterEntryPoint" class="net.sf.acegisecurity.ui.basicauth.BasicProcessingFilterEntryPoint">
+   <bean id="basicProcessingFilterEntryPoint" class="org.acegisecurity.ui.basicauth.BasicProcessingFilterEntryPoint">
       <property name="realmName"><value>Your Realm</value></property>
    </bean>
    <xsl:text>&#xA;&#xA;</xsl:text>
@@ -180,7 +180,7 @@
   <xsl:comment>Make sure that these properties match your setup. In particular, remember to switch your login
   form action from "j_security_check" to "j_acegi_security_check"
   </xsl:comment>
-  <bean id="authenticationProcessingFilter" class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
+  <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilter">
     <property name="authenticationManager"><ref bean="authenticationManager"/></property>
     <property name="authenticationFailureUrl"><value><xsl:value-of select="form-login-config/form-error-page"/></value></property>
     <property name="defaultTargetUrl"><value>/</value></property>
@@ -189,7 +189,7 @@
   </bean>
   <xsl:text>&#xA;&#xA;</xsl:text>
 
-  <bean id="authenticationProcessingFilterEntryPoint" class="net.sf.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+  <bean id="authenticationProcessingFilterEntryPoint" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint">
     <property name="loginFormUrl"><value><xsl:value-of select="form-login-config/form-login-page"/></value></property>
     <property name="forceHttps"><value>false</value></property>
   </bean>
@@ -204,7 +204,7 @@
 
 	<xsl:comment>if you wish to use channel security, add "channelProcessingFilter," in front
 	      of "httpSessionContextIntegrationFilter" in the list below</xsl:comment>
-	<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
@@ -219,7 +219,7 @@
 </xsl:template>
     
 <xsl:template name="filter-invocation-interceptor">
-  <bean id="httpRequestAccessDecisionManager" class="net.sf.acegisecurity.vote.AffirmativeBased">
+  <bean id="httpRequestAccessDecisionManager" class="org.acegisecurity.vote.AffirmativeBased">
     <property name="allowIfAllAbstainDecisions"><value>false</value></property>
     <property name="decisionVoters">
       <list>
@@ -229,7 +229,7 @@
   </bean>
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:comment>An access decision voter that reads ROLE_* configuration settings</xsl:comment>
-  <bean id="roleVoter" class="net.sf.acegisecurity.vote.RoleVoter"/>            
+  <bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter"/>            
   <xsl:text>&#xA;&#xA;</xsl:text>
     
     <xsl:comment> 
@@ -240,7 +240,7 @@
        original intention but there isn't a direct mapping to the acegi way of doing things. You should modify the permissions as required,
        removing anonymous access where necessary.
     </xsl:comment>
-  <bean id="filterInvocationInterceptor" class="net.sf.acegisecurity.intercept.web.FilterSecurityInterceptor">
+  <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
     <property name="authenticationManager"><ref bean="authenticationManager"/></property>
     <property name="accessDecisionManager"><ref local="httpRequestAccessDecisionManager"/></property>
     <property name="objectDefinitionSource">

samples/acegifier/src/test/acegifier/WebXmlConverterTests.java → samples/acegifier/src/test/java/acegifier/WebXmlConverterTests.java

@@ -1,23 +1,26 @@
 package acegifier;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
 import junit.framework.TestCase;
-import net.sf.acegisecurity.UserDetails;
-import net.sf.acegisecurity.intercept.web.FilterSecurityInterceptor;
-import net.sf.acegisecurity.intercept.web.SecurityEnforcementFilter;
-import net.sf.acegisecurity.providers.ProviderManager;
-import net.sf.acegisecurity.providers.dao.DaoAuthenticationProvider;
-import net.sf.acegisecurity.providers.dao.memory.InMemoryDaoImpl;
-import net.sf.acegisecurity.util.InMemoryResource;
+
+import org.acegisecurity.UserDetails;
+import org.acegisecurity.intercept.web.FilterSecurityInterceptor;
+import org.acegisecurity.intercept.web.SecurityEnforcementFilter;
+import org.acegisecurity.providers.ProviderManager;
+import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
+import org.acegisecurity.providers.dao.memory.InMemoryDaoImpl;
+import org.acegisecurity.util.InMemoryResource;
+import org.dom4j.Document;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.dom4j.Document;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
+import acegifier.WebXmlConverter;
 
 /**
  * Tests the WebXmlConverter by applying it to a sample web.xml file.
@@ -29,6 +32,7 @@ public class WebXmlConverterTests extends TestCase {
 
     public void testFileConversion() throws Exception {
         WebXmlConverter converter = new WebXmlConverter();
+    	Thread.dumpStack();
 
         Resource r = new ClassPathResource("test-web.xml");
         converter.setInput(r.getInputStream());