rsanchez
2015-01-28 09f0f86d50933ea11eb3315e5728718e23d37dcf
securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
....@@ -9,7 +9,6 @@
99 import javax.persistence.EntityManager;
1010 import javax.persistence.TypedQuery;
1111 import javax.servlet.http.HttpServletRequest;
12
-import javax.transaction.Transactional;
1312 import javax.ws.rs.Consumes;
1413 import javax.ws.rs.DELETE;
1514 import javax.ws.rs.GET;
....@@ -30,6 +29,7 @@
3029 import net.curisit.securis.db.Application;
3130 import net.curisit.securis.db.LicenseType;
3231 import net.curisit.securis.db.LicenseTypeMetadata;
32
+import net.curisit.securis.ioc.EnsureTransaction;
3333 import net.curisit.securis.security.BasicSecurityContext;
3434 import net.curisit.securis.security.Securable;
3535 import net.curisit.securis.services.exception.SeCurisServiceException;
....@@ -53,7 +53,7 @@
5353 @Inject
5454 TokenHelper tokenHelper;
5555
56
- @Inject
56
+ @Context
5757 EntityManager em;
5858
5959 public LicenseTypeResource() {
....@@ -114,7 +114,7 @@
114114 @Produces({
115115 MediaType.APPLICATION_JSON
116116 })
117
- @Transactional
117
+ @EnsureTransaction
118118 @Securable
119119 @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
120120 public Response create(LicenseType lt, @HeaderParam(TokenHelper.TOKEN_HEADER_PĂ€RAM) String token) {
....@@ -151,7 +151,7 @@
151151 @PUT
152152 @POST
153153 @Path("/{ltid}")
154
- @Transactional
154
+ @EnsureTransaction
155155 @Consumes(MediaType.APPLICATION_JSON)
156156 @Produces({
157157 MediaType.APPLICATION_JSON
....@@ -219,7 +219,7 @@
219219
220220 @DELETE
221221 @Path("/{ltid}")
222
- @Transactional
222
+ @EnsureTransaction
223223 @Produces({
224224 MediaType.APPLICATION_JSON
225225 })