Merge branch 'master' of /media/quix0r/INTENSO/Java Project/jcoreee

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index 716ec297c9c4768e260d82a99f3448fd50517441..b2c7d2c6c0450c90649bf5517a7ec707c696996c 100644 (file)
Binary files a/lib/jcore-ee-logger.jar and b/lib/jcore-ee-logger.jar differ

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 506736bafc483696bc7bdf027eb8fe0201a5f1b4..727898c9a7ed956aba11c6a75e43e7f79e76a64a 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java b/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java
index f801bb9d141539649340cb101b4b81cbf333d482..73d8345a658c645377bb519f875e46710e87004e 100644 (file)
--- a/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java
+++ b/src/org/mxchange/jcoreee/beans/BaseFrameworkBean.java
@@ -18,6 +18,9 @@ package org.mxchange.jcoreee.beans;
 
 import java.io.Serializable;
 import java.util.ResourceBundle;
+import javax.ejb.EJB;
+import org.mxchange.jcoreeelogger.beans.local.logger.Log;
+import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
 
 /**
  * A general bean class. Do not put things in here that are not serializable.
@@ -37,6 +40,13 @@ public abstract class BaseFrameworkBean implements Serializable {
         */
        private ResourceBundle bundle;
 
+       /**
+        * Logger instance
+        */
+       @EJB
+       @Log
+       private LoggerBeanLocal logger;
+
        /**
         * Protected constructor, please don't add init() call here.
         */
@@ -54,6 +64,15 @@ public abstract class BaseFrameworkBean implements Serializable {
                this.bundle = ResourceBundle.getBundle("org/mxchange/localization/bundle");
        }
 
+       /**
+        * Returns an EJB logger instance
+        *
+        * @return EBJ logger instance
+        */
+       protected LoggerBeanLocal getLogger () {
+               return this.logger;
+       }
+
        /**
         * Getter for localized message from key
         *