#2283 fix - Changed EntityManager injection to @Context

rsanchez

2015-01-28 09f0f86d50933ea11eb3315e5728718e23d37dcf

 securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
..
..
@@ -10,7 +10,6 @@
10
10
 import javax.persistence.EntityManager;
11
11
 import javax.persistence.TypedQuery;
12
12
 import javax.servlet.http.HttpServletRequest;
13
-import javax.transaction.Transactional;
14
13
 import javax.ws.rs.Consumes;
15
14
 import javax.ws.rs.DELETE;
16
15
 import javax.ws.rs.GET;
..
..
@@ -30,7 +29,7 @@
30
29
 import net.curisit.securis.SeCurisException;
31
30
 import net.curisit.securis.db.Organization;
32
31
 import net.curisit.securis.db.User;
33
-import net.curisit.securis.ioc.MyTrans;
32
+import net.curisit.securis.ioc.EnsureTransaction;
34
33
 import net.curisit.securis.security.BasicSecurityContext;
35
34
 import net.curisit.securis.security.Securable;
36
35
 import net.curisit.securis.utils.TokenHelper;
..
..
@@ -131,7 +130,7 @@
131
130
     @Produces({
132
131
         MediaType.APPLICATION_JSON
133
132
     })
134
-    @MyTrans
133
+    @EnsureTransaction
135
134
     @Securable
136
135
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
137
136
     public Response create(Organization org) {
..
..
@@ -198,11 +197,11 @@
198
197
     @PUT
199
198
     @POST
200
199
     @Path("/{orgid}")
201
-    @Transactional
202
200
     @Consumes(MediaType.APPLICATION_JSON)
203
201
     @Produces({
204
202
         MediaType.APPLICATION_JSON
205
203
     })
204
+    @EnsureTransaction
206
205
     @Securable
207
206
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
208
207
     public Response modify(Organization org, @PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
..
..
@@ -244,7 +243,7 @@
244
243
 
245
244
     @DELETE
246
245
     @Path("/{orgid}")
247
-    @Transactional
246
+    @EnsureTransaction
248
247
     @Produces({
249
248
         MediaType.APPLICATION_JSON
250
249
     })