diff --git a/project.properties b/project.properties
index 126682f935..23a5cac165 100644
--- a/project.properties
+++ b/project.properties
@@ -105,11 +105,6 @@ maven.jar.commons-attributes-compiler = ${basedir}/lib/jakarta-commons/commons-a
 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
index 6cb4c22aca..0800c28d55 100644
--- a/project.xml
+++ b/project.xml
@@ -258,39 +258,40 @@
          </properties>
       </dependency>
 
+      <!-- Container Integration -->
+
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-jmx</artifactId>
+         <version>3.2.1</version>
+      </dependency>
+
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-common</artifactId>
+         <version>3.2.3</version>
+      </dependency>
+
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jbosssx</artifactId>
+         <version>3.2.3</version>
+      </dependency>
+
+      <dependency>
+         <groupId>tomcat</groupId>
+         <artifactId>catalina</artifactId>
+         <version>4.1.9</version>
+      </dependency>
+
+      <dependency>
+         <groupId>jetty</groupId>
+         <artifactId>org.mortbay.jetty</artifactId>
+         <version>4.2.20</version>
+      </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>