Author: dkulp Date: Tue Apr 2 16:22:15 2013 New Revision: 1463618 URL: http://svn.apache.org/r1463618 Log: Merged revisions 1463615 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1463615 | dkulp | 2013-04-02 12:20:30 -0400 (Tue, 02 Apr 2013) | 10 lines Merged revisions 1463611 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1463611 | dkulp | 2013-04-02 12:14:48 -0400 (Tue, 02 Apr 2013) | 2 lines Mark optional in OSGi manifest. ........ ........ Modified: cxf/branches/2.6.x-fixes/api/pom.xml cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java Modified: cxf/branches/2.6.x-fixes/api/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/pom.xml?rev=1463618&r1=1463617&r2=1463618&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/pom.xml (original) +++ cxf/branches/2.6.x-fixes/api/pom.xml Tue Apr 2 16:22:15 2013 @@ -41,6 +41,8 @@ org.apache.cxf.*, </cxf.osgi.export> <cxf.osgi.import> + com.ctc.wstx.stax*;resolution:=optional, + org.codehaus.stax2*;resolution:=optional, com.sun*;resolution:=optional, org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}", org.apache.log4j*;resolution:=optional, Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java?rev=1463618&r1=1463617&r2=1463618&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java Tue Apr 2 16:22:15 2013 @@ -22,6 +22,7 @@ package org.apache.cxf.staxutils; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; +import com.ctc.wstx.stax.WstxInputFactory; import org.codehaus.stax2.XMLStreamReader2; /** @@ -33,7 +34,7 @@ final class WoodstoxHelper { } public static XMLInputFactory createInputFactory() { - return new com.ctc.wstx.stax.WstxInputFactory(); + return new WstxInputFactory(); } public static void setProperty(XMLStreamReader reader, String p, Object v) {
