Accepting request 124672 from Java:packages
- add pom file - fix a build with openjdk7 - change the jms to jms_api in classpath OBS-URL: https://build.opensuse.org/request/show/124672 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avalon-logkit?expand=0&rev=2
This commit is contained in:
commit
3048844c71
31
avalon-logkit-2.1.pom
Normal file
31
avalon-logkit-2.1.pom
Normal 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
28
avalon-logkit-encoding.patch
Normal 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 ->helm.realityforge.org</li>
|
||||
* <li>ipaddress ->1.2.3.4</li>
|
||||
* <li>interface ->127.0.0.1</li>
|
||||
- * <li>caller <20> <20>->com.biz.MyCaller.method(MyCaller.java:18)</li>
|
||||
- * <li>source <20> <20>->1.6.3.2:33</li>
|
||||
+ * <li>caller ->com.biz.MyCaller.method(MyCaller.java:18)</li>
|
||||
+ * <li>source ->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
33
avalon-logkit-pom-deps.patch
Normal 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>
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -15,6 +15,9 @@
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
%define short_name logkit
|
||||
%define camelcase_short_name LogKit
|
||||
@ -26,13 +29,20 @@ 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
|
||||
#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
|
||||
|
||||
Requires: avalon-framework >= 4.1.4
|
||||
Requires: servlet25
|
||||
#Requires: jdbc-stdext
|
||||
Requires: jms
|
||||
Requires: jdbc-stdext
|
||||
Requires: servlet25
|
||||
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: avalon-framework >= 4.1.4
|
||||
@ -43,6 +53,7 @@ BuildRequires: jpackage-utils >= 1.5
|
||||
BuildRequires: log4j
|
||||
BuildRequires: servlet25
|
||||
BuildRequires: unzip
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -62,6 +73,10 @@ API documentation for %{name}.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
cp %{SOURCE1} pom.xml
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
|
||||
# remove all binary libs
|
||||
find . -name "*.jar" -exec rm -f {} \;
|
||||
@ -70,31 +85,37 @@ find . -name "*.jar" -exec rm -f {} \;
|
||||
export CLASSPATH=%(build-classpath \
|
||||
log4j \
|
||||
javamail/mailapi \
|
||||
jms \
|
||||
jms_api \
|
||||
tomcat6-servlet-2.5-api \
|
||||
jdbc-stdext \
|
||||
avalon-framework \
|
||||
junit \
|
||||
):$PWD/build/classes
|
||||
ant -Dnoget=true clean jar javadoc \
|
||||
ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
|
||||
-lib /usr/share/java
|
||||
# Convert to OSGi bundle
|
||||
#java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
|
||||
|
||||
%install
|
||||
export NO_BRP_CHECK_BYTECODE_VERSION=true
|
||||
# jars
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||
install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
||||
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
|
||||
install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||
|
||||
#pom
|
||||
install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
|
||||
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_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 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%{_javadir}/*
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%{_mavenpomdir}/JPP-%{name}.pom
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
|
9
fix-java7-compile.patch
Normal file
9
fix-java7-compile.patch
Normal 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;}
|
||||
}
|
Loading…
Reference in New Issue
Block a user