From 2f675132c8ac497beeeb42bb243a705ccabcd8f6 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 21 Sep 2015 12:02:05 +0200 Subject: [PATCH] =?utf8?q?added=20dependency=20to=20jcore-logger-lib=20+?= =?utf8?q?=20removed=20files=20which=20has=20been=20moved=20there=20Signed?= =?utf8?q?-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nbproject/build-impl.xml | 30 +++-- nbproject/genfiles.properties | 6 +- nbproject/project.properties | 3 + nbproject/project.xml | 11 ++ .../jcoreeelogger/beans/local/logger/Log.java | 36 ------ .../beans/local/logger/LoggerBeanLocal.java | 109 ------------------ 6 files changed, 39 insertions(+), 156 deletions(-) delete mode 100644 src/java/org/mxchange/jcoreeelogger/beans/local/logger/Log.java delete mode 100644 src/java/org/mxchange/jcoreeelogger/beans/local/logger/LoggerBeanLocal.java diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 1699ec5..b30df92 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -805,8 +805,16 @@ exists or setup the property manually. For example like this: - - + + + + + + + + + + @@ -818,25 +826,29 @@ exists or setup the property manually. For example like this: + + - - - - - + + + + + + + @@ -1223,7 +1235,9 @@ exists or setup the property manually. For example like this: - + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index fdf20db..4b286ef 100644 --- 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 c49f3b8..840bad3 100644 --- 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 880d1e7..35fbbdb 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -5,6 +5,7 @@ jcore-ee-logger 1.6.5 + reference.jcore-logger-lib.jar file.reference.cdi-api.jar file.reference.log4j-api-2.3.jar file.reference.log4j-core-2.3.jar @@ -19,5 +20,15 @@ ./lib/nblibraries.properties + + + jcore-logger-lib + jar + + jar + clean + jar + + 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 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 . - */ -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 - */ -@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 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 . - */ -package org.mxchange.jcoreeelogger.beans.local.logger; - -import javax.ejb.Local; - -/** - *An interface for "centralized" logger - * - * @author Roland Haeder - */ -@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); -} -- 2.39.5