rpms/apache-log4j
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.17.0 [release 2.17.0-1mamba;Thu Dec 23 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 20:28:36 +01:00
parent 4ee0f5fcfd
commit 8cf034df2c
11 changed files with 25 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache-log4j-1.2.15-javadoc-xlink.patch
View File

@ -1,12 +0,0 @@
--- apache-log4j-1.2.15/build.xml 2007-08-25 06:09:43.000000000 +0200
+++ apache-log4j-1.2.15/build.xml-gil 2009-04-18 14:27:24.000000000 +0200
@@ -517,8 +517,7 @@
-->'
bottom="Copyright 2000-2007 Apache Software Foundation.">
- <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+ <link href="${jdk.javadoc}"/>
<classpath refid="compile.classpath"/>
</javadoc>

26
apache-log4j-1.2.15-jmx-Agent.patch
View File

@ -1,26 +0,0 @@
--- src/main/java/org/apache/log4j/jmx/Agent.java 2009-11-16 02:01:20.000000000 +0100
+++ src/main/java/org/apache/log4j/jmx/Agent.java-gil 2009-11-16 02:01:11.000000000 +0100
@@ -20,7 +20,7 @@
import javax.management.ObjectName;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import com.sun.jdmk.comm.HtmlAdaptorServer;
+import mx4j.tools.adaptor.http.HttpAdaptor;
import org.apache.log4j.Logger;
@@ -47,7 +47,13 @@
server.registerMBean(hdm, new ObjectName("log4j:hiearchy=default"));
} catch(Exception e) {
- log.error("Problem while regitering MBeans instances.", e);
+ log.error("Problem while registering MBeans instances.", e);
+ return;
+ }
+ try {
+ html.start();
+ } catch(java.io.IOException ioe) {
+ log.error("Problem while starting HtmlAdaptorServer (HttpAdaptor).", ioe);
return;
}
html.start();

41
apache-log4j-1.2.15-logfactor5-userdir.patch
View File

@ -1,41 +0,0 @@
diff -Nru apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure-gil/ConfigurationManager.java
--- apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java 2007-08-25 06:09:37.000000000 +0200
+++ apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure-gil/ConfigurationManager.java 2009-04-18 14:21:49.000000000 +0200
@@ -340,7 +340,7 @@
String home = System.getProperty("user.home");
String sep = System.getProperty("file.separator");
- return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
+ return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
}
//--------------------------------------------------------------------------
diff -Nru apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure-gil/MRUFileManager.java
--- apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java 2007-08-25 06:09:37.000000000 +0200
+++ apache-log4j-1.2.15/src/main/java/org/apache/log4j/lf5/viewer/configure-gil/MRUFileManager.java 2009-04-18 14:23:14.000000000 +0200
@@ -167,14 +167,14 @@
/**
* Creates the directory where the MRU file list will be written.
- * The "lf5" directory is created in the Documents and Settings
+ * The ".logfactor5" directory is created in the Documents and Settings
* directory on Windows 2000 machines and where ever the user.home
* variable points on all other platforms.
*/
public static void createConfigurationDirectory() {
String home = System.getProperty("user.home");
String sep = System.getProperty("file.separator");
- File f = new File(home + sep + "lf5");
+ File f = new File(home + sep + ".logfactor5");
if (!f.exists()) {
try {
f.mkdir();
@@ -260,7 +260,7 @@
String home = System.getProperty("user.home");
String sep = System.getProperty("file.separator");
- return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
+ return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
}
/**

278
apache-log4j.spec
View File

@ -1,285 +1,57 @@
%define repodir %{_javadir}/repository.jboss.com/apache-log4j/%{version}-brew
%define repodirlib %{repodir}/lib
%define repodirsrc %{repodir}/src
#%define javahome /usr/lib/jvm/java
Name: apache-log4j
Version: 1.2.15
Release: 7mamba
Version: 2.17.0
Release: 1mamba
Summary: Java logging package
Group: Graphical Desktop/Applications/Development
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://logging.apache.org/log4j/
Source0: ftp://cis.uniroma2.it/unix/packages/APACHE/logging/log4j/%{version}/apache-log4j-%{version}.tar.gz
#http://www.apache.org/dist/logging/log4j/%{version}/logging-log4j-%{version}.tar.gz
Source1: java-log4j-chainsaw_128.png
Source2: java-log4j-logfactor.png
Source3: java-log4j-chainsaw.sh
Source4: java-log4j-logfactor5.sh
Source5: java-log4j.catalog
Source6: java-component-info5.xml
Patch0: apache-log4j-1.2.15-logfactor5-userdir.patch
Patch1: apache-log4j-1.2.15-javadoc-xlink.patch
Patch2: java-log4j-1.2.14-mx4j-tools.patch
Patch3: apache-log4j-1.2.15-jmx-Agent.patch
URL: https://logging.apache.org/log4j/2.x/
Source0: https://downloads.apache.org/logging/log4j/%{version}/apache-log4j-%{version}-bin.tar.gz
License: Apache License Version 2.0
BuildRequires: apache-ant
%if "%{stage1}" != "1"
BuildRequires: ant-contrib
BuildRequires: apache-ant-junit
BuildRequires: apache-ant-nodeps
BuildRequires: jakarta-oro
BuildRequires: java-junit3
#BuildRequires: java-mx4j
# com.sun.jdmk jmxtools 1.2.1
# com.sun.jmx jmxri 1.2.1
#BuildRequires: java-classpathx-jaf
#BuildRequires: java-openjdk
BuildRequires: java-snmptrapappender
BuildRequires: java-sun-jaf
BuildRequires: java-sun-jms
BuildRequires: java-sun-jmx-ri
BuildRequires: java-sun-jndi
#BuildRequires: java-classpathx-mail
BuildRequires: java-sun-mail-1.4-api
BuildRequires: xml-commons-apis
%endif
BuildRequires: jpackage-utils
BuildRequires: perl
Requires: jpackage-utils
Requires: xml-commons-apis
Obsoletes: java-log4j
## AUTOBUILDREQ-BEGIN
## AUTOBUILDREQ-END
BuildRequires: javapackages
Requires: javapackages
Provides: java-log4j
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: java-log4j <= 1.2.15
%description
%{name} is a tool to help the programmer output log statements to a variety of output targets.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
Obsoletes: java-log4j-javadoc
Provides: java-log4j-javadoc
%description javadoc
%{name} is a tool to help the programmer output log statements to a variety of output targets.
This package contains javadoc for %{name}.
%package manual
Group: Documentation
Summary: Manual for %{name}
Obsoletes: java-log4j-manual
Provides: java-log4j-manual
%description manual
%{name} is a tool to help the programmer output log statements to a variety of output targets.
This package contains documentation for %{name}.
%package repolib
Group: Development/Libraries/Java
Summary: Artifacts to be uploaded to a repository library
Obsoletes: apache-log4j-source
Provides: apache-log4j-source
%description repolib
%{name} is a tool to help the programmer output log statements to a variety of output targets.
This package contains artifacts to be uploaded to a repository library.
This package is not meant to be installed but so its contents can be extracted through rpm2cpio
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
#%patch2 -p1
#%patch3 -p0
perl -pi -e 's/\r//g' LICENSE
perl -pi -e 's/\r//g' NOTICE
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
find . \( -name "*.class" \) -exec rm -f {} \;
rm -rf docs/api
%setup -q -n %{name}-%{version}-bin
%build
export JAVA_HOME=%java_home
export CLASSPATH=$(build-classpath snmptrapappender junit-3.8.2 ant-1.7.1 ant/ant-nodeps ant/ant-junit)
ant \
-Djavamail.jar=$(build-classpath sun-mail-api) \
-Dactivation.jar=$(build-classpath sun-jaf) \
-Djaxp.jaxp.jar.jar=$(build-classpath xercesImpl) \
-Djmx.jar=$(build-classpath sun-jmxri) \
-Djmx-extra.jar=$(build-classpath sun-jmxtools) \
-Djms.jar=$(build-classpath jms) \
-Djndi.jar=$(build-classpath jndi) \
-Djavac.source=1.2 \
-Djdk.javadoc=%{_javadocdir}/java \
jar javadoc
# -Djmx.jar=$(build-classpath mx4j/mx4j) \
# -Djmx-extra.jar=$(build-classpath mx4j/mx4j-tools) \
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
mkdir -p %{buildroot}%{_javadir}
mkdir -p %{buildroot}%{_datadir}/maven2/poms
jars=$(find . \
-name "*.jar" -a ! -name "*-sources.jar" -a ! -name "*-javadoc.jar" -a ! -name "*-tests.jar")
install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-log4j.pom
%add_to_maven_depmap log4j log4j %{version} JPP log4j
for j in ${jars[@]}; do
install -D ${j} %{buildroot}%{_javadir}/log4j/${j}
ln -s log4j/${j} %{buildroot}%{_javadir}/${j/-%{version}}
done
install -pm 644 dist/lib/log4j-%{version}.jar %{buildroot}%{_javadir}
(
cd %{buildroot}%{_javadir}
for jar in *-%{version}*; do
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
done
)
mkdir -p %{buildroot}%{_javadocdir}/log4j-%{version}
cp -a docs/api/* %{buildroot}%{_javadocdir}/log4j-%{version}
ln -s log4j-%{version} %{buildroot}%{_javadocdir}/log4j
rm -rf docs/api
ln -s %{_javadocdir}/log4j docs/api
mkdir -p %{buildroot}%{_bindir} \
%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/pixmaps
install -pm 644 %{S:1} %{buildroot}%{_datadir}/pixmaps/chainsaw.png
install -pm 644 %{S:2} %{buildroot}%{_datadir}/pixmaps/logfactor5.png
install -pm 755 %{S:3} %{buildroot}%{_bindir}/chainsaw
install -pm 755 %{S:4} %{buildroot}%{_bindir}/logfactor5
cat > %{buildroot}%{_datadir}/applications/jpackage-chainsaw.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=Chainsaw
Comment=Log4j log viewer
Exec=%{_bindir}/chainsaw
Icon=%{_datadir}/pixmaps/chainsaw.png
Terminal=false
Type=Application
Categories=GNOME;Application;Development;X-JPackage;
EOF
cat > %{buildroot}%{_datadir}/applications/jpackage-logfactor5.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=LogFactor5
Comment=Graphical user interface for managing log4j log messages
Exec=%{_bindir}/logfactor5
Icon=%{_datadir}/pixmaps/logfactor5.png
Terminal=false
Type=Application
Categories=GNOME;Application;Development;X-JPackage;
EOF
# DTD and the SGML catalog (XML catalog handled in scriptlets)
mkdir -p %{buildroot}%{_datadir}/sgml/log4j
install -pm 644 src/main/resources/org/apache/log4j/xml/log4j.dtd %{buildroot}%{_datadir}/sgml/log4j
install -pm 644 %{S:5} %{buildroot}%{_datadir}/sgml/log4j/catalog
perl -p -i -e 's|/opt/perl5/bin/perl|%{__perl}|' contribs/KitchingSimon/udpserver.pl
mkdir -p %{buildroot}%{repodir}
mkdir -p %{buildroot}%{repodirlib}
install -m 644 %{SOURCE6} %{buildroot}%{repodir}/component-info.xml
tag=`echo log4j-%{version}-%{release} | sed 's|\.|_|g'`
sed -i "s/@NAME@/apache-log4j-component-info/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@ID@/log4j/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@LICENSE@/%{license}/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s|@PROJECTHOME@|http://logging.apache.org/|g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@DESCRIPTION@/Java logging framework/g" \
%{buildroot}%{repodir}/component-info.xml
sed -i "s/@ARTIFACTID1@/log4j.jar/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@ARTIFACTID2@/log4j-src.jar/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@COMPONENTREF@/snmptrapappender/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@VERSION_COMPONENTREF@/1.2.9.1-brew/g" %{buildroot}%{repodir}/component-info.xml
sed -i "s/@INCLUDEINPUT@/log4j.jar/g" %{buildroot}%{repodir}/component-info.xml
mkdir -p %{buildroot}%{repodirsrc}
install -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
install -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
install -m 644 %{SOURCE3} %{buildroot}%{repodirsrc}
cp %{PATCH0} %{buildroot}%{repodirsrc}
cp %{PATCH1} %{buildroot}%{repodirsrc}
cp %{PATCH2} %{buildroot}%{repodirsrc}
cp %{PATCH3} %{buildroot}%{repodirsrc}
cp %{buildroot}%{_javadir}/log4j-%{version}.jar %{buildroot}%{repodirlib}/log4j.jar
cp dist/lib/log4j-%{version}-sources.jar %{buildroot}%{repodirlib}/log4j-sources.jar
#%{_bindir}/rebuild-gcj-db
# 1.2 compatibility
ln -s log4j-1.2-api.jar %{buildroot}%{_javadir}/log4j.jar
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post
%update_maven_depmap
if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
%{_bindir}/install-catalog --add \
%{_sysconfdir}/sgml/log4j-%{version}-%{release}.cat \
%{_datadir}/sgml/log4j/catalog > /dev/null || :
fi
if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
%{_bindir}/xmlcatalog --noout --add system log4j.dtd \
file://%{_datadir}/sgml/log4j/log4j.dtd %{_sysconfdir}/xml/catalog \
> /dev/null || :
fi
%preun
if [ $1 -eq 0 ]; then
if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
%{_bindir}/xmlcatalog --noout --del log4j.dtd \
%{_sysconfdir}/xml/catalog > /dev/null || :
fi
fi
%postun
%update_maven_depmap
if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
%{_bindir}/install-catalog --remove \
%{_sysconfdir}/sgml/log4j-%{version}-%{release}.cat \
%{_datadir}/sgml/log4j/catalog > /dev/null || :
fi
%files
%defattr(-,root,root)
%{_bindir}/chainsaw
%{_bindir}/logfactor5
%{_datadir}/pixmaps/*.png
%{_datadir}/applications/jpackage-*.desktop
%{_datadir}/sgml/log4j
%{_javadir}/log4j-%{version}.jar
%{_javadir}/log4j.jar
%{_datadir}/maven2/poms
%{_mavendepmapfragdir}
%doc BUILD-INFO.txt KEYS LICENSE NOTICE
%files javadoc
%defattr(-,root,root)
%{_javadocdir}/log4j-%{version}
%{_javadocdir}/log4j
%files manual
%defattr(-,root,root)
%doc docs/* contribs
%files repolib
%defattr(-,root,root)
%{repodir}
%dir %{_javadir}/log4j
%{_javadir}/log4j/log4j*.jar
%{_javadir}/log4j*.jar
%doc LICENSE.txt
%changelog
* Thu Dec 23 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.17.0-1mamba
- update to 2.17.0
* Sun Mar 06 2011 gil <puntogil@libero.it> 1.2.15-7mamba
- rebuilt devel

20
java-component-info5.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="@NAME@">
<component id="@ID@"
licenseType="@LICENSE@"
version="@VERSION@"
projectHome="@PROJECTHOME@"
description="@DESCRIPTION@"
tag="@TAG@"
>
<artifact id="@ARTIFACTID1@"/>
<artifact id="@ARTIFACTID2@"/>
<import componentref="@COMPONENTREF@">
<compatible version="@VERSION_COMPONENTREF@"/>
</import>
<export>
<include input="@INCLUDEINPUT@"/>
</export>
</component>
</project>

11
java-log4j-1.2.14-mx4j-tools.patch
View File

@ -1,11 +0,0 @@
--- logging-log4j-1.2.14/build.xml 2006-09-14 09:04:18.000000000 +0200
+++ logging-log4j-1.2.14/build.xml-gil 2009-02-28 15:40:36.000000000 +0100
@@ -139,7 +139,7 @@
<and>
<available classname="javax.management.MBeanInfo"
classpath="${jmx.jar}"/>
- <available classname="com.sun.jdmk.comm.HtmlAdaptorServer">
+ <available classname="mx4j.tools.adaptor.AdaptorServerSocketFactory">
<classpath>
<pathelement location="${jmx.jar}"/>
<pathelement location="${jmx-extra.jar}"/>

37
java-log4j-chainsaw.sh
View File

@ -1,37 +0,0 @@
#!/bin/sh
#
# Chainsaw (log4j) startup script
#
# JPackage Project <http://www.jpackage.org/>
# $Id$
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source system prefs
if [ -r /etc/chainsaw.conf ]; then
. /etc/chainsaw.conf
fi
# Source user prefs
if [ -r "$HOME/.chainsawrc" ]; then
. "$HOME/.chainsawrc"
fi
# Configuration
MAIN_CLASS=org.apache.log4j.chainsaw.Main
BASE_JARS="log4j xml-commons-apis jaxp_parser_impl"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

BIN
java-log4j-chainsaw_128.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
java-log4j-logfactor.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

27
java-log4j-logfactor5.sh
View File

@ -1,27 +0,0 @@
#!/bin/sh
#
# LogFactor5 (log4j) startup script
#
# JPackage Project <http://www.jpackage.org/>
# $Id: jd.xslt.jd.xslt.script,v 1.1 2002/07/25 11:35:28 scop Exp $
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Configuration
MAIN_CLASS=org.apache.log4j.lf5.StartLogFactor5
BASE_JARS="log4j xml-commons-apis jaxp_parser_impl"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

4
java-log4j.catalog
View File

@ -1,4 +0,0 @@
-- log4j DTD catalog --
-- JPackage Project <http://www.jpackage.org/> --
DOCTYPE log4j:configuration log4j.dtd