Intermediate commit

src/main/java/de/dpunkt/myaktion/services/CampaignServiceBean.java

@@ -13,20 +13,25 @@ import java.util.logging.Logger;
 import javax.annotation.Resource;
 import javax.annotation.security.RolesAllowed;
 import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
 import javax.inject.Inject;
+import javax.interceptor.Interceptors;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+import javax.transaction.UserTransaction;
 
 import de.dpunkt.myaktion.model.Campaign;
 import de.dpunkt.myaktion.model.Organizer;
 import de.dpunkt.myaktion.util.Log.TecLog;
+import de.dpunkt.myaktion.util.TransactionInterceptor;
 
 /**
  * @author Julian
  */
 @RolesAllowed("Organizer")
-@Stateless
+@TransactionManagement(TransactionManagementType.BEAN)
+@Interceptors(TransactionInterceptor.class)
 public class CampaignServiceBean implements CampaignService {
     //----------------------------------------------------------------------------------------------
 

src/main/java/de/dpunkt/myaktion/util/TransactionInterceptor.java

+/*
+ * Copyright 2019 (C) by Julian Horner.
+ * All Rights Reserved.
+ */
+
+package de.dpunkt.myaktion.util;
+
+import javax.annotation.Resource;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.transaction.UserTransaction;
+
+/**
+ * @author Julian
+ */
+public class TransactionInterceptor {
+    @Resource
+    private UserTransaction transaction;
+
+    @AroundInvoke
+    public Object doTransaction(InvocationContext ctx) throws Exception {
+        try {
+            transaction.begin();
+            
+            Object ret = ctx.proceed();
+            
+            transaction.commit();
+            
+            return ret;
+        } catch (Exception e) {
+            try {
+                transaction.rollback();
+                System.err.println("addCampaign – Transaktion wurde zurückgerollt.");
+            } catch (Exception e2) {
+                System.err.println("addCampaign – Fehler beim Zurückrollen von Transaktion.");
+            }
+            throw e;
+        }
+    }
+}
\ No newline at end of file

src/main/resources/messages_de.properties

@@ -67,4 +67,5 @@ log.donateMoney.thank_you={0} hat {1} Euro gespendet.
 # login.xhtml
 login.email=E-Mail
 login.password=Passwort
-login.login=Anmelden
\ No newline at end of file
+login.login=Anmelden
+login.errorMsg=Passwort oder User sind falsch
\ No newline at end of file

src/main/resources/messages_en.properties

@@ -67,4 +67,5 @@ log.donateMoney.thank_you={0} has donated {1} Euro.
 # login.xhtml
 login.email=Email
 login.password=Password
-login.login=Log in
\ No newline at end of file
+login.login=Log in
+login.errorMsg=Password or user are wrong
\ No newline at end of file