[logback] Include Gil Cattaneo's 1.0.6 update
mef
mef at fedoraproject.org
Wed Jul 11 13:52:19 UTC 2012
commit d041ddccbca3a435ef08164b1ba96b48109c66ab
Author: Mary Ellen Foster <mefoster at gmail.com>
Date: Wed Jul 11 14:18:09 2012 +0100
Include Gil Cattaneo's 1.0.6 update
.gitignore | 1 +
logback-1.0.6-00-build.xml | 249 ++++++++++++++++++++
logback-1.0.6-access-osgi.bnd | 22 ++
logback-1.0.6-classic-osgi.bnd | 27 ++
logback-1.0.6-core-osgi.bnd | 14 +
...ino-2_6.patch => logback-1.0.6-janino-2_6.patch | 4 +-
logback-debian-build.xml | 105 --------
logback.spec | 35 ++-
sources | 2 +-
9 files changed, 339 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a11cb4..1b2120e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
logback-0.9.18.tar.gz
/logback-1.0.1.tar.gz
+/logback-1.0.6.tar.gz
diff --git a/logback-1.0.6-00-build.xml b/logback-1.0.6-00-build.xml
new file mode 100644
index 0000000..fd46c50
--- /dev/null
+++ b/logback-1.0.6-00-build.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0"?>
+<!-- Logback 1.0.1 build file by gil -->
+<!-- Logback 1.0.6 build file by gil -->
+<project name="logback" basedir=".">
+
+ <property name="build.dir" value="build"/>
+ <property name="dist.dir" value="dist"/>
+
+ <property name="version" value="1.0.6"/>
+
+ <property name="core.dir" value="${basedir}/logback-core"/>
+ <property name="core.src.dir" value="${core.dir}/src/main/java"/>
+ <property name="core.build.dir" value="${build.dir}/core"/>
+ <property name="core.jar" value="${dist.dir}/logback-core-${version}.jar"/>
+
+ <property name="classic.dir" value="logback-classic"/>
+ <property name="classic.src.dir" value="${classic.dir}/src/main"/>
+ <property name="classic.doc.src.dir" value="${classic.dir}/src/main/java"/>
+ <property name="classic.build.dir" value="${build.dir}/classic"/>
+ <property name="classic.jar" value="${dist.dir}/logback-classic-${version}.jar"/>
+
+ <property name="access.dir" value="logback-access"/>
+ <property name="access.src.dir" value="${access.dir}/src/main/java"/>
+ <property name="access.build.dir" value="${build.dir}/access"/>
+ <property name="access.jar" value="${dist.dir}/logback-access-${version}.jar"/>
+
+ <property name="examples.dir" value="logback-examples"/>
+ <property name="examples.src.dir" value="${examples.dir}/src/main/java"/>
+ <property name="examples.build.dir" value="${build.dir}/examples"/>
+ <property name="examples.jar" value="${dist.dir}/logback-examples-${version}.jar"/>
+
+ <target name="build"
+ depends="build.core,build.classic,build.access,build.examples" description="Compile the sources">
+ </target>
+
+ <target name="dist" depends="build"
+ description="generate the distribution" >
+ </target>
+
+ <path id="groovyc.classpath">
+ <fileset dir="/usr/share/java" includes="antlr.jar"/>
+ <fileset dir="/usr/share/java" includes="commons-cli.jar"/>
+ <fileset dir="/usr/share/java" includes="groovy.jar"/>
+ <fileset dir="/usr/share/java" includes="objectweb-asm/asm-all.jar"/>
+ </path>
+
+ <path id="javadoc.classpath">
+ <path refid="access.classpath"/>
+ <path refid="classic.classpath"/>
+ <path refid="examples.classpath"/>
+ <fileset dir="${dist.dir}" includes="logback-examples-${version}.jar"/>
+ </path>
+
+ <path id="core.classpath">
+ <path refid="groovyc.classpath"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <fileset dir="/usr/share/java" includes="geronimo-jms.jar"/>
+ <fileset dir="/usr/share/java" includes="janino/janino.jar"/>
+ <fileset dir="/usr/share/java" includes="janino/commons-compiler.jar"/>
+ <fileset dir="/usr/share/java" includes="jansi.jar"/>
+ <fileset dir="/usr/share/java" includes="javamail/mail.jar"/>
+ <fileset dir="/usr/share/java" includes="slf4j/api.jar"/>
+ <fileset dir="/usr/share/java" includes="tomcat-servlet-3.0-api.jar"/>
+ </path>
+
+ <path id="classic.classpath">
+ <path refid="core.classpath"/>
+ <pathelement location="${classic.build.dir}/**"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <fileset dir="${dist.dir}" includes="logback-core-${version}.jar"/>
+ <fileset dir="/usr/share/java" includes="tomcat/catalina.jar"/>
+ </path>
+
+ <path id="access.classpath">
+ <path refid="core.classpath"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <fileset dir="${dist.dir}" includes="logback-core-${version}.jar"/>
+ <fileset dir="/usr/share/java" includes="tomcat/catalina.jar"/>
+ </path>
+
+ <path id="examples.classpath">
+ <path refid="core.classpath"/>
+ <pathelement location="${examples.build.dir}/**"/>
+ <pathelement location="${access.build.dir}/**"/>
+ <pathelement location="${classic.build.dir}/**"/>
+ <pathelement location="${core.build.dir}/**"/>
+ <fileset dir="${dist.dir}" includes="logback-access-${version}.jar"/>
+ <fileset dir="${dist.dir}" includes="logback-classic-${version}.jar"/>
+ <fileset dir="${dist.dir}" includes="logback-core-${version}.jar"/>
+ <fileset dir="/usr/share/java" includes="log4j.jar"/>
+ <fileset dir="/usr/share/java" includes="slf4j/ext.jar"/>
+ <fileset dir="/usr/share/java" includes="tomcat-servlet-3.0-api.jar"/>
+ </path>
+
+ <target name="build.core" description="Build Logback Core Module">
+ <mkdir dir="${dist.dir}"/>
+ <compile-javac
+ buildclasspath="core.classpath"
+ dirsrc="${core.src.dir}"
+ destfile="${core.build.dir}"/>
+
+ <osgi.jar
+ classesdir="${core.build.dir}"
+ jarosgi="${core.jar}"
+ bndfile="osgi-core.bnd"/>
+
+ </target>
+
+ <target name="build.classic" description="Build Logback Classic Module">
+ <compile-groovy
+ buildclasspath="classic.classpath"
+ dirsrc="${classic.src.dir}"
+ destfile="${classic.build.dir}"/>
+
+ <osgi.jar
+ classesdir="${classic.build.dir}"
+ jarosgi="${classic.jar}"
+ bndfile="osgi-classic.bnd"/>
+ </target>
+
+ <target name="build.access" description="Build Logback Access Module">
+ <compile-javac
+ buildclasspath="access.classpath"
+ dirsrc="${access.src.dir}"
+ destfile="${access.build.dir}"/>
+
+ <osgi.jar
+ classesdir="${access.build.dir}:${core.build.dir}:/usr/share/java/janino/janino.jar:/usr/share/java/ant.jar"
+ jarosgi="${access.jar}"
+ bndfile="osgi-access.bnd"/>
+
+ </target>
+
+ <target name="build.examples" description="Build Logback Examples Module">
+ <compile-javac
+ buildclasspath="examples.classpath"
+ dirsrc="${examples.src.dir}"
+ destfile="${examples.build.dir}"/>
+
+ <jar-simple
+ basedir="${examples.build.dir}"
+ destfile="${examples.jar}"/>
+
+ </target>
+
+ <macrodef name="compile-javac">
+ <attribute name="destfile"/>
+ <attribute name="dirsrc"/>
+ <attribute name="excludes" default=""/>
+ <attribute name="includes" default=""/>
+ <attribute name="buildclasspath" default=""/>
+ <sequential>
+ <mkdir dir="@{destfile}"/>
+ <javac
+ srcdir="@{dirsrc}"
+ destdir="@{destfile}"
+ classpathref="@{buildclasspath}"
+ source="1.5" target="1.5" debug="on">
+ </javac>
+ </sequential>
+ </macrodef>
+
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyc.classpath"/>
+ <macrodef name="compile-groovy">
+ <attribute name="destfile"/>
+ <attribute name="dirsrc"/>
+ <attribute name="excludes" default=""/>
+ <attribute name="includes" default=""/>
+ <attribute name="buildclasspath" default=""/>
+ <sequential>
+ <mkdir dir="@{destfile}"/>
+ <groovyc
+ srcdir="@{dirsrc}"
+ destdir="@{destfile}"
+ classpathref="@{buildclasspath}"
+ sourcepath="">
+ <javac source="1.5" target="1.5" debug="on"/>
+ </groovyc>
+ </sequential>
+ </macrodef>
+
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/aqute-bnd.jar"/>
+ <macrodef name="osgi.jar">
+ <attribute name="jarosgi"/>
+ <attribute name="classesdir"/>
+ <attribute name="bndfile"/>
+ <sequential>
+ <bnd
+ classpath="@{classesdir}"
+ failok="false"
+ exceptions="false"
+ files="@{bndfile}"
+ output="@{jarosgi}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="jar-simple">
+ <attribute name="destfile"/>
+ <attribute name="basedir"/>
+ <attribute name="excludes" default=""/>
+ <attribute name="includes" default="**"/>
+ <attribute name="resources" default=""/>
+ <attribute name="paramvalue" default=""/>
+ <sequential>
+ <jar destfile="@{destfile}"
+ basedir="@{basedir}"
+ includes="@{includes}">
+ </jar>
+ </sequential>
+ </macrodef>
+
+ <target name="javadoc">
+ <mkdir dir="${dist.dir}/api"/>
+ <tstamp>
+ <format property="year" pattern="yyyy" />
+ </tstamp>
+ <javadoc
+ destdir="${dist.dir}/api"
+ sourcepath="${core.src.dir}:${classic.doc.src.dir}:${access.src.dir}:${examples.src.dir}"
+ access="protected"
+ old="false"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ windowtitle="Logback ${version}">
+ <classpath refid="javadoc.classpath"/>
+ <doctitle><![CDATA[<h2>Logback ${version}</h2>]]></doctitle>
+ <bottom><![CDATA[<i>Copyright © 1999-${year} <a href="http://www.qos.ch/">QOS.ch</a>. All rights reserved</i>]]></bottom>
+ <group title="Logback Core" packages="ch.qos.logback.core.*"/>
+ <group title="Logback Classic" packages="ch.qos.logback.classic.*, org.slf4j.impl"/>
+ <group title="Logback Access" packages="ch.qos.logback.access.*"/>
+ <group title="Logback Examples" packages="chapters.*"/>
+ </javadoc>
+ </target>
+
+ <!--taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc" classpath="/usr/share/java/groovy-all.jar"/>
+ <target name="groovydoc">
+ <mkdir dir="${dist.dir}/groovydoc"/>
+ <groovydoc
+ destdir="${dist.dir}/groovydoc"
+ sourcepath="${core.src.dir}:${classic.src.dir}/groovy:${classic.doc.src.dir}:${access.src.dir}:${examples.src.dir}"
+ packagenames="**.*"
+ use="true">
+ </groovydoc>
+ </target-->
+
+</project>
diff --git a/logback-1.0.6-access-osgi.bnd b/logback-1.0.6-access-osgi.bnd
new file mode 100644
index 0000000..35f5450
--- /dev/null
+++ b/logback-1.0.6-access-osgi.bnd
@@ -0,0 +1,22 @@
+# BND/OSGI Properties by gil
+Import-Package: \
+ ch.qos.logback.access.*, \
+ javax.*, \
+ org.xml.*, \
+ org.codehaus.janino.*, \
+ org.apache.tools.ant.*, \
+ org.apache.catalina.*, \
+ ch.qos.logback.core.*
+Export-Package: \
+ ch.qos.logback.access.*
+Bundle-License: http://www.eclipse.org/legal/epl-v10.html, http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+Bundle-Description: logback-access module
+Bundle-ManifestVersion: 2
+Bundle-Name: Logback Access Module
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-SymbolicName: ch.qos.logback.access
+Bundle-DocURL: http://www.qos.ch
+Bundle-Vendor: QOS.ch
+Bundle-Version: 1.0.6
+Built-By: ${user.name}
+Originally-Created-By: ${java.version} (${java.vendor})
\ No newline at end of file
diff --git a/logback-1.0.6-classic-osgi.bnd b/logback-1.0.6-classic-osgi.bnd
new file mode 100644
index 0000000..cb5974e
--- /dev/null
+++ b/logback-1.0.6-classic-osgi.bnd
@@ -0,0 +1,27 @@
+# BND/OSGI Properties by gil
+Import-Package: \
+ sun.reflect;resolution:=optional, \
+ javax.*;resolution:=optional, \
+ org.xml.*;resolution:=optional, \
+ org.slf4j, \
+ ch.qos.logback.core.rolling, \
+ ch.qos.logback.core.rolling.helper, \
+ ch.qos.logback.core.util, \
+ ch.qos.logback.core.read, \
+ org.codehaus.groovy.*;resolution:=optional, \
+ groovy.lang.*;resolution:=optional, \
+ *
+Export-Package: \
+ ch.qos.logback.classic.*, \
+ org.slf4j.impl
+Bundle-License: http://www.eclipse.org/legal/epl-v10.html, http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+Bundle-Description: logback-classic module
+Bundle-ManifestVersion: 2
+Bundle-Name: Logback Classic Module
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-SymbolicName: ch.qos.logback.classic
+Bundle-DocURL: http://www.qos.ch
+Bundle-Vendor: QOS.ch
+Bundle-Version: 1.0.6
+Built-By: ${user.name}
+Originally-Created-By: ${java.version} (${java.vendor})
diff --git a/logback-1.0.6-core-osgi.bnd b/logback-1.0.6-core-osgi.bnd
new file mode 100644
index 0000000..c6a84bc
--- /dev/null
+++ b/logback-1.0.6-core-osgi.bnd
@@ -0,0 +1,14 @@
+# BND/OSGI Properties by gil
+Export-Package: ch.qos.logback.core.*
+Import-Package: javax.*;resolution:=optional,org.xml.*;resolution:=optional,org.codehaus.janino;resolution:=optional,*
+Bundle-License: http://www.eclipse.org/legal/epl-v10.html, http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+Bundle-Description: logback-core module
+Bundle-ManifestVersion: 2
+Bundle-Name: Logback Core Module
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-SymbolicName: ch.qos.logback.core
+Bundle-DocURL: http://www.qos.ch
+Bundle-Vendor: QOS.ch
+Bundle-Version: 1.0.6
+Built-By: ${user.name}
+Originally-Created-By: ${java.version} (${java.vendor})
diff --git a/logback-janino-2_6.patch b/logback-1.0.6-janino-2_6.patch
similarity index 70%
rename from logback-janino-2_6.patch
rename to logback-1.0.6-janino-2_6.patch
index 5d532fd..f8d89be 100644
--- a/logback-janino-2_6.patch
+++ b/logback-1.0.6-janino-2_6.patch
@@ -1,5 +1,5 @@
---- logback-1.0.1/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java.orig 2012-03-21 10:49:50.680828668 +0000
-+++ logback-1.0.1/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java 2012-03-21 10:50:07.103764436 +0000
+--- logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java 2011-10-28 15:12:33.000000000 +0200
++++ logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java-gil 2012-07-11 13:21:25.250779454 +0200
@@ -20,9 +20,7 @@
import ch.qos.logback.core.spi.PropertyContainer;
diff --git a/logback.spec b/logback.spec
index 3718064..c106a45 100644
--- a/logback.spec
+++ b/logback.spec
@@ -1,5 +1,5 @@
Name: logback
-Version: 1.0.1
+Version: 1.0.6
Release: 1%{?dist}
Summary: A Java logging library
@@ -7,11 +7,12 @@ Group: Development/Tools
License: LGPLv2 or EPL
URL: http://logback.qos.ch/
Source0: http://logback.qos.ch/dist/%{name}-%{version}.tar.gz
-# http://anonscm.debian.org/viewvc/pkg-java/trunk/logback/debian/build.xml?revision=13384&view=co
-Source1: %{name}-debian-build.xml
-
+Source1: %{name}-%{version}-00-build.xml
+Source2: %{name}-%{version}-core-osgi.bnd
+Source3: %{name}-%{version}-classic-osgi.bnd
+Source4: %{name}-%{version}-access-osgi.bnd
# Use Janino 2.6 API
-Patch0: %{name}-janino-2_6.patch
+Patch0: %{name}-%{version}-janino-2_6.patch
# Java dependencies
BuildRequires: jpackage-utils
@@ -20,6 +21,8 @@ BuildRequires: java-devel >= 1:1.6.0
# Required libraries
BuildRequires: jms
BuildRequires: janino
+# require jansi 1.8
+BuildRequires: jansi
# Using the version of jetty in the pom.xml file
BuildRequires: jetty >= 7.5.1
BuildRequires: slf4j
@@ -31,6 +34,7 @@ BuildRequires: antlr-tool
# Build tools -- build with ant for now because of circular dependencies
BuildRequires: ant
+BuildRequires: aqute-bnd
BuildRequires: groovy
BuildArch: noarch
@@ -40,6 +44,7 @@ Requires: java >= 1:1.6.0
Requires: jpackage-utils
# Java library dependencies
+Requires: jansi
Requires: jms
Requires: janino
Requires: jetty >= 7.5.1
@@ -81,22 +86,25 @@ Sample code for the Logback library
%prep
%setup -q
%{__cp} %{SOURCE1} ./build.xml
-%{__sed} -i 's/basedir=".."//' build.xml
-%{__sed} -i 's/\${deb.package}/%{name}/' build.xml
-%{__sed} -i 's/-\${deb.version}//' build.xml
-%patch0 -p1
+%patch0 -p0
find . -name "*.jar" -delete
# Clean up the documentation
sed -i 's/\r//' LICENSE.txt README.txt docs/*.* docs/*/*.* docs/*/*/*.*
-sed -i 's#"apidocs#"%{_javadocdir}/%{name}-%{version}#g' docs/*.html
+sed -i 's#"apidocs#"%{_javadocdir}/%{name}#g' docs/*.html
rm -rf docs/apidocs docs/project-reports docs/testapidocs docs/project-reports.html
rm -f docs/manual/.htaccess docs/css/site.css # Zero-length file
+cp -p %{SOURCE2} osgi-core.bnd
+cp -p %{SOURCE3} osgi-classic.bnd
+cp -p %{SOURCE4} osgi-access.bnd
+
+sed -i 's/<artifactId>groovy-all</artifactId/<artifactId>groovy</artifactId/' $(find . -name "pom.xml")
+
%build
export CLASSPATH=`build-classpath antlr groovy janino javamail commons-compiler commons-cli tomcat6-servlet-api objectweb-asm jms slf4j jetty tomcat/catalina`
-ant jar.all jar.access javadoc
+ant dist javadoc
%install
install -d -m 755 p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -109,7 +117,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-pare
%add_maven_depmap JPP.%{name}-%{name}-parent.pom
for sub in logback-access logback-classic logback-core; do
- install -m 644 dist/$sub.jar \
+ install -m 644 dist/$sub-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}/$sub.jar
install -m 644 $sub/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$sub.pom
%add_maven_depmap JPP.%{name}-$sub.pom %{name}/$sub.jar
@@ -133,6 +141,9 @@ cp -r logback-examples/pom.xml logback-examples/src $RPM_BUILD_ROOT%{_datadir}/%
%{_datadir}/%{name}-%{version}
%changelog
+* Wed Jul 11 2012 gil cattaneo <puntogil at libero.it> - 1.0.6-1
+- Update to 1.0.6
+
* Tue Mar 20 2012 Mary Ellen Foster <mefoster at gmail.com> - 1.0.1-1
- Update to 1.0.1
- Prepare for re-review
diff --git a/sources b/sources
index 036e024..8b959e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43540f6b3e8f30c7aa1f59fa7db8b6c9 logback-1.0.1.tar.gz
+bc84cace8f42eba4c7a7fc5c33ccc8ba logback-1.0.6.tar.gz
More information about the scm-commits
mailing list