svn commit: r1350315 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/providers/ rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/ rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/

[sergeyb]

Author: sergeyb
Date: Thu Jun 14 16:13:40 2012
New Revision: 1350315

URL: http://svn.apache.org/viewvc?rev=1350315&view=rev
Log:
Merged revisions 1350305 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1350305 | sergeyb | 2012-06-14 16:53:47 +0100 (Thu, 14 Jun 2012) | 1 line
  
  [CXF-4381] Adding an optional DOM4J provider
........

Added:
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/
      - copied from r1350305, 
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
      - copied unchanged from r1350305, 
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/
      - copied from r1350305, 
cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
      - copied unchanged from r1350305, 
cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/pom.xml

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1350305

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 14 16:13:40 2012
@@ -1 +1 @@
-/cxf/trunk:1-1348209,1348845,1348862,1348866,1349016,1349264,1349307,1349406,1349549,1349714-1349717,1349723,1349825,1350114,1350141,1350186,1350215-1350303
+/cxf/trunk:1-1348209,1348845,1348862,1348866,1349016,1349264,1349307,1349406,1349549,1349714-1349717,1349723,1349825,1350114,1350141,1350186,1350215-1350303,1350305

Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/pom.xml?rev=1350315&r1=1350314&r2=1350315&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/pom.xml Thu Jun 14 
16:13:40 2012
@@ -37,6 +37,7 @@
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
         </cxf.osgi.import>
+        <dom4j.version>1.6.1</dom4j.version>
     </properties>
 
     <dependencies>
@@ -87,6 +88,13 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+                       <groupId>dom4j</groupId>
+                       <artifactId>dom4j</artifactId>
+                       <version>${dom4j.version}</version>
+                       <scope>provided</scope>
+            <optional>true</optional>
+               </dependency>
+        <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
             <scope>provided</scope>