diff --git a/.classpath b/.classpath
index e96de12118..f03e933b4c 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,6 @@
 	<classpathentry kind="src" path="samples/attributes/src"/>
 	<classpathentry kind="src" path="integration-test/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/aop-alliance/aopalliance.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-commons/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/j2ee/servlet.jar"/>
 	<classpathentry kind="lib" path="lib/junit/junit.jar"/>
@@ -21,8 +20,9 @@
 	<classpathentry kind="lib" path="lib/regexp/jakarta-oro.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-commons/commons-codec.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldb/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/cas/cas.jar"/>
-	<classpathentry kind="lib" path="lib/cas/casclient.jar"/>
 	<classpathentry kind="lib" path="lib/ehcache/ehcache.jar"/>
+	<classpathentry kind="lib" path="lib/aopalliance/aopalliance-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/cas/cas-2.0.12-beta3.jar"/>
+	<classpathentry kind="lib" path="lib/cas/casclient-2.0.10.jar"/>
 	<classpathentry kind="output" path="target/eclipseclasses"/>
 </classpath>
diff --git a/lib/cas/version.txt b/lib/cas/version.txt
deleted file mode 100644
index bd53c5c24d..0000000000
--- a/lib/cas/version.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CAS Server 2.0.12 beta 3
-CAS Client 2.0.10
diff --git a/project.properties b/project.properties
index 0792815b48..9490cef1b2 100644
--- a/project.properties
+++ b/project.properties
@@ -88,3 +88,25 @@ target.clover.html.dir=${target.dir}/clover-reports
 doc.dir=docs
 doc.ref.dir=docs/reference
 dist.ref.dir=docs/reference
+
+
+# ------------------------------------------------------------------------ 
+#     maven configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+maven.jar.override = on
+
+maven.jar.aopalliance = ${basedir}/lib/aopalliance/aopalliance-1.0.jar
+maven.jar.commons-attributes-api = ${basedir}/lib/jakarta-commons/commons-attributes-api-SNAPSHOT.jar
+maven.jar.commons-attributes-compiler = ${basedir}/lib/jakarta-commons/commons-attributes-compiler-SNAPSHOT.jar
+
+maven.jar.cas = ${basedir}/lib/cas/cas-2.0.12-beta3.jar
+maven.jar.casclient = ${basedir}/lib/cas/casclient-2.0.10.jar
+
+maven.jar.catalina-extracted = ${basedir}/lib/extracted/catalina/catalina-extracted.jar
+maven.jar.jmx-extracted = ${basedir}/lib/extracted/catalina/jmx-extracted.jar
+maven.jar.jboss-common-extracted = ${basedir}/lib/extracted/jboss/jboss-common-extracted.jar
+maven.jar.jbosssx-extracted = ${basedir}/lib/extracted/jboss/jbosssx-extracted.jar
+maven.jar.org.mortbay.jetty-extracted = ${basedir}/lib/extracted/jetty/org.mortbay.jetty-extracted.jar
+maven.jar.resin-extracted = ${basedir}/lib/extracted/resin/resin-extracted.jar
+
diff --git a/project.xml b/project.xml
new file mode 100644
index 0000000000..4c87a61a7a
--- /dev/null
+++ b/project.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+   <pomVersion>3</pomVersion>
+   <id>acegi-security</id>
+   <name>Acegi Security System for Spring</name>
+   <currentVersion>0.51</currentVersion>
+   <groupId>acegi</groupId>
+   <package>net.sf.acegisecurity</package>
+   <shortDescription>Acegi Security System for Spring</shortDescription>
+   <description>Acegi Security System for Spring</description>
+
+   <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>
+
+      <!-- Spring dependencies -->
+      <dependency>
+         <groupId>springframework</groupId>
+         <artifactId>spring-core</artifactId>
+         <version>1.0.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.0.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.0.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.0.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.0.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.0.1</version>
+         <url>http://www.springframework.org</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-attributes</groupId>
+         <artifactId>commons-attributes-api</artifactId>
+         <version>SNAPSHOT</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>SNAPSHOT</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.1</version>
+         <url>http://hsqldb.sourceforge.net/</url>
+         <properties>
+            <war.bundle>true</war.bundle>
+         </properties>
+      </dependency>
+
+      <dependency>
+         <groupId>cas</groupId>
+         <artifactId>cas</artifactId>
+         <version>2.0.12-beta3</version>
+         <url>http://www.yale.edu/tp/cas</url>
+      </dependency>
+
+      <dependency>
+         <groupId>cas</groupId>
+         <artifactId>casclient</artifactId>
+         <version>2.0.10</version>
+         <url>http://www.yale.edu/tp/cas</url>
+         <properties>
+            <war.bundle>true</war.bundle>
+         </properties>
+      </dependency>
+
+      <!-- Extracted -->
+
+      <dependency>
+         <groupId>acegi</groupId>
+         <artifactId>catalina-extracted</artifactId>
+         <version>unknown</version>
+      </dependency>
+
+      <dependency>
+         <groupId>acegi</groupId>
+         <artifactId>jmx-extracted</artifactId>
+         <version>unknown</version>
+      </dependency>
+
+      <dependency>
+         <groupId>acegi</groupId>
+         <artifactId>jboss-common-extracted</artifactId>
+         <version>unknown</version>
+      </dependency>
+
+      <dependency>
+         <groupId>acegi</groupId>
+         <artifactId>jbosssx-extracted</artifactId>
+         <version>unknown</version>
+      </dependency>
+
+      <dependency>
+         <groupId>acegi</groupId>
+         <artifactId>org.mortbay.jetty-extracted</artifactId>
+         <version>unknown</version>
+      </dependency>
+
+      <dependency>
+         <groupId>acegi</groupId>
+         <artifactId>resin-extracted</artifactId>
+         <version>unknown</version>
+      </dependency>
+
+   </dependencies>
+
+
+   <build>
+      <sourceDirectory>${basedir}/src</sourceDirectory>
+      <unitTestSourceDirectory>${basedir}/tests</unitTestSourceDirectory>
+
+      <!-- Unit test cases -->
+      <unitTest>
+         <includes>
+            <include>**/*Tests.java</include>
+         </includes>
+         <resources>
+            <resource>
+               <directory>${basedir}/test</directory>
+                  <includes>
+                     <include>**/**</include>
+                  </includes>
+                 <excludes>
+                    <exclude>**/*.java</exclude>
+                 </excludes>
+            </resource>
+         </resources>
+      </unitTest>
+
+      <!-- Jar resources -->
+      <resources>
+         <resource>
+            <directory>${basedir}/src/conf</directory>
+            <includes>
+               <include>**/**</include>
+            </includes>
+         </resource>
+      </resources>
+
+   </build>
+
+   <reports>
+      <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-tasklist-plugin</report>
+      <report>maven-simian-plugin</report>
+      <report>maven-faq-plugin</report>
+      <report>maven-jcoverage-plugin</report>
+      <report>maven-clover-plugin</report>
+   </reports>
+
+</project>
+
diff --git a/samples/attributes/build.xml b/samples/attributes/build.xml
index 9fe4985e6f..bff4a9003e 100644
--- a/samples/attributes/build.xml
+++ b/samples/attributes/build.xml
@@ -45,7 +45,7 @@
 		</fileset>
 		<fileset dir="${lib.dir}">
 			<include name="**/spring.jar"/>
-			<include name="**/aopalliance.jar"/>
+			<include name="**/aopalliance-*.jar"/>
 			<include name="**/commons-logging.jar"/>
 			<include name="**/commons-attributes-api-SNAPSHOT.jar"/>
 			<include name="**/commons-collections.jar"/>
diff --git a/samples/contacts/build.xml b/samples/contacts/build.xml
index 0578331421..ce815ed54a 100644
--- a/samples/contacts/build.xml
+++ b/samples/contacts/build.xml
@@ -147,7 +147,7 @@
 			<!-- Include required libraries -->
 			<lib dir="${lib.dir}/jakarta-taglibs" includes="*.jar"/>
 			<lib dir="${lib.dir}/spring" includes="spring.jar"/>
-			<lib dir="${lib.dir}/aop-alliance" includes="aopalliance.jar"/>
+			<lib dir="${lib.dir}/aopalliance" includes="aopalliance-*.jar"/>
 			<lib dir="${lib.dir}/regexp" includes="jakarta-oro.jar"/>
 			<lib dir="${lib.dir}/j2ee" includes="jstl.jar"/>
 			<lib dir="${lib.dir}/caucho" includes="*.jar"/>
@@ -198,7 +198,7 @@
 			<!-- Include required libraries -->
 			<lib dir="${lib.dir}/jakarta-taglibs" includes="*.jar"/>
 			<lib dir="${lib.dir}/spring" includes="spring.jar"/>
-			<lib dir="${lib.dir}/aop-alliance" includes="aopalliance.jar"/>
+			<lib dir="${lib.dir}/aopalliance" includes="aopalliance-*.jar"/>
 			<lib dir="${lib.dir}/regexp" includes="jakarta-oro.jar"/>
 			<lib dir="${lib.dir}/j2ee" includes="jstl.jar"/>
 			<lib dir="${lib.dir}/caucho" includes="*.jar"/>