Author: dkulp
Date: Tue Apr 2 16:14:48 2013
New Revision: 1463611
URL: http://svn.apache.org/r1463611
Log:
Mark optional in OSGi manifest.
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1463611&r1=1463610&r2=1463611&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Tue Apr 2 16:14:48 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/trunk/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java?rev=1463611&r1=1463610&r2=1463611&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
Tue Apr 2 16:14:48 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)
{
