SLFO-pool/avalon-logkit
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main avalon-logkit revision 063bcaf66a326732e6f2e84dab5ad498

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 11:14:53 +02:00
commit a9cf867d8b
9 changed files with 367 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

BIN
avalon-logkit-2.1-src.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

31
avalon-logkit-2.1.pom Normal file
View File

@ -0,0 +1,31 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<name>Avalon Logkit</name>
<version>2.1</version>
<description>Log4j-like logging toolkit.</description>
<inceptionYear>1997</inceptionYear>
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.11</version>
</dependency>
<dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-javamail</artifactId>
<version>1.3.1-rc3</version>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
<version>1.1-rc4</version>
</dependency>
</dependencies>
</project>

28
avalon-logkit-encoding.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/src/java/org/apache/log/ContextMap.java b/src/java/org/apache/log/ContextMap.java
index 046106b..2305955 100644
--- a/src/java/org/apache/log/ContextMap.java
+++ b/src/java/org/apache/log/ContextMap.java
@@ -29,8 +29,8 @@ import java.util.Hashtable;
* <li>hostname -&gt;helm.realityforge.org</li>
* <li>ipaddress -&gt;1.2.3.4</li>
* <li>interface -&gt;127.0.0.1</li>
- * <li>caller <20> <20>-&gt;com.biz.MyCaller.method(MyCaller.java:18)</li>
- * <li>source <20> <20>-&gt;1.6.3.2:33</li>
+ * <li>caller -&gt;com.biz.MyCaller.method(MyCaller.java:18)</li>
+ * <li>source -&gt;1.6.3.2:33</li>
* </ul>
* The context is bound to a thread (and inherited by sub-threads) but
* it can also be added to by LogTargets.
diff --git a/src/java/org/apache/log/Logger.java b/src/java/org/apache/log/Logger.java
index 43ce1b7..d1f7efd 100644
--- a/src/java/org/apache/log/Logger.java
+++ b/src/java/org/apache/log/Logger.java
@@ -295,7 +295,7 @@ public class Logger
}
/**
- * Determine if messages of priority <20>will be logged.
+ * Determine if messages of priority will be logged.
* @param priority the priority
* @return true if messages will be logged
*/

33
avalon-logkit-pom-deps.patch Normal file
View File

@ -0,0 +1,33 @@
--- pom.xml 2011-04-21 14:24:29.000000000 +0200
+++ pom.xml.new 2011-05-05 14:37:27.016877493 +0200
@@ -13,19 +13,19 @@
<version>1.2.11</version>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>1.3.1-rc3</version>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.3</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>1.1-rc4</version>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1.1</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>

117
avalon-logkit.changes Normal file
View File

@ -0,0 +1,117 @@
-------------------------------------------------------------------
Thu Aug 31 07:59:59 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Clean the spec file and use the new %%mvn_install_pom
-------------------------------------------------------------------
Tue Feb 22 19:24:57 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Do not build against the log4j12 packages, use the new reload4j
-------------------------------------------------------------------
Tue Feb 22 09:14:21 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Do not build the org.apache.log.output.lf5 package
-------------------------------------------------------------------
Tue Oct 1 12:05:13 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against compatibility log4j12 package
-------------------------------------------------------------------
Mon Apr 15 13:44:10 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Depend directly on the geronimo-jms-1_1-api package instead of
the jms virtual provider
-------------------------------------------------------------------
Thu Feb 14 18:07:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the glassfish-servlet-api
-------------------------------------------------------------------
Tue Jan 22 10:40:14 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Require dependencies by their maven artifactId and groupId in
order to be usable from maven build
-------------------------------------------------------------------
Tue May 15 13:57:23 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
-------------------------------------------------------------------
Fri Sep 15 16:14:15 UTC 2017 - jengelh@inai.de
- RPM group and minor spelling fix. Replacement of
-exec rm by -delete.
-------------------------------------------------------------------
Fri Sep 15 09:20:19 UTC 2017 - fstrba@suse.com
- Fix build with jdk9 by specifying java source and target 1.6
- Clean spec file
-------------------------------------------------------------------
Sun May 21 08:08:29 UTC 2017 - tchvatal@suse.com
- Remove unneeded dependencies
-------------------------------------------------------------------
Fri May 19 10:14:44 UTC 2017 - pcervinka@suse.com
- New build dependency: javapackages-local
-------------------------------------------------------------------
Thu Jun 4 09:54:24 UTC 2015 - dimstar@opensuse.org
- Also adjust Requires to be servlet >= 3.0 instead of servlet30.
-------------------------------------------------------------------
Thu Jun 4 09:11:25 UTC 2015 - dimstar@opensuse.org
- BuildRequire servlet >= 3.0 instead of 'servlet30'. Since tomcat
moved to version 8.0, it now provides 'servlet31' (which is fine,
as this is represented as servlet 3.1).
-------------------------------------------------------------------
Wed Mar 18 09:46:02 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
-------------------------------------------------------------------
Fri Jun 27 13:01:59 UTC 2014 - tchvatal@suse.com
- Cleanup with spec-cleaner
- Build on SLE11
-------------------------------------------------------------------
Mon Sep 9 11:05:31 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Wed Jun 20 07:14:17 UTC 2012 - mvyskocil@suse.cz
- bump servletapi to 30 (tomcat7)
-------------------------------------------------------------------
Fri May 18 08:18:05 UTC 2012 - mvyskocil@suse.cz
- add pom file
- fix a build with openjdk7
- change the jms to jms_api in classpath
-------------------------------------------------------------------
Thu Feb 16 15:21:41 UTC 2012 - cfarrell@suse.com
- license update: Apache-2.0
Look at License.txt
-------------------------------------------------------------------
Sun Dec 18 14:58:58 UTC 2011 - nlminhtl@gmail.com
- Package avalon-logkit 2.1 for openSUSE
- Fixing the license for openSUSE

110
avalon-logkit.spec Normal file
View File

@ -0,0 +1,110 @@
#
# spec file for package avalon-logkit
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2000-2005, JPackage Project
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define short_name logkit
%define camelcase_short_name LogKit
Name: avalon-logkit
Version: 2.1
Release: 0
Summary: Java logging toolkit
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://avalon.apache.org/%{short_name}/
#Source0: http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
#Source1: http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version}/%{name}-%{version}.pom
Source0: %{name}-%{version}-src.zip
Source1: %{name}-%{version}.pom
Patch0: fix-java6-compile.patch
Patch1: avalon-logkit-pom-deps.patch
Patch2: avalon-logkit-encoding.patch
Patch3: fix-java7-compile.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: fdupes
BuildRequires: geronimo-jms-1_1-api
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javamail
BuildRequires: javapackages-local >= 6
BuildRequires: jdbc-stdext
BuildRequires: reload4j
BuildRequires: unzip
BuildArch: noarch
%description
LogKit is a logging toolkit designed for secure performance oriented
logging in applications. To get started using LogKit, it is recomended
that you read the whitepaper and browse the API docs.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
%description javadoc
API documentation for %{name}.
%prep
%setup -q
%patch0
cp %{SOURCE1} pom.xml
%patch1
%patch2 -p1
%patch3
# remove all binary libs
find . -name "*.jar" -delete
rm -rf src/java/org/apache/log/output/lf5
%build
ant clean
mkdir -p target/lib
build-jar-repository -s -p target/lib \
reload4j \
javamail/mailapi \
geronimo-jms-1.1-api \
glassfish-servlet-api
ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-Dencoding=ISO-8859-1 -Dnoget=true -lib %{_datadir}/java \
jar javadoc
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
#pom
install -d -m 755 %{buildroot}/%{_mavenpomdir}
%mvn_install_pom pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}"
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files -f .mfiles
%doc LICENSE.txt NOTICE.txt
%files javadoc
%doc LICENSE.txt
%{_javadocdir}/*
%changelog

13
fix-java6-compile.patch Normal file
View File

@ -0,0 +1,13 @@
--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav 2005-08-29 21:03:50.000000000 +0300
+++ src/java/org/apache/log/output/db/DefaultDataSource.java 2010-11-09 21:05:58.775055594 +0200
@@ -111,4 +111,10 @@ public class DefaultDataSource
{
m_logWriter = logWriter;
}
+
+ public boolean isWrapperFor(Class<?> iface) {
+ return false;
+ }
+
+ public <T> T unwrap(java.lang.Class<T> iface) {return null;}
}

9
fix-java7-compile.patch Normal file
View File

@ -0,0 +1,9 @@
--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav 2012-04-18 00:41:59.000000000 +0300
+++ src/java/org/apache/log/output/db/DefaultDataSource.java 2012-04-18 00:46:17.454272754 +0300
@@ -117,4 +117,6 @@ public class DefaultDataSource
}
public <T> T unwrap(java.lang.Class<T> iface) {return null;}
+
+ public java.util.logging.Logger getParentLogger() {return null;}
}