Bug 1313094 - If one user changes a branch, the branch is changed fo…

…r all the users Bug 1313095 - Repository listing and File explorer in Adminstration perspective were often out of sync (cherry picked from commit 2aef0fc)
kiegroup · Mar 3, 2016 · 28aa1a4 · 28aa1a4
1 parent f1de44e
commit 28aa1a4
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/drools-wb-webapp/src/main/java/org/drools/workbench/backend/server/AppSetup.java b/drools-wb-webapp/src/main/java/org/drools/workbench/backend/server/AppSetup.java
@@ -34,6 +34,8 @@
 import org.guvnor.structure.organizationalunit.OrganizationalUnit;
 import org.guvnor.structure.organizationalunit.OrganizationalUnitService;
 import org.guvnor.structure.repositories.Repository;
+import org.guvnor.structure.repositories.RepositoryEnvironmentConfiguration;
+import org.guvnor.structure.repositories.RepositoryEnvironmentConfigurations;
 import org.guvnor.structure.repositories.RepositoryService;
 import org.guvnor.structure.server.config.ConfigGroup;
 import org.guvnor.structure.server.config.ConfigItem;
@@ -173,11 +175,13 @@ public boolean accept( final File pathName ) {
                 Repository repository = repositoryService.getRepository( repositoryAlias );
                 if ( repository == null ) {
                     try {
+                        RepositoryEnvironmentConfigurations configurations = new RepositoryEnvironmentConfigurations();
+
+                        configurations.setOrigin( repositoryOrigin );
+
                         repository = repositoryService.createRepository( "git",
                                                                          repositoryAlias,
-                                                                         new HashMap<String, Object>() {{
-                                                                             put( "origin", repositoryOrigin );
-                                                                         }} );
+                                                                         configurations );
                         organizationalUnitService.addRepository( organizationalUnit,
                                                                  repository );
                     } catch ( Exception e ) {
@@ -322,15 +326,13 @@ private Repository createRepository( final String alias,
                                          final String password ) {
         Repository repository = repositoryService.getRepository( alias );
         if ( repository == null ) {
+            RepositoryEnvironmentConfigurations configurations=new RepositoryEnvironmentConfigurations();
+            configurations.setOrigin( origin );
+            configurations.setUserName( user );
+            configurations.setPassword( password );
             repository = repositoryService.createRepository( scheme,
                                                              alias,
-                                                             new HashMap<String, Object>() {{
-                                                                 if ( origin != null ) {
-                                                                     put( "origin", origin );
-                                                                 }
-                                                                 put( "username", user );
-                                                                 put( "crypt:password", password );
-                                                             }} );
+                                                             configurations );
         }
         return repository;
     }