From d4da6af59df02895894a5521c5f6cb285f67074d Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 10 May 2017 15:04:58 +0000
Subject: [PATCH] [UPDATE] - adds small changes in Users import routine

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4721 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: bd85950ce5268d358240854cc73a9e93bee269a2
---
 .../org/libreccm/security/UserIdResolver.java |  2 ++
 .../portation/CoreDataImportTest.java         | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java
index faae8c56f..809b4c803 100644
--- a/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java
+++ b/ccm-core/src/main/java/org/libreccm/security/UserIdResolver.java
@@ -21,12 +21,14 @@ package org.libreccm.security;
 import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 3/23/17
  */
+@RequestScoped
 public class UserIdResolver implements ObjectIdResolver {
     @Inject
     private UserRepository userRepository;
diff --git a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
index f44a0805f..d15ec853c 100644
--- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
@@ -32,7 +32,6 @@ import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -125,12 +124,24 @@ public class CoreDataImportTest {
 
     // TEST SECTION
 
+    @Test
+    @InSequence(120)
+    public void usersShouldBeImported() {
+        importHelper.importUsers();
+    }
+
+    /*
+    @Test
+    @InSequence(100)
+    public void categoriesShouldBeImported() {
+        importHelper.importCategories();
+    }
+
     @Test
     @InSequence(105)
     public void  roleMembershipsShouldBeImported() {
         Assert.assertFalse(importHelper.importRoleMemberships());
     }
-/*
 
     @Test
     @InSequence(110)
@@ -144,11 +155,7 @@ public class CoreDataImportTest {
         Assert.assertFalse(importHelper.importGroups());
     }
 
-    @Test
-    @InSequence(120)
-    public void usersShouldBeImported() {
-        importHelper.importUsers();
-    }
+
 
     @Test
     @InSequence(125)
@@ -186,11 +193,7 @@ public class CoreDataImportTest {
         importHelper.importPermissions();
     }
 
-    @Test
-    @InSequence(155)
-    public void categoriesShouldBeImported() {
-        importHelper.importCategories();
-    }
+
 
     @Test
     @InSequence(160)