Author: cleclerc
Date: Tue May 4 22:16:25 2010
New Revision: 941073
URL: http://svn.apache.org/viewvc?rev=941073&view=rev
Log:
Merged revisions 941065 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r941065 | cleclerc | 2010-05-04 23:54:03 +0200 (Tue, 04 May 2010) | 2 lines
[CXF-2751] Add Slf4jLogger
Inspired by Julien Henry proposal
........
Added:
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
- copied unchanged from r941065,
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 22:16:25 2010
@@ -1 +1 @@
-/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697,939719,940950
+/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697,939719,940950,941065
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/common/common/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/pom.xml?rev=941073&r1=941072&r2=941073&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/common/common/pom.xml Tue May 4 22:16:25 2010
@@ -110,6 +110,19 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.11</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>1.5.11</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
