diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index dd2a7fc30d..0e65fcfe15 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -71,17 +71,17 @@
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
index 624b6b1d1d..d2e60b2511 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
@@ -13,13 +13,13 @@
Symfony\Component\Security\Acl\Domain\ObjectIdentityRetrievalStrategy
Symfony\Component\Security\Acl\Domain\SecurityIdentityRetrievalStrategy
- Symfony\Component\Security\Acl\Domain\DoctrineAclCache
-
+
Symfony\Component\Security\Acl\Domain\AclCollectionCache
+ Symfony\Component\Security\Acl\Domain\DoctrineAclCache
-
+
@@ -32,7 +32,7 @@
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
index aac84a3ce5..b33709031a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
@@ -48,7 +48,5 @@
-
-
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
index 7144f562f3..b7e4adfd2a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -76,7 +76,7 @@
-
+
@@ -88,7 +88,9 @@
+
+
@@ -109,7 +111,7 @@
-
+
@@ -130,8 +132,7 @@
-
+ abstract="true" />
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
index eec67aa868..f430e04cd5 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -30,7 +30,7 @@
-
+
@@ -51,8 +51,7 @@
-
+ abstract="true" />