added dependency to jcore-logger-lib + removed files which has been moved there

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 1699ec5e7e08137a3a0d1b6f94456bd2d8f96d1b..b30df927a50bff45785613270b458def0c5ff2f0 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -805,8 +805,16 @@ exists or setup the property manually. For example like this:
     <!--
                 COMPILATION SECTION
             -->
-    <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps"/>
-    <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
+        <ant antfile="${project.jcore-logger-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </target>
+    <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.jcore-logger-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </target>
     <target depends="init, -deps-module-jar, -deps-ear-jar" name="deps-jar"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -818,25 +826,29 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="compile,-library-inclusion-in-archive-weblogic,-library-inclusion-in-archive-by-user" name="library-inclusion-in-archive"/>
     <target if="is.jars.in.ejbjar" name="-library-inclusion-in-archive-by-user">
+        <copyfiles files="${reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.log4j-api-2.3.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.log4j-core-2.3.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.log4j-web-2.3.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
+        <basename file="${reference.jcore-logger-lib.jar}" property="manifest.reference.jcore-logger-lib.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <basename file="${file.reference.log4j-api-2.3.jar}" property="manifest.file.reference.log4j-api-2.3.jar"/>
         <basename file="${file.reference.log4j-core-2.3.jar}" property="manifest.file.reference.log4j-core-2.3.jar"/>
         <basename file="${file.reference.log4j-web-2.3.jar}" property="manifest.file.reference.log4j-web-2.3.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 "/>
-            <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
-            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
-            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 "/>
+            <attribute name="jar-1-Extension-Name" value="${manifest.reference.jcore-logger-lib.jar}"/>
+            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.log4j-api-2.3.jar}"/>
+            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.log4j-core-2.3.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.log4j-web-2.3.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
+        <copyfiles files="${reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.log4j-api-2.3.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.log4j-core-2.3.jar}" todir="${dist.ear.dir}/lib"/>
@@ -1223,7 +1235,9 @@ exists or setup the property manually. For example like this:
     <!--
                 CLEANUP SECTION
             -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.jcore-logger-lib}/build.xml" inheritall="false" target="clean"/>
+    </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
         <delete dir="${dist.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index fdf20db546b247e19a0a38f6f72d5658e0a79bd8..4b286ef0699918472e79a9beb633ee7f95bb6370 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=b763880c
+build.xml.data.CRC32=85215057
 build.xml.script.CRC32=122158a6
 build.xml.stylesheet.CRC32=5910fda3@1.51.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b763880c
-nbproject/build-impl.xml.script.CRC32=6c1c87b3
+nbproject/build-impl.xml.data.CRC32=85215057
+nbproject/build-impl.xml.script.CRC32=f3a92ee9
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index c49f3b85a18703ce32699501b0236e3d959e5964..840bad393c0f05c5c6f8fcb91266a1d46d63e4de 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -39,6 +39,7 @@ jar.compress=false
 jar.name=jcore-ee-logger.jar
 jars.in.ejbjar=false
 javac.classpath=\
+    ${reference.jcore-logger-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
     ${file.reference.log4j-api-2.3.jar}:\
     ${file.reference.log4j-core-2.3.jar}:\
@@ -68,7 +69,9 @@ javadoc.windowtitle=Core EE Logger
 meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
+project.jcore-logger-lib=../jcore-logger-lib
 project.license=gpl30
+reference.jcore-logger-lib.jar=${project.jcore-logger-lib}/dist/jcore-logger-lib.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 880d1e799359bec5b3520f61ec126c2c45c30bec..35fbbdb2483b05cad37908b83df1e765178cd2d7 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -5,6 +5,7 @@
         <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
             <name>jcore-ee-logger</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
+            <included-library dirs="200">reference.jcore-logger-lib.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <included-library dirs="200">file.reference.log4j-api-2.3.jar</included-library>
             <included-library dirs="200">file.reference.log4j-core-2.3.jar</included-library>
@@ -19,5 +20,15 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>jcore-logger-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>

diff --git a/src/java/org/mxchange/jcoreeelogger/beans/local/logger/Log.java b/src/java/org/mxchange/jcoreeelogger/beans/local/logger/Log.java
deleted file mode 100644 (file)
index 613e965..0000000
--- a/src/java/org/mxchange/jcoreeelogger/beans/local/logger/Log.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jcoreeelogger.beans.local.logger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
-/**
- * Logger annotation. This file has been taken from
- * http://memorynotfound.com/java-se-unit-testing-cdi-junit-jboss-weld-se/ and has been slightly modified to make
- * it work.
- *
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
-public @interface Log {
-}

diff --git a/src/java/org/mxchange/jcoreeelogger/beans/local/logger/LoggerBeanLocal.java b/src/java/org/mxchange/jcoreeelogger/beans/local/logger/LoggerBeanLocal.java
deleted file mode 100644 (file)
index d7a4ac8..0000000
--- a/src/java/org/mxchange/jcoreeelogger/beans/local/logger/LoggerBeanLocal.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2015 Roland Haeder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jcoreeelogger.beans.local.logger;
-
-import javax.ejb.Local;
-
-/**
- *An interface for "centralized" logger
- * 
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Local
-public interface LoggerBeanLocal {
-       /**
-        * Log an exception
-        *
-        * @param throwable Thrown exception
-        */
-       public void logException (final Throwable throwable);
-
-       /**
-        * Log a debug message
-        *
-        * @param message Message to log
-        */
-       public void logDebug (final String message);
-
-       /**
-        * Log a trace message
-        *
-        * @param message Message to log
-        */
-       public void logTrace (final String message);
-
-       /**
-        * Log a info message
-        *
-        * @param message Message to log
-        */
-       public void logInfo (final String message);
-
-       /**
-        * Log a warning message
-        *
-        * @param message Message to log
-        */
-       public void logWarning (final String message);
-
-       /**
-        * Log a fatal message
-        *
-        * @param message Message to log
-        */
-       public void logFatal (final String message);
-
-       /**
-        * Log a trace message and cause
-        *
-        * @param message Message to log
-        * @param cause Causing exception
-        */
-       public void logTrace (final String message, final Throwable cause);
-
-       /**
-        * Log a info message and cause
-        *
-        * @param message Message to log
-        * @param cause Causing exception
-        */
-       public void logInfo (final String message, final Throwable cause);
-
-       /**
-        * Log a debug message and cause
-        *
-        * @param message Message to log
-        * @param cause Causing exception
-        */
-       public void logDebug (final String message, final Throwable cause);
-
-       /**
-        * Log a warning message and cause
-        *
-        * @param message Message to log
-        * @param cause Causing exception
-        */
-       public void logWarning (final String message, final Throwable cause);
-
-       /**
-        * Log a fatal message and cause
-        *
-        * @param message Message to log
-        * @param cause Causing exception
-        */
-       public void logFatal (final String message, final Throwable cause);
-}