diff --git a/adapters/project.xml b/adapters/project.xml
index a78a8eced1..c7aba81409 100644
--- a/adapters/project.xml
+++ b/adapters/project.xml
@@ -1,14 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <dependencies>
-        <dependency>
-            <groupId>acegi</groupId>
-            <artifactId>acegi-security</artifactId>
-            <version>0.7-SNAPSHOT</version>
-            <url>http://acegisecurity.sourceforge.net</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <dependencies>
+    <dependency>
+      <groupId>acegisecurity</groupId>
+      <artifactId>acegi-security</artifactId>
+      <version>0.7-SNAPSHOT</version>
+      <type>jar</type>
+      <url>http://acegisecurity.sourceforge.net</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>
 </project>
+
diff --git a/project.xml b/project.xml
index 77634d8433..24be8d6789 100644
--- a/project.xml
+++ b/project.xml
@@ -1,310 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <pomVersion>3</pomVersion>
-    <groupId>acegi</groupId>
-    <currentVersion>0.7-SNAPSHOT</currentVersion>
-    <package>net.sf.acegisecurity</package>
-    <description>Acegi Security System for Spring</description>
-    <shortDescription>Acegi Security System for Spring</shortDescription>
-    <url>http://acegisecurity.sourceforge.net/</url>
-    <siteDirectory>/srv/www/htdocs/acegi</siteDirectory>
-    <repository>
-        <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
-        <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/</url>
-    </repository>
-    <mailingLists>
-        <mailingList>
-            <name>Acegi Developer List</name>
-            <archive>http://sourceforge.net/mailarchive/forum.php?forum_id=40659</archive>
-        </mailingList>
-        <mailingList>
-            <name>Spring User List</name>
-            <archive>http://sourceforge.net/mailarchive/forum.php?forum_id=30287</archive>
-        </mailingList>
-    </mailingLists>
-    <developers>
-        <developer>
-            <name>Ben Alex</name>
-            <id>benalex</id>
-            <email>benalex at users.sourceforge.net</email>
-            <roles>
-                <role>Developer</role>
-                <role>Project Admin</role>
-            </roles>
-        </developer>
-        <developer>
-            <name>Francois Beausoleil</name>
-            <id>fbos</id>
-            <email>fbos at users.sourceforge.net</email>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <name>Colin Sampaleanu</name>
-            <id>colins</id>
-            <email>colinml1 at exis.com</email>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <name>Luke Taylor</name>
-            <id>luke_t</id>
-            <email>luke at monkeymachine.ltd.uk</email>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <name>Ray Krueger</name>
-            <id>raykrueger</id>
-            <email>raykrueger at users.sourceforge.net</email>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>0.7</version>
-            <url>http://ehcache.sourceforge.net</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <version>1.1</version>
-            <url>http://www.springframework.org</url>
-        </dependency>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>aopalliance</artifactId>
-            <version>1.0</version>
-            <url>http://aopalliance.sourceforge.net</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-attributes</groupId>
-            <artifactId>commons-attributes-api</artifactId>
-            <version>2.1</version>
-            <url>http://jakarta.apache.org/commons</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-attributes</groupId>
-            <artifactId>commons-attributes-compiler</artifactId>
-            <version>2.1</version>
-            <url>http://jakarta.apache.org/commons</url>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.2</version>
-            <url>http://jakarta.apache.org/commons</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.0</version>
-            <url>http://jakarta.apache.org/commons</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.0.4</version>
-            <url>http://jakarta.apache.org/taglibs/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.0.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>servletapi</groupId>
-            <artifactId>servletapi</artifactId>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.7</version>
-            <url>http://jakarta.apache.org/oro/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.7.2-rc6c</version>
-            <url>http://hsqldb.sourceforge.net/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>cas</groupId>
-            <artifactId>casclient</artifactId>
-            <version>2.0.11</version>
-            <url>http://www.yale.edu/tp/cas</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.2</version>
-            <url>http://www.eclipse.org/aspectj</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
+  <pomVersion>3</pomVersion>
+  <groupId>acegisecurity</groupId>
+  <currentVersion>0.7-SNAPSHOT</currentVersion>
+  <package>net.sf.acegisecurity</package>
+  <description>Acegi Security System for Spring</description>
+  <shortDescription>Acegi Security System for Spring</shortDescription>
+  <url>http://acegisecurity.sourceforge.net/</url>
+  <siteDirectory>/srv/www/htdocs/acegi</siteDirectory>
+  <repository>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/</url>
+  </repository>
+  <mailingLists>
+    <mailingList>
+      <name>Acegi Developer List</name>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum_id=40659</archive>
+    </mailingList>
+    <mailingList>
+      <name>Spring User List</name>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum_id=30287</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <name>Ben Alex</name>
+      <id>benalex</id>
+      <email>benalex at users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <name>Francois Beausoleil</name>
+      <id>fbos</id>
+      <email>fbos at users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <name>Colin Sampaleanu</name>
+      <id>colins</id>
+      <email>colinml1 at exis.com</email>
+    </developer>
+    <developer>
+      <name>Luke Taylor</name>
+      <id>luke_t</id>
+      <email>luke at monkeymachine.ltd.uk</email>
+    </developer>
+    <developer>
+      <name>Ray Krueger</name>
+      <id>raykrueger</id>
+      <email>raykrueger at users.sourceforge.net</email>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>0.7</version>
+      <url>http://ehcache.sourceforge.net</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <url>http://aopalliance.sourceforge.net</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.2</version>
+      <url>http://jakarta.apache.org/commons</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.0</version>
+      <url>http://jakarta.apache.org/commons</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.0.2</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.7</version>
+      <url>http://jakarta.apache.org/oro/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.2-rc6c</version>
+      <url>http://hsqldb.sourceforge.net/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <!-- maven plugins -->
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-dao</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-mock</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+    </dependency>
+    <dependency>
+      <groupId>commons-attributes</groupId>
+      <artifactId>commons-attributes-api</artifactId>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-attributes</groupId>
+      <artifactId>commons-attributes-compiler</artifactId>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons</url>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.0.4</version>
+      <url>http://jakarta.apache.org/taglibs/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>cas</groupId>
+      <artifactId>casclient</artifactId>
+      <version>2.0.11</version>
+      <url>http://www.yale.edu/tp/cas</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.2</version>
+      <url>http://www.eclipse.org/aspectj</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>maven-plugins</groupId>
+      <artifactId>maven-findbugs-plugin</artifactId>
+      <version>0.8.4</version>
+      <type>plugin</type>
+    </dependency>
+    <dependency>
+      <groupId>statcvs</groupId>
+      <artifactId>maven-statcvs-plugin</artifactId>
+      <version>2.5</version>
+      <type>plugin</type>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    <unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Tests.java</include>
+      </includes>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test/resources</directory>
+          <includes>
+            <include>**/**</include>
+          </includes>
+          <excludes>
+            <exclude>**/*.java</exclude>
+          </excludes>
+          <filtering>false</filtering>
+        </resource>
+      </resources>
+    </unitTest>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <includes>
+          <include>**/**</include>
+        </includes>
+        <filtering>false</filtering>
+      </resource>
+    </resources>
+  </build>
+  <reports>
+    <report>maven-changelog-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-checkstyle-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-jdepend-plugin</report>
+    <report>maven-junit-report-plugin</report>
+    <report>maven-jxr-plugin</report>
+    <report>maven-license-plugin</report>
+    <report>maven-pmd-plugin</report>
+    <report>maven-simian-plugin</report>
+    <report>maven-tasklist-plugin</report>
+    <report>maven-faq-plugin</report>
+    <report>maven-clover-plugin</report>
+    <report>maven-findbugs-plugin</report>
+    <report>maven-statcvs-plugin</report>
+  </reports>
+  <properties />
+</project>
 
-        <!-- maven plugins -->
-        <dependency>
-            <groupId>maven-plugins</groupId>
-            <artifactId>maven-findbugs-plugin</artifactId>
-            <version>0.8.4</version>
-            <type>plugin</type>
-        </dependency>
-        <dependency>
-            <groupId>statcvs</groupId>
-            <artifactId>maven-statcvs-plugin</artifactId>
-            <version>2.5</version>
-            <type>plugin</type>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/*Tests.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test/resources</directory>
-                    <includes>
-                        <include>**/**</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                    <filtering>false</filtering>
-                </resource>
-            </resources>
-        </unitTest>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-                <includes>
-                    <include>**/**</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-    </build>
-    <reports>
-        <report>maven-changelog-plugin</report>
-        <report>maven-developer-activity-plugin</report>
-        <report>maven-file-activity-plugin</report>
-        <report>maven-checkstyle-plugin</report>
-        <report>maven-javadoc-plugin</report>
-        <report>maven-jdepend-plugin</report>
-        <report>maven-junit-report-plugin</report>
-        <report>maven-jxr-plugin</report>
-        <report>maven-license-plugin</report>
-        <report>maven-pmd-plugin</report>
-        <report>maven-simian-plugin</report>
-        <report>maven-tasklist-plugin</report>
-        <report>maven-faq-plugin</report>
-        <report>maven-clover-plugin</report>
-        <report>maven-findbugs-plugin</report>
-        <report>maven-statcvs-plugin</report>
-    </reports>
-    <properties/>
-</project>
\ No newline at end of file