Enable jboss-logging
This commit is contained in:
parent
35c2f1c2b5
commit
b2005f7dd5
@ -11,17 +11,18 @@ diff --git a/pom.xml b/pom.xml
|
||||
index a1597fe..77fb611 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -116,13 +116,6 @@
|
||||
@@ -116,13 +116,13 @@
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
- <groupId>org.jboss.logging</groupId>
|
||||
<groupId>org.jboss.logging</groupId>
|
||||
- <artifactId>jboss-logging-spi</artifactId>
|
||||
- <version>2.1.2.GA</version>
|
||||
- <scope>compile</scope>
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
+ <artifactId>jboss-logging</artifactId>
|
||||
<version>2.1.2.GA</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.16</version>
|
||||
|
@ -1,33 +0,0 @@
|
||||
From 61b66b45737653da51cc25d2771a97c811525e0f Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Thu, 13 Jan 2011 15:02:01 +0100
|
||||
Subject: [PATCH 2/4] Replace jboss logger with jdk logger
|
||||
|
||||
---
|
||||
.../microcontainer/NettyLoggerConfigurator.java | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java b/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
|
||||
index 2ccc731..eca8a6a 100644
|
||||
--- a/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
|
||||
+++ b/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
|
||||
@@ -16,7 +16,7 @@
|
||||
package org.jboss.netty.container.microcontainer;
|
||||
|
||||
import org.jboss.netty.logging.InternalLoggerFactory;
|
||||
-import org.jboss.netty.logging.JBossLoggerFactory;
|
||||
+import org.jboss.netty.logging.JdkLoggerFactory;
|
||||
|
||||
/**
|
||||
* A bean that configures the default {@link InternalLoggerFactory}.
|
||||
@@ -27,6 +27,6 @@ import org.jboss.netty.logging.JBossLoggerFactory;
|
||||
*/
|
||||
public class NettyLoggerConfigurator {
|
||||
public NettyLoggerConfigurator() {
|
||||
- InternalLoggerFactory.setDefaultFactory(new JBossLoggerFactory());
|
||||
+ InternalLoggerFactory.setDefaultFactory(new JdkLoggerFactory());
|
||||
}
|
||||
}
|
||||
--
|
||||
1.7.7.3
|
||||
|
21
netty.spec
21
netty.spec
@ -8,13 +8,12 @@ License: ASL 2.0
|
||||
URL: http://www.jboss.org/netty
|
||||
Source0: http://sourceforge.net/projects/jboss/files/%{name}-%{version}.Final-dist.tar.bz2
|
||||
|
||||
Patch0: 0001-Remove-optional-deps.patch
|
||||
Patch1: 0002-Replace-jboss-logger-with-jdk-logger.patch
|
||||
Patch2: 0003-Fix-javadoc-plugin-configuration.patch
|
||||
Patch3: 0004-Remove-antun-execution-for-removing-examples.patch
|
||||
Patch4: 0005-Remove-eclipse-plugin.patch
|
||||
Patch1: 0001-Remove-optional-deps.patch
|
||||
Patch3: 0003-Fix-javadoc-plugin-configuration.patch
|
||||
Patch4: 0004-Remove-antun-execution-for-removing-examples.patch
|
||||
Patch5: 0005-Remove-eclipse-plugin.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildArch: noarch
|
||||
|
||||
# This pulls in all of the required java and maven stuff
|
||||
BuildRequires: maven
|
||||
@ -34,6 +33,7 @@ BuildRequires: subversion
|
||||
BuildRequires: protobuf-java
|
||||
BuildRequires: felix-osgi-compendium
|
||||
BuildRequires: jboss-parent
|
||||
BuildRequires: jboss-logging
|
||||
|
||||
Requires: java
|
||||
Requires: protobuf-java
|
||||
@ -70,20 +70,15 @@ rm -rf jar/
|
||||
# example doesn't build with our protobuf
|
||||
rm -rf src/main/java/org/jboss/netty/example/localtime
|
||||
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# we don't have jboss logging facilites so we replace it with jdk logger
|
||||
rm src/main/java/org/jboss/netty/logging/JBossLogger*.java
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
# skipping tests because we don't have all dependencies in Fedora
|
||||
mvn-rpmbuild -Dmaven.test.skip=true \
|
||||
install javadoc:javadoc
|
||||
install javadoc:aggregate
|
||||
|
||||
|
||||
%install
|
||||
|
Loading…
Reference in New Issue
Block a user