#2283 fix - Changed EntityManager injection to @Context

rsanchez

2015-01-28 09f0f86d50933ea11eb3315e5728718e23d37dcf

 securis/src/main/java/net/curisit/securis/services/UserResource.java
..
..
@@ -12,7 +12,6 @@
12
12
 import javax.persistence.PersistenceException;
13
13
 import javax.persistence.TypedQuery;
14
14
 import javax.servlet.http.HttpServletRequest;
15
-import javax.transaction.Transactional;
16
15
 import javax.ws.rs.Consumes;
17
16
 import javax.ws.rs.DELETE;
18
17
 import javax.ws.rs.FormParam;
..
..
@@ -34,6 +33,7 @@
34
33
 import net.curisit.securis.SeCurisException;
35
34
 import net.curisit.securis.db.Organization;
36
35
 import net.curisit.securis.db.User;
36
+import net.curisit.securis.ioc.EnsureTransaction;
37
37
 import net.curisit.securis.security.BasicSecurityContext;
38
38
 import net.curisit.securis.security.Securable;
39
39
 import net.curisit.securis.services.exception.SeCurisServiceException;
..
..
@@ -55,7 +55,7 @@
55
55
     @Inject
56
56
     TokenHelper tokenHelper;
57
57
 
58
-    @Inject
58
+    @Context
59
59
     EntityManager em;
60
60
 
61
61
     private static final Logger LOG = LogManager.getLogger(UserResource.class);
..
..
@@ -120,7 +120,7 @@
120
120
     @Produces({
121
121
         MediaType.APPLICATION_JSON
122
122
     })
123
-    @Transactional
123
+    @EnsureTransaction
124
124
     @Securable
125
125
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
126
126
     public Response create(User user, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
..
..
@@ -172,7 +172,7 @@
172
172
     @PUT
173
173
     @POST
174
174
     @Path("/{uid}")
175
-    @Transactional
175
+    @EnsureTransaction
176
176
     @Consumes(MediaType.APPLICATION_JSON)
177
177
     @Produces({
178
178
         MediaType.APPLICATION_JSON
..
..
@@ -216,7 +216,7 @@
216
216
 
217
217
     @DELETE
218
218
     @Path("/{uid}")
219
-    @Transactional
219
+    @EnsureTransaction
220
220
     @Produces({
221
221
         MediaType.APPLICATION_JSON
222
222
     })