[Jpackage-commits] rpms/free/logback logback-access-RequestLogImpl.patch, NONE, 1.1 logback-classic-PackageTest.patch, NONE, 1.1 logback-classic-pom.patch, NONE, 1.1 logback-classic-slf4j-impl-PackageTest.patch, NONE, 1.1 logback-classic-spi-PackageTest.patch, NONE, 1.1 logback-jpp-depmap.xml, NONE, 1.1 logback-settings.xml, NONE, 1.1 logback.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Thu Jul 2 23:13:51 CEST 2009


Update of /home/projects/jpackage/cvs/rpms/free/logback
In directory ryu.zarb.org:/tmp/uf9gZjZIqi/rpms/free/logback

Added Files:
	logback-access-RequestLogImpl.patch 
	logback-classic-PackageTest.patch logback-classic-pom.patch 
	logback-classic-slf4j-impl-PackageTest.patch 
	logback-classic-spi-PackageTest.patch logback-jpp-depmap.xml 
	logback-settings.xml logback.spec 
Log Message:
0.9.14-2.jpp6

--- NEW FILE: logback-classic-spi-PackageTest.patch ---
--- logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java.sav	2009-06-04 13:42:15.000000000 +0200
+++ logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java	2009-06-04 13:43:41.000000000 +0200
@@ -16,7 +16,7 @@
 @RunWith(Suite.class)
 @SuiteClasses( { ContextListenerTest.class, CallerDataTest.class,
     LoggerComparatorTest.class, LoggingEventSerializationTest.class,
-    LoggingEventSerializationPerfTest.class, ThrowableToDataPointTest.class,
+    ThrowableToDataPointTest.class,
     BasicCPDCTest.class })
 public class PackageTest  {
-}
\ Kein Zeilenumbruch am Dateiende.
+}

--- NEW FILE: logback-classic-PackageTest.patch ---
--- logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java.sav	2009-06-04 13:42:06.000000000 +0200
+++ logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java	2009-06-04 13:43:27.000000000 +0200
@@ -14,7 +14,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
- at SuiteClasses( { LoggerContextTest.class, LoggerPerfTest.class,
+ at SuiteClasses( { LoggerContextTest.class, 
     ScenarioBasedLoggerContextTest.class, PatternLayoutTest.class,
     LoggerTest.class, LoggerSerializationTest.class,
     MessageFormattingTest.class, MDCTest.class,
@@ -22,4 +22,4 @@
 
     
 public class PackageTest {
-}
\ Kein Zeilenumbruch am Dateiende.
+}

--- NEW FILE: logback-jpp-depmap.xml ---
<dependencies>

 <dependency>
   <maven>
     <groupId>org.apache.geronimo.specs</groupId>
     <artifactId>geronimo-jms_1.1_spec</artifactId>
     <version>1.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jms_1_1_api</artifactId>
     <version>1.1</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>commons-modeler</groupId>
     <artifactId>commons-modeler</artifactId>
     <version>2.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>commons-modeler</artifactId>
     <version>2.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.subethamail</groupId>
     <artifactId>subethasmtp</artifactId>
     <version>2.1.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>subethasmtp2</artifactId>
     <version>2.1</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>hsqldb</groupId>
     <artifactId>hsqldb</artifactId>
     <version>1.8.0.7</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>hsqldb</artifactId>
     <version>1.8.0.8</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-ext</artifactId>
     <version>1.5.6</version>
   </maven>
   <jpp>
     <groupId>JPP/slf4j</groupId>
     <artifactId>ext</artifactId>
     <version>1.5.6</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>junit</groupId>
     <artifactId>junit4</artifactId>
     <version>4.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>junit44</artifactId>
     <version>4.4</version>
   </jpp>
 </dependency>

<!--

-->
</dependencies>

--- NEW FILE: logback-classic-pom.patch ---
--- logback-classic/pom.xml.sav	2009-06-04 17:09:56.000000000 +0200
+++ logback-classic/pom.xml	2009-06-04 17:10:48.000000000 +0200
@@ -175,6 +175,7 @@
             <exclude>**/PackageTest.java</exclude>
             <exclude>**/TestConstants.java</exclude>
             <exclude>**/SerializationPerfsTest.java</exclude>
+            <exclude>**/SyslogAppenderTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -221,4 +222,4 @@
 
   </profiles>
 
-</project>
\ Kein Zeilenumbruch am Dateiende.
+</project>

--- NEW FILE: logback-access-RequestLogImpl.patch ---
--- logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java.sav4	2008-12-26 14:55:28.000000000 +0100
+++ logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2009-06-04 17:33:47.000000000 +0200
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.mortbay.component.LifeCycle;
 import org.mortbay.jetty.Request;
 import org.mortbay.jetty.RequestLog;
 import org.mortbay.jetty.Response;
@@ -250,4 +251,10 @@
   public Filter getFirstFilter() {
     return fai.getFirstFilter();
   }
+
+  public void addLifeCycleListener(LifeCycle.Listener listener) {
+  }
+
+  public void removeLifeCycleListener(LifeCycle.Listener listener) {
+  }
 }

--- NEW FILE: logback-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: logback-classic-slf4j-impl-PackageTest.patch ---
--- logback-classic/src/test/java/org/slf4j/impl/PackageTest.java.sav	2009-06-04 13:41:27.000000000 +0200
+++ logback-classic/src/test/java/org/slf4j/impl/PackageTest.java	2009-06-04 13:42:58.000000000 +0200
@@ -13,10 +13,10 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import ch.qos.logback.classic.LoggerPerfTest;
+//import ch.qos.logback.classic.LoggerPerfTest;
 
 @RunWith(Suite.class)
- at SuiteClasses( { RecursiveInitializationTest.class, LoggerPerfTest.class})
+ at SuiteClasses( { RecursiveInitializationTest.class})
 public class PackageTest {
 
-}
\ Kein Zeilenumbruch am Dateiende.
+}

--- NEW FILE: logback.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section free

Name:           logback
Version:        0.9.14
Release:        2%{?dist}
Epoch:          0
Summary:        Logback
License:        LGPLv2+
Group:          Development/Java
URL:            http://logback.qos.ch
# svn -q export http://svn.qos.ch/repos/logback/tags/release_0.9.14 logback-0.9.14
Source0:        logback-0.9.14.tar.gz
Source1:        logback-jpp-depmap.xml
Source2:        logback-settings.xml
Patch0:         logback-classic-PackageTest.patch
Patch1:         logback-classic-slf4j-impl-PackageTest.patch
Patch2:         logback-classic-spi-PackageTest.patch
Patch3:         logback-classic-pom.patch
Patch4:         logback-access-RequestLogImpl.patch
BuildArch:      noarch
Requires(post): jpackage-utils >= 0:1.7.3
Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-eclipse
BuildRequires:  maven2-plugin-idea
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven-release
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  maven-surefire-provider-junit4
BuildRequires:  junit44
BuildRequires:  dom4j
BuildRequires:  easymock2
BuildRequires:  greenmail
BuildRequires:  hsqldb
BuildRequires:  subethasmtp2

BuildRequires:  glassfish-javamail
BuildRequires:  janino
BuildRequires:  jetty6-core
BuildRequires:  jms_1_1_api
BuildRequires:  servlet_2_5_api
BuildRequires:  slf4j
BuildRequires:  tomcat5-server-lib

Requires:  java >= 0:1.5.0
Requires:  glassfish-javamail
Requires:  janino
Requires:  jms_1_1_api
Requires:  slf4j

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
Logback.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q 
rm logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java
rm logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4

cp -p %{SOURCE2} maven2-settings.xml

sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" maven2-settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

%build
export M2SETTINGS=$(pwd)/maven2-settings.xml
export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository

pushd logback-core
%{_bindir}/mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        -Dmaven.test.failure.ignore=true \
%if 0
        -Dmaven.test.skip=true \
%endif
        install
popd
%{_bindir}/mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Dmaven.test.failure.ignore=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        install

%{_bindir}/mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Daggregate=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -p -m 644 %{name}-core/target/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
install -p -m 644 %{name}-core/target/%{name}-core-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-tests-%{version}.jar
%add_to_maven_depmap ch.qos.logback %{name}-core %{version} JPP/%{name} core
install -p -m 644 %{name}-classic/target/%{name}-classic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/classic-%{version}.jar
install -p -m 644 %{name}-classic/target/%{name}-classic-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/classic-tests-%{version}.jar
%add_to_maven_depmap ch.qos.logback %{name}-classic %{version} JPP/%{name} classic
install -p -m 644 %{name}-access/target/%{name}-access-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/access-%{version}.jar
install -p -m 644 %{name}-access/target/%{name}-access-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/access-tests-%{version}.jar
%add_to_maven_depmap ch.qos.logback %{name}-access %{version} JPP/%{name} access
install -p -m 644 %{name}-examples/target/%{name}-examples-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/examples-%{version}.jar
%add_to_maven_depmap ch.qos.logback %{name}-examples %{version} JPP/%{name} examples
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
%add_to_maven_depmap ch.qos.logback %{name}-parent %{version} JPP/%{name} parent
install -p -m 644 %{name}-core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
install -p -m 644 %{name}-classic/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-classic.pom
install -p -m 644 %{name}-access/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-access.pom
install -p -m 644 %{name}-examples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-examples.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rf target/site/apidocs/* \
                  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/access-%{version}.jar
%{_javadir}/%{name}/access.jar
%{_javadir}/%{name}/classic-%{version}.jar
%{_javadir}/%{name}/classic.jar
%{_javadir}/%{name}/core-%{version}.jar
%{_javadir}/%{name}/core.jar
%{_javadir}/%{name}/examples-%{version}.jar
%{_javadir}/%{name}/examples.jar
%{_javadir}/%{name}/access-tests-%{version}.jar
%{_javadir}/%{name}/access-tests.jar
%{_javadir}/%{name}/classic-tests-%{version}.jar
%{_javadir}/%{name}/classic-tests.jar
%{_javadir}/%{name}/core-tests-%{version}.jar
%{_javadir}/%{name}/core-tests.jar
%{_datadir}/maven2/poms/JPP.%{name}-access.pom
%{_datadir}/maven2/poms/JPP.%{name}-classic.pom
%{_datadir}/maven2/poms/JPP.%{name}-core.pom
%{_datadir}/maven2/poms/JPP.%{name}-examples.pom
%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
%{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Thu Jul 02 2009 David Walluck <dwalluck at redhat.com> 0:0.9.14-2
- spec cleanup

* Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:0.9.14-1.jpp5
- first release




More information about the JPackage-commits mailing list