Updated Symfony 3.x to 4.xwebconsole3

- Reorganizado los Repositorios de Symfony
- Registrado los commandos como Servicio
- Actualizado la configuraión de Doctrine
- Modificado el fichero update e installer.

40 files changed, 144 insertions, 133 deletions

diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Command/CreateClientCommand.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Command/CreateClientCommand.php
index 687476c0..dd3bf366 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Command/CreateClientCommand.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Command/CreateClientCommand.php
@@ -2,14 +2,22 @@
 
 namespace Opengnsys\CoreBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-//use Symfony\Component\Console\Input\InputArgument;
+use FOS\OAuthServerBundle\Model\ClientManagerInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class CreateClientCommand extends ContainerAwareCommand
+class CreateClientCommand extends Command
 {
+    private $clientManager;
+
+    public function __construct(ClientManagerInterface $clientManager)
+    {
+        parent::__construct();
+
+        $this->clientManager = $clientManager;
+    }
     protected function configure()
     {
         $this
@@ -41,11 +49,10 @@ EOT
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $clientManager = $this->getContainer()->get('fos_oauth_server.client_manager.default');
-        $client = $clientManager->createClient();
+        $client = $this->clientManager->createClient();
         $client->setRedirectUris($input->getOption('redirect-uri'));
         $client->setAllowedGrantTypes($input->getOption('grant-type'));
-        $clientManager->updateClient($client);
+        $this->clientManager->updateClient($client);
         $output->writeln(
             sprintf(
                 'Added a new client with public id <info>%s</info>, secret <info>%s</info>',
diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/BaseRepository.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Repository/BaseRepository.php
index 2faf395c..80d10164 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/BaseRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Repository/BaseRepository.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\CoreBundle\Entity\Repository;
+namespace Opengnsys\CoreBundle\Repository;
 
 class BaseRepository extends \Doctrine\ORM\EntityRepository
 {
diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/UserRepository.php b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Repository/UserRepository.php
index d65505a5..7e354449 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Entity/Repository/UserRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Repository/UserRepository.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\CoreBundle\Entity\Repository;
+namespace Opengnsys\CoreBundle\Repository;
 
 /**
  * UserRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml
index 11630820..0269c29e 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/CoreBundle/Resources/config/doctrine/User.orm.xml
@@ -4,7 +4,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
     <entity name="Opengnsys\CoreBundle\Entity\User" table="og_core__users"
-            repository-class="Opengnsys\CoreBundle\Entity\Repository\UserRepository">
+            repository-class="Opengnsys\CoreBundle\Repository\UserRepository">
 
         <lifecycle-callbacks>
             <lifecycle-callback type="prePersist" method="setCreatedAtValue"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php
index b1fd66b5..7fe99e25 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php
@@ -2,6 +2,8 @@
 
 namespace Opengnsys\MigrationBundle\Command;
 
+use Doctrine\ORM\EntityManager;
+use Monolog\Logger;
 use Opengnsys\MigrationBundle\Entity\Aulas;
 use Opengnsys\MigrationBundle\Entity\Centros;
 use Opengnsys\MigrationBundle\Entity\Gruposordenadores;
@@ -23,13 +25,25 @@ use Opengnsys\ServerBundle\Entity\OrganizationalUnit;
 use Opengnsys\ServerBundle\Entity\Partition;
 use Opengnsys\ServerBundle\Entity\Repository;
 use Opengnsys\ServerBundle\Entity\SoftwareProfile;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Command\Command;
+
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class MigrateCommand extends ContainerAwareCommand
+class MigrateCommand extends Command
 {
+    private $em;
+    private $emSlave;
+    private $logger;
+
+    public function __construct(EntityManager $em, EntityManager $emSlave, Logger $logger)
+    {
+        parent::__construct();
+        $this->em = $em;
+        $this->emSlave = $emSlave;
+        $this->logger = $logger;
+    }
+
     protected function configure()
     {
         $this
@@ -40,39 +54,39 @@ class MigrateCommand extends ContainerAwareCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $logger = $this->getContainer()->get('monolog.logger.og_migration');
+        //$logger = $this->getContainer()->get('monolog.logger.og_migration');
         //$logger = $this->getContainer()->get('logger');
 
-        $em = $this->getContainer()->get('doctrine')->getManager();
-        $emSlave = $this->getContainer()->get('doctrine')->getManager('og_1');
+        //$this->em = $this->getContainer()->get('doctrine')->getManager();
+        //$this->emSlave = $this->getContainer()->get('doctrine')->getManager('og_1');
 
         // og_1
-        $centros = $emSlave->getRepository(Centros::class)->findAll();
-        $aulas = $emSlave->getRepository(Aulas::class)->findAll();
-        $grupos = $emSlave->getRepository(Gruposordenadores::class)->findAll();
-        $ordenadores = $emSlave->getRepository(Ordenadores::class)->findAll();
-        $repositorios = $emSlave->getRepository(Repositorios::class)->findAll();
-        $menuses = $emSlave->getRepository(Menus::class)->findAll();
-        $perfileshards = $emSlave->getRepository(Perfileshard::class)->findAll();
-        $perfilessofts = $emSlave->getRepository(Perfilessoft::class)->findAll();
-        $imagenes = $emSlave->getRepository(Imagenes::class)->findAll();
-        $particiones = $emSlave->getRepository(OrdenadoresParticiones::class)->findAll();
-
-        $sistemasFicherosRepository = $emSlave->getRepository(Sistemasficheros::class);
-        $tipososRepository = $emSlave->getRepository(Tiposos::class);
+        $centros = $this->emSlave->getRepository(Centros::class)->findAll();
+        $aulas = $this->emSlave->getRepository(Aulas::class)->findAll();
+        $grupos = $this->emSlave->getRepository(Gruposordenadores::class)->findAll();
+        $ordenadores = $this->emSlave->getRepository(Ordenadores::class)->findAll();
+        $repositorios = $this->emSlave->getRepository(Repositorios::class)->findAll();
+        $menuses = $this->emSlave->getRepository(Menus::class)->findAll();
+        $perfileshards = $this->emSlave->getRepository(Perfileshard::class)->findAll();
+        $perfilessofts = $this->emSlave->getRepository(Perfilessoft::class)->findAll();
+        $imagenes = $this->emSlave->getRepository(Imagenes::class)->findAll();
+        $particiones = $this->emSlave->getRepository(OrdenadoresParticiones::class)->findAll();
+
+        $sistemasFicherosRepository = $this->emSlave->getRepository(Sistemasficheros::class);
+        $tipososRepository = $this->emSlave->getRepository(Tiposos::class);
 
         // og_3
-        $organizationalUnitRepository = $em->getRepository(OrganizationalUnit::class);
-        $clientRepository = $em->getRepository(Client::class);
-        $repositoryRepository = $em->getRepository(Repository::class);
-        $menuRepository = $em->getRepository(Menu::class);
-        $hardwareProfileRepository = $em->getRepository(HardwareProfile::class);
-        $softwareProfileRepository = $em->getRepository(SoftwareProfile::class);
-        $imageRepository = $em->getRepository(Image::class);
-        $partitionRepository = $em->getRepository(Partition::class);
+        $organizationalUnitRepository = $this->em->getRepository(OrganizationalUnit::class);
+        $clientRepository = $this->em->getRepository(Client::class);
+        $repositoryRepository = $this->em->getRepository(Repository::class);
+        $menuRepository = $this->em->getRepository(Menu::class);
+        $hardwareProfileRepository = $this->em->getRepository(HardwareProfile::class);
+        $softwareProfileRepository = $this->em->getRepository(SoftwareProfile::class);
+        $imageRepository = $this->em->getRepository(Image::class);
+        $partitionRepository = $this->em->getRepository(Partition::class);
 
         /** Centros **/
-        $logger->info("CENTROS TOTAL: ". count($centros));
+        $this->logger->info("CENTROS TOTAL: ". count($centros));
         foreach ($centros as $centro){
             $id = $centro->getIdcentro();
             $migrateId ="centro:".$id;
@@ -81,14 +95,14 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$organizationalUnit){
                 $organizationalUnit = new OrganizationalUnit();
                 $organizationalUnit->setNotes($migrateId);
-                $em->persist($organizationalUnit);
+                $this->em->persist($organizationalUnit);
             }
             $organizationalUnit->setName($centro->getNombrecentro());
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Aulas **/
-        $logger->info("AULAS TOTAL: ". count($aulas));
+        $this->logger->info("AULAS TOTAL: ". count($aulas));
         foreach ($aulas as $aula){
             $id = $aula->getIdaula();
             $migrateId ="aula:".$id;
@@ -99,7 +113,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$organizationalUnit){
                 $organizationalUnit = new OrganizationalUnit();
                 $organizationalUnit->setNotes($migrateId);
-                $em->persist($organizationalUnit);
+                $this->em->persist($organizationalUnit);
             }
             $organizationalUnit->setName($aula->getNombreaula());
 
@@ -110,7 +124,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$networkSettings){
                 $networkSettings = new NetworkSettings();
                 $organizationalUnit->setNetworkSettings($networkSettings);
-                //$em->persist($networkSettings);
+                //$this->em->persist($networkSettings);
             }
             $networkSettings->setProxy($aula->getProxy());
             $networkSettings->setDns($aula->getDns());
@@ -128,7 +142,7 @@ class MigrateCommand extends ContainerAwareCommand
         }
 
         /** Grupo Ordenador **/
-        $logger->info("GRUPOS TOTAL: ". count($grupos));
+        $this->logger->info("GRUPOS TOTAL: ". count($grupos));
         foreach ($grupos as $grupo){
             $id = $grupo->getIdgrupo();
             $migrateId ="grupo:".$id;
@@ -143,7 +157,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$organizationalUnit){
                 $organizationalUnit = new OrganizationalUnit();
                 $organizationalUnit->setNotes($migrateId);
-                $em->persist($organizationalUnit);
+                $this->em->persist($organizationalUnit);
             }
             $organizationalUnit->setName($grupo->getNombregrupoordenador());
             $organizationalUnit->setComments($grupo->getComentarios());
@@ -151,13 +165,13 @@ class MigrateCommand extends ContainerAwareCommand
             $organizationalUnitParent = $organizationalUnitRepository->findOneByNotes($migrateParentId);
             $organizationalUnit->setParent($organizationalUnitParent);
 
-            $em->flush();
+            $this->em->flush();
 
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Repositorios **/
-        $logger->info("REPOSITORIOS TOTAL: ". count($repositorios));
+        $this->logger->info("REPOSITORIOS TOTAL: ". count($repositorios));
         foreach ($repositorios as $repositorio){
             $id = $repositorio->getIdrepositorio();
             $migrateId ="repositorio:".$id;
@@ -166,15 +180,11 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$repository){
                 $repository = new Repository();
                 $repository->setNotes($migrateId);
-                $em->persist($repository);
+                $this->em->persist($repository);
             }
             $repository->setName($repositorio->getNombrerepositorio());
             $repository->setIp($repositorio->getIp());
-            //$repository->setPassword($repositorio->getPassguor());
-            $repository->setConfigurationpath("-");
-            $repository->setAdminpath("-");
-            $repository->setPxepath("-");
-            $repository->setPort($repositorio->getPuertorepo());
+            //$repository->setPort($repositorio->getPuertorepo());
 
             // OrganizationalUnit
             if($repositorio->getGrupoid() == 0){
@@ -185,10 +195,10 @@ class MigrateCommand extends ContainerAwareCommand
             $organizationalUnit = $organizationalUnitRepository->findOneByNotes($migrateId);
             $repository->setOrganizationalUnit($organizationalUnit);
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Perfil Hardware **/
-        $logger->info("PERFIL HARDWARES TOTAL: ". count($perfileshards));
+        $this->logger->info("PERFIL HARDWARES TOTAL: ". count($perfileshards));
         foreach ($perfileshards as $perfileshard){
             $id = $perfileshard->getIdperfilhard();
             $migrateId ="perfilHardware:".$id;
@@ -197,7 +207,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$hardwareProfile){
                 $hardwareProfile = new HardwareProfile();
                 $hardwareProfile->setNotes($migrateId);
-                $em->persist($hardwareProfile);
+                $this->em->persist($hardwareProfile);
             }
             $hardwareProfile->setDescription($perfileshard->getDescripcion());
             $hardwareProfile->setComments($perfileshard->getComentarios());
@@ -211,10 +221,10 @@ class MigrateCommand extends ContainerAwareCommand
             $organizationalUnit = $organizationalUnitRepository->findOneByNotes($migrateId);
             $hardwareProfile->setOrganizationalUnit($organizationalUnit);
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Perfil Softwares **/
-        $logger->info("PERFIL SOFTWARES TOTAL: ". count($perfilessofts));
+        $this->logger->info("PERFIL SOFTWARES TOTAL: ". count($perfilessofts));
         foreach ($perfilessofts as $perfilessoft){
             $id = $perfilessoft->getIdperfilsoft();
             $migrateId ="perfilSoftware:".$id;
@@ -223,7 +233,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$softwareProfile){
                 $softwareProfile = new SoftwareProfile();
                 $softwareProfile->setNotes($migrateId);
-                $em->persist($softwareProfile);
+                $this->em->persist($softwareProfile);
             }
             $softwareProfile->setDescription($perfilessoft->getDescripcion());
             $softwareProfile->setComments($perfilessoft->getComentarios());
@@ -237,10 +247,10 @@ class MigrateCommand extends ContainerAwareCommand
             $organizationalUnit = $organizationalUnitRepository->findOneByNotes($migrateId);
             $softwareProfile->setOrganizationalUnit($organizationalUnit);
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Menus **/
-        $logger->info("PERFIL MENUS TOTAL: ". count($menuses));
+        $this->logger->info("PERFIL MENUS TOTAL: ". count($menuses));
         foreach ($menuses as $menuse){
             $id = $menuse->getIdmenu();
             $migrateId ="menu:".$id;
@@ -249,15 +259,15 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$menu){
                 $menu = new Menu();
                 $menu->setNotes($migrateId);
-                $em->persist($menu);
+                $this->em->persist($menu);
             }
             $menu->setTitle($menuse->getTitulo());
             $menu->setDescription($menuse->getDescripcion());
             $menu->setComments($menuse->getComentarios());
             $menu->setResolution($menuse->getResolucion());
 
-            $menu->setIdurlimg($menuse->getIdurlimg());
-            $menu->setPublicmenuhtml($menuse->getHtmlmenupub());
+            //$menu->setIdurlimg($menuse->getIdurlimg());
+            //$menu->setPublicmenuhtml($menuse->getHtmlmenupub());
 
             // OrganizationalUnit
             if($menuse->getGrupoid() == 0){
@@ -266,12 +276,12 @@ class MigrateCommand extends ContainerAwareCommand
                 $migrateId = "grupo:".$menuse->getGrupoid();
             }
             $organizationalUnit = $organizationalUnitRepository->findOneByNotes($migrateId);
-            $menu->setOrganizationalUnit($organizationalUnit);
+            //$menu->setOrganizationalUnit($organizationalUnit);
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Ordenadores **/
-        $logger->info("ORDENADORES TOTAL: ". count($ordenadores));
+        $this->logger->info("ORDENADORES TOTAL: ". count($ordenadores));
         foreach ($ordenadores as $ordenador){
             //$ordenador = new Ordenadores();
             $id = $ordenador->getIdordenador();
@@ -281,7 +291,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$client){
                 $client = new Client();
                 $client->setNotes($migrateId);
-                $em->persist($client);
+                $this->em->persist($client);
             }
             $client->setName($ordenador->getNombreordenador());
             $client->setSerialno($ordenador->getNumserie());
@@ -323,10 +333,10 @@ class MigrateCommand extends ContainerAwareCommand
             $client->setOrganizationalUnit($organizationalUnit);
 
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Imagen **/
-        $logger->info("PERFIL IMAGENES TOTAL: ". count($imagenes));
+        $this->logger->info("PERFIL IMAGENES TOTAL: ". count($imagenes));
         foreach ($imagenes as $imagen){
             //$imagen = new Imagenes();
             $id = $imagen->getIdimagen();
@@ -336,7 +346,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$image){
                 $image = new Image();
                 $image->setNotes($migrateId);
-                $em->persist($image);
+                $this->em->persist($image);
             }
             $image->setCanonicalName($imagen->getNombreca());
             $image->setDescription($imagen->getDescripcion());
@@ -364,10 +374,10 @@ class MigrateCommand extends ContainerAwareCommand
             $image->setRepository($repository);
 
         }
-        $em->flush();
+        $this->em->flush();
 
         /** Particiones **/
-        $logger->info("PARTICIONES TOTAL: ". count($particiones));
+        $this->logger->info("PARTICIONES TOTAL: ". count($particiones));
         foreach ($particiones as $particion){
             //$particion = new OrdenadoresParticiones();
             $ordenadorId = $particion->getIdordenador();
@@ -379,7 +389,7 @@ class MigrateCommand extends ContainerAwareCommand
             if(!$partition){
                 $partition = new Partition();
                 $partition->setNotes($migrateId);
-                $em->persist($partition);
+                $this->em->persist($partition);
             }
             $partition->setNumDisk($particion->getNumdisk());
             $partition->setNumPartition($particion->getNumpar());
@@ -411,13 +421,7 @@ class MigrateCommand extends ContainerAwareCommand
             $client = $clientRepository->findOneByNotes($migrateId);
             $partition->setClient($client);
         }
-        $em->flush();
-
-
-
-
-
-
+        $this->em->flush();
 
         $output->writeln(sprintf('End'));
     }
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php
index a3cf8bc8..0eb733e8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php
@@ -95,7 +95,7 @@ class RepositoryController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Gets a Repository for a given id",
-	 *   output = "Opengnsys\ServerBundle\Entity\Repository",
+	 *   output = "Opengnsys\ServerBundle\Repository",
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     404 = "Returned when the repository is not found"
@@ -213,7 +213,7 @@ class RepositoryController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Delete a Repository for a given id",
-	 *   output = "Opengnsys\ServerBundle\Entity\Repository",
+	 *   output = "Opengnsys\ServerBundle\Repository",
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     404 = "Returned when the repository is not found"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/RepositoryType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/RepositoryType.php
index 77cd56d6..43dc2ef6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/RepositoryType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/RepositoryType.php
@@ -10,7 +10,7 @@
 
 namespace Opengnsys\ServerBundle\Form\Type;
 
-use Opengnsys\ServerBundle\Entity\Repository;
+use Opengnsys\ServerBundle\Repository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/ClientRepository.php
index 61bf9380..2e4d2c10 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/ClientRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * ClientRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/CommandRepository.php
index 1eb908f9..410f51a3 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/CommandRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * CommandRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/HardwareProfileRepository.php
index 0ff30cc0..d26ade38 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/HardwareProfileRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * HardwareProfileRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/HardwareRepository.php
index 6c9fcce5..e37dee3f 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/HardwareRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * HardwareRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/ImageRepository.php
index 1d473c86..e2620db6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/ImageRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * ImageRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/MenuRepository.php
index ff8e81b8..bc07141d 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/MenuRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * MenuRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/NetbootRepository.php
index cd2808c6..8bb424dc 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/NetbootRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * NetbootRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/NetworkSettingsRepository.php
index ba7c5caf..7e2db0ee 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/NetworkSettingsRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * NetworkSettingsRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/OrganizationalUnitRepository.php
index c5cea8aa..c63ee2a8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/OrganizationalUnitRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * OrganizationalUnitRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/PartitionRepository.php
index 497f6c30..5f7e0f2e 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/PartitionRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * PartitionRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/RepositoryRepository.php
index 9a543251..ff8a0c3b 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/RepositoryRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * RepositoryRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/SoftwareProfileRepository.php
index 332dc588..feefdc49 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/SoftwareProfileRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * SoftwareProfileRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/SoftwareRepository.php
index eb94d0fa..912a3c52 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/SoftwareRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * SoftwareRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/TaskRepository.php
index 4226be63..cd25e7c1 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/TaskRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * TaskRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/TraceRepository.php
index 3e0fbc75..ddd2d717 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/TraceRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * TraceRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/ViewRepository.php
index ec672229..78f61c70 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Repository/ViewRepository.php
@@ -8,9 +8,9 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Entity\Repository;
+namespace Opengnsys\ServerBundle\Repository;
 
-use Opengnsys\CoreBundle\Entity\Repository\BaseRepository;
+use Opengnsys\CoreBundle\Repository\BaseRepository;
 
 /**
  * ViewRepository
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml
index 9c65a5c3..e5220913 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml
@@ -4,7 +4,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
     <entity name="Opengnsys\ServerBundle\Entity\Client" table="og_server__clients"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\ClientRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\ClientRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml
index 709d7cd7..bce19529 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Command" table="og_server__commands"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\CommandRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\CommandRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml
index 17a46a53..c62b1731 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Hardware" table="og_server__hardwares"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\HardwareRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\HardwareRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml
index 55bcdce9..84022189 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\HardwareProfile" table="og_server__hardware_profiles"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\HardwareProfileRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\HardwareProfileRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml
index 8ec9db2c..1e1f0433 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Image" table="og_server__images"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\ImageRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\ImageRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml
index 1be99e3e..b003cd1e 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Menu" table="og_server__menus"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\MenuRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\MenuRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml
index 06f9b567..f0a428b3 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Netboot" table="og_server__netboots"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\NetbootRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\NetbootRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml
index 17c218bf..235aea55 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\NetworkSettings" table="og_server__network_settings"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\NetworkSettingsRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\NetworkSettingsRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml
index 4214a93c..fb23b2a3 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\OrganizationalUnit" table="og_server__organizational_units"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\OrganizationalUnitRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\OrganizationalUnitRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml
index 5b40c4c0..20168d03 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Partition" table="og_server__partitions"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\PartitionRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\PartitionRepository">
 
         <unique-constraints>
             <unique-constraint name="unique_Partition_id_numDisk_numPartition" columns="client_id,num_disk,num_partition"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml
index ad6d35f5..5a366af9 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Repository" table="og_server__repositories"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\RepositoryRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\RepositoryRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml
index 874928df..9e945ba6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Software" table="og_server__softwares"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\SoftwareRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\SoftwareRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml
index 353f8b62..f2958c4b 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\SoftwareProfile" table="og_server__software_profiles"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\SoftwareProfileRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\SoftwareProfileRepository">
 
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml
index b6fee7c5..0ed4a514 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Task" table="og_server__tasks"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\TaskRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\TaskRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml
index 96babbcd..9920b4e4 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\Trace" table="og_server__traces"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\TraceRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\TraceRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml
index 004df1bb..98cb4a94 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Opengnsys\ServerBundle\Entity\View" table="og_server__views"
-            repository-class="Opengnsys\ServerBundle\Entity\Repository\ViewRepository">
+            repository-class="Opengnsys\ServerBundle\Repository\ViewRepository">
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Repository.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Repository.yml
index ba19e5be..94337209 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Repository.yml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Repository.yml
@@ -1,4 +1,4 @@
-Opengnsys\ServerBundle\Entity\Repository:
+Opengnsys\ServerBundle\Repository:
     exclusion_policy: ALL
     properties:
         name: