natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

very basic experimental version

This commit is contained in:
Ceki Gulcu 2019-02-20 22:15:52 +01:00
parent 905443f39f
commit 875442057f
16 changed files with 94 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/src/IBUNDLE-META-INF/MANIFEST.MF
View File

@ -10,6 +10,6 @@ Implementation-Title: iBundle
Bundle-ManifestVersion: 2
Bundle-SymbolicName: iBundle
Bundle-Name: abundle
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: apack
Import-Package: org.osgi.framework, org.slf4j;version=1.5

2
jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: jcl.over.slf4j
Bundle-Name: jcl-over-slf4j
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.apache.commons.logging;version=1.2,
org.apache.commons.logging.impl;version=1.2
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}

2
jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: jul.to.slf4j
Bundle-Name: jul-to-slf4j
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j.bridge;version=${parsedVersion.osgiVersion};uses:="org.slf4j,org.slf4j.spi"
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},org.slf4j.spi;version=${parsedVersion.osgiVersion}
Automatic-Module-Name: jul.to.slf4j

2
log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: log4j.over.slf4j
Bundle-Name: log4j-over-slf4j
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.apache.log4j;version=${log4j.version},
org.apache.log4j.helpers;version=${log4j.version},
org.apache.log4j.spi;version=${log4j.version},

2
osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Implementation-Title: osgi-over-slf4j
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.slf4j.osgi-over-slf4j
Bundle-Name: OSGi LogService implemented over SLF4J
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator
Bundle-Category: osgi
Import-Package: org.osgi.framework;version="[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion}

2
pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<latest.stable.version>1.7.26</latest.stable.version>
<!-- java.util.ServiceLoader requires Java 6 -->
<jdk.version>1.6</jdk.version>
<jdk.version>8</jdk.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

13
slf4j-api/src/main/java/org/slf4j/Logger.java
View File

@ -25,6 +25,12 @@
package org.slf4j;
import static org.slf4j.event.Level.TRACE;
import org.slf4j.spi.DefaultLoggingEventBuilder;
import org.slf4j.spi.LoggingEventBuilder;
import org.slf4j.spi.NOPLoggingEventBuilder;
/**
* The org.slf4j.Logger interface is the main user entry point of SLF4J API.
* It is expected that logging takes place through concrete implementations
@ -158,6 +164,13 @@ public interface Logger {
*/
public boolean isTraceEnabled(Marker marker);
default public LoggingEventBuilder atTrace() {
if(isTraceEnabled()) {
return new DefaultLoggingEventBuilder(TRACE, this);
} else {
return NOPLoggingEventBuilder.singleton();
}
}
/**
* Log a message with the specific Marker at the TRACE level.
*

45
slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java Executable file
View File

@ -0,0 +1,45 @@
package org.slf4j.spi;
import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.event.Level;
public class DefaultLoggingEventBuilder implements LoggingEventBuilder {
Logger logger;
Level level;
Marker marker;
Throwable cause;
Object parameter;
public DefaultLoggingEventBuilder(Level level, Logger logger) {
this.logger = logger;
this.level = level;
}
@Override
public LoggingEventBuilder withMarker(Marker marker) {
this.marker = marker;
return this;
}
@Override
public LoggingEventBuilder withCause(Throwable cause) {
this.cause = cause;
return this;
}
@Override
public LoggingEventBuilder withParameter(Object p) {
this.parameter = p;
return this;
}
@Override
public void log(String message) {
//logger.log(marker, message, parameter, cause);
}
}

13
slf4j-api/src/main/java/org/slf4j/spi/LoggingEventBuilder.java Executable file
View File

@ -0,0 +1,13 @@
package org.slf4j.spi;
import org.slf4j.Marker;
public interface LoggingEventBuilder {
LoggingEventBuilder withMarker(Marker marker);
LoggingEventBuilder withCause(Throwable cause);
LoggingEventBuilder withParameter(Object p);
void log(String message);
}

11
slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java Executable file
View File

@ -0,0 +1,11 @@
package org.slf4j.spi;
public class NOPLoggingEventBuilder implements LoggingEventBuilder {
static NOPLoggingEventBuilder SINGLETON = new NOPLoggingEventBuilder();
public static LoggingEventBuilder singleton() {
return SINGLETON;
}
}

2
slf4j-api/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.api
Bundle-Name: slf4j-api
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},
org.slf4j.helpers;version=${parsedVersion.osgiVersion},

2
slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.ext
Bundle-Name: slf4j-ext
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j.profiler;version=${parsedVersion.osgiVersion}, org.slf4j.cal10n;version=${parsedVersion.osgiVersion}, org.slf4j.ext;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, ch.qos.cal10n;version=${cal10n.version};resolution:=optional

2
slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.jdk14
Bundle-Name: slf4j-jdk14
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j.jul;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

2
slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.log4j12
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j.log4j12;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

2
slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.nop
Bundle-Name: slf4j-nop
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j.nop;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

2
slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
View File

@ -4,7 +4,7 @@ Bundle-SymbolicName: slf4j.simple
Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.slf4j.simple;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},