summaryrefslogtreecommitdiff
path: root/dev-java/jboss-logging
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/jboss-logging')
-rw-r--r--dev-java/jboss-logging/Manifest5
-rw-r--r--dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch152
-rw-r--r--dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml202
-rw-r--r--dev-java/jboss-logging/jboss-logging-3.1.4.ebuild51
-rw-r--r--dev-java/jboss-logging/metadata.xml11
5 files changed, 0 insertions, 421 deletions
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
deleted file mode 100644
index 3cbb70ac1d57..000000000000
--- a/dev-java/jboss-logging/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX jboss-logging-3.1.4-MDC.patch 5607 BLAKE2B 9ea9acc22592ac5a4fa573cf9b06d473b266e8919bd34a98fb8e4290a3c1ff226e2a432ee774cc98514d1ee3868160329da9494a130ca2e61efcc4c1296d5dae SHA512 74ece235664dc49db51e4026902a67773e87655edd1879137da0b0d1cb0fefe20c4e67e3ba0625214d6c85b7f036e07732d07c842947bf312a2ed505c05ab535
-AUX jboss-logging-3.1.4-build.xml 9295 BLAKE2B aada8601b25a428a6049ded0143ebd508d50743d677f869a88a69d9ac6956ad0bf0174b88618d14f6e3928504b0979601903dad2996f0441a0e579bbdaf3a5e1 SHA512 a4d1a44ee69d48686ff9d4d32540c74ea3dd0b8198f8bd04e5cf1572db5ae596bdf95bc0bd091cb19dc00b248f5f1a41f4f51271be9bb27be72420cc425d2a14
-DIST jboss-logging-3.1.4.tar.gz 25018 BLAKE2B abc91a70cd75132621dffa44c4c2314635e0009f8eaff96c97cd6f95869a078672eac452ce4d5fb2791785d01d7fc4af208d34f4f00d635e496022792d1c14f9 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a
-EBUILD jboss-logging-3.1.4.ebuild 1355 BLAKE2B 99f30b00adf55bf6d8dd6d2210bbd1f6f33e55f85aa12ebd10b44d3807ef4dcd49bf9c2a88704264894764294d6ead703b332ebbc6807ae9133b6c2a1428b474 SHA512 850398339f49aaf4b5ec22bdb074c6ffd8babb74d18c80478b90a0427c69f0750a6a6e929b22c85bba42afdae6d6d4b448f1101aa6ea81b39361dadd44d94297
-MISC metadata.xml 328 BLAKE2B bf2ad3aca2591452aa1578a2c32db911530ca47fcbbc7ad5199b57e4ded87d513c63f8c79c1bdcd0cb39bb38dc11bd038a43e7bafc4bea35fd78f633aefdb135 SHA512 acbf51ab138d93d7b6d137542047e019fd30e7230ba9e0ecabfac72faa1ebea3419fd8531ab9f1304ca1d735bf2082994ac4ab57e87e6febcf30588d4a0f91da
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
deleted file mode 100644
index e8a3a50a41fd..000000000000
--- a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java.orig 2015-05-17 20:55:35.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java 2015-05-17 20:58:00.000000000 +0000
-@@ -23,27 +23,27 @@
-
- abstract class AbstractMdcLoggerProvider extends AbstractLoggerProvider {
-
-- private final ThreadLocal<Map<String, Object>> mdcMap = new ThreadLocal<Map<String, Object>>();
-+ private final ThreadLocal<Map<String, String>> mdcMap = new ThreadLocal<Map<String, String>>();
-
- public Object getMdc(String key) {
- return mdcMap.get() == null ? null : mdcMap.get().get(key);
- }
-
-- public Map<String, Object> getMdcMap() {
-+ public Map<String, String> getMdcMap() {
- return mdcMap.get();
- }
-
-- public Object putMdc(String key, Object value) {
-- Map<String, Object> map = mdcMap.get();
-+ public Object putMdc(String key, String value) {
-+ Map<String, String> map = mdcMap.get();
- if (map == null) {
-- map = new HashMap<String, Object>();
-+ map = new HashMap<String, String>();
- mdcMap.set(map);
- }
- return map.put(key, value);
- }
-
- public void removeMdc(String key) {
-- Map<String, Object> map = mdcMap.get();
-+ Map<String, String> map = mdcMap.get();
- if (map == null)
- return;
- map.remove(key);
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java.orig 2015-05-17 20:16:57.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java 2015-05-17 21:21:25.157000000 +0000
-@@ -34,11 +34,11 @@
- }
-
- @SuppressWarnings("unchecked")
-- public Map<String, Object> getMdcMap() {
-+ public Map<String, String> getMdcMap() {
- return MDC.getContext();
- }
-
-- public Object putMdc(String key, Object val) {
-+ public Object putMdc(String key, String val) {
- try {
- return MDC.get(key);
- } finally {
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java.orig 2015-05-17 20:44:24.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java 2015-05-17 21:22:05.205000000 +0000
-@@ -33,14 +33,14 @@
- return new Slf4jLogger(name, l);
- }
-
-- public Object putMdc(final String key, final Object value) {
-+ public Object putMdc(final String key, final String value) {
- try {
- return MDC.get(key);
- } finally {
- if (value == null) {
- MDC.remove(key);
- } else {
-- MDC.put(key, String.valueOf(value));
-+ MDC.put(key, value);
- }
- }
- }
-@@ -54,7 +54,7 @@
- }
-
- @SuppressWarnings({ "unchecked" })
-- public Map<String, Object> getMdcMap() {
-+ public Map<String, String> getMdcMap() {
- return MDC.getCopyOfContextMap();
- }
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java.orig 2015-05-17 21:19:12.964000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java 2015-05-17 21:22:41.639000000 +0000
-@@ -23,4 +23,9 @@
- public Logger getLogger(final String name) {
- return new JDKLogger(name);
- }
-+
-+ @Override
-+ public Object putMdc(String key, String value) {
-+ return null;
-+ }
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java.orig 2015-05-17 20:15:41.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java 2015-05-17 21:20:42.844000000 +0000
-@@ -59,8 +59,8 @@
- }
- }
-
-- public Object putMdc(final String key, final Object value) {
-- return MDC.put(key, String.valueOf(value));
-+ public Object putMdc(final String key, final String value) {
-+ return MDC.put(key, value);
- }
-
- public Object getMdc(final String key) {
-@@ -72,7 +72,7 @@
- }
-
- @SuppressWarnings({ "unchecked" })
-- public Map<String, Object> getMdcMap() {
-+ public Map<String, String> getMdcMap() {
- // we can re-define the erasure of this map because MDC does not make further use of the copy
- return (Map)MDC.copy();
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java.orig 2015-05-17 19:12:40.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java 2015-05-17 21:22:27.689000000 +0000
-@@ -25,7 +25,7 @@
- private MDC() {
- }
-
-- public static Object put(String key, Object val) {
-+ public static Object put(String key, String val) {
- return LoggerProviders.PROVIDER.putMdc(key, val);
- }
-
-@@ -37,7 +37,7 @@
- LoggerProviders.PROVIDER.removeMdc(key);
- }
-
-- public static Map<String, Object> getMap() {
-+ public static Map<String, String> getMap() {
- return LoggerProviders.PROVIDER.getMdcMap();
- }
- }
---- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java.orig 2015-05-17 19:06:30.000000000 +0000
-+++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java 2015-05-17 21:21:43.083000000 +0000
-@@ -23,13 +23,13 @@
- public interface LoggerProvider {
- Logger getLogger(String name);
-
-- Object putMdc(String key, Object value);
-+ Object putMdc(String key, String value);
-
- Object getMdc(String key);
-
- void removeMdc(String key);
-
-- Map<String, Object> getMdcMap();
-+ Map<String, String> getMdcMap();
-
- void clearNdc();
-
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
deleted file mode 100644
index 35bbf84f9c39..000000000000
--- a/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 5/8/14 3:59 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jboss-logging-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jboss-logging-3.1.4.GA"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
- <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
- <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
- <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
- <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="true"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases"/>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false">
- <doctitle>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</doctitle>
- <header>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</header>
- <footer>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</footer>
- <bottom>&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2012 Red Hat, Inc.&lt;/i&gt;]]&gt;</bottom>
- <link href="http://java.sun.com/javase/6/docs/api/"/>
- <doclet name="net.gleamynode.apiviz.APIviz"
- path="${maven.repo.local}/org/jboss/apiviz/apiviz/1.2.5.GA/apiviz-1.2.5.GA.jar"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="true"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html">
- </jar>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
-</project>
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
deleted file mode 100644
index 6c0d7c16803e..000000000000
--- a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JBoss logging framework"
-HOMEPAGE="https://www.jboss.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.GA.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="dev-java/jboss-logmanager:0
- >=dev-java/slf4j-api-1.7.7
- dev-java/log4j:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}.GA/"
-
-EANT_GENTOO_CLASSPATH="jboss-logmanager,slf4j-api,log4j"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- # https://github.com/qos-ch/slf4j/blob/master/slf4j-api/src/main/java/org/slf4j/MDC.java#L226
- # MDC returns a Map<String, String>
- # https://github.com/jboss-logging/jboss-logging/blob/master/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java#L57
- # Yet, for some reason, the JBoss folks have decided that it should return a Map<String, Object> :|
- # This patch mends this mistake.
- epatch "${FILESDIR}"/"${P}"-MDC.patch
-}
-
-src_install() {
- java-pkg_newjar target/${PN}-3.1.4.GA.jar
-
- if use doc; then
- java-pkg_dojavadoc target/site/apidocs
- fi
- use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jboss-logging/metadata.xml b/dev-java/jboss-logging/metadata.xml
deleted file mode 100644
index 75c29510cedb..000000000000
--- a/dev-java/jboss-logging/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">jboss-logging/jboss-logging</remote-id>
- </upstream>
-</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:59:09 +0000