diff -r 806e57d67020 -r e54dfe4d0b2b vendor/bundles/FOS/UserBundle/Controller/GroupController.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/bundles/FOS/UserBundle/Controller/GroupController.php	Fri Sep 30 11:24:53 2011 +0200
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\UserBundle\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * RESTful controller managing group CRUD
+ *
+ * @author Thibault Duplessis <thibault.duplessis@gmail.com>
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class GroupController extends ContainerAware
+{
+    /**
+     * Show all groups
+     */
+    public function listAction()
+    {
+        $groups = $this->container->get('fos_user.group_manager')->findGroups();
+
+        return $this->container->get('templating')->renderResponse('FOSUserBundle:Group:list.html.'.$this->getEngine(), array('groups' => $groups));
+    }
+
+    /**
+     * Show one group
+     */
+    public function showAction($groupname)
+    {
+        $group = $this->findGroupBy('name', $groupname);
+
+        return $this->container->get('templating')->renderResponse('FOSUserBundle:Group:show.html.'.$this->getEngine(), array('group' => $group));
+    }
+
+    /**
+     * Edit one group, show the edit form
+     */
+    public function editAction($groupname)
+    {
+        $group = $this->findGroupBy('name', $groupname);
+        $form = $this->container->get('fos_user.group.form');
+        $formHandler = $this->container->get('fos_user.group.form.handler');
+
+        $process = $formHandler->process($group);
+        if ($process) {
+            $this->setFlash('fos_user_success', 'group.flash.updated');
+            $groupUrl =  $this->container->get('router')->generate('fos_user_group_show', array('groupname' => $group->getName()));
+
+            return new RedirectResponse($groupUrl);
+        }
+
+        return $this->container->get('templating')->renderResponse('FOSUserBundle:Group:edit.html.'.$this->getEngine(), array(
+            'form'      => $form->createview(),
+            'groupname'  => $group->getName(),
+            'theme' => $this->container->getParameter('fos_user.template.theme'),
+        ));
+    }
+
+    /**
+     * Show the new form
+     */
+    public function newAction()
+    {
+        $form = $this->container->get('fos_user.group.form');
+        $formHandler = $this->container->get('fos_user.group.form.handler');
+
+        $process = $formHandler->process();
+        if ($process) {
+            $this->setFlash('fos_user_success', 'group.flash.created');
+            $parameters = array('groupname' => $form->getData('group')->getName());
+            $url = $this->container->get('router')->generate('fos_user_group_show', $parameters);
+
+            return new RedirectResponse($url);
+        }
+
+        return $this->container->get('templating')->renderResponse('FOSUserBundle:Group:new.html.'.$this->getEngine(), array(
+            'form' => $form->createview(),
+            'theme' => $this->container->getParameter('fos_user.template.theme'),
+        ));
+    }
+
+    /**
+     * Delete one group
+     */
+    public function deleteAction($groupname)
+    {
+        $group = $this->findGroupBy('name', $groupname);
+        $this->container->get('fos_user.group_manager')->deleteGroup($group);
+        $this->setFlash('fos_user_success', 'group.flash.deleted');
+
+        return new RedirectResponse( $this->container->get('router')->generate('fos_user_group_list'));
+    }
+
+    /**
+     * Find a group by a specific property
+     *
+     * @param string $key property name
+     * @param mixed $value property value
+     * @throws NotFoundException if user does not exist
+     * @return \FOS\UserBundle\Model\GroupInterface
+     */
+    protected function findGroupBy($key, $value)
+    {
+        if (!empty($value)) {
+            $group = $this->container->get('fos_user.group_manager')->{'findGroupBy'.ucfirst($key)}($value);
+        }
+
+        if (empty($group)) {
+            throw new NotFoundHttpException(sprintf('The group with "%s" does not exist for value "%s"', $key, $value));
+        }
+
+        return $group;
+    }
+
+    protected function getEngine()
+    {
+        return $this->container->getParameter('fos_user.template.engine');
+    }
+
+    protected function setFlash($action, $value)
+    {
+        $this->container->get('session')->setFlash($action, $value);
+    }
+}