svn commit: r647300 - in /incubator/cxf/branches/2.0.x-fixes: distribution/bundle/pom.xml rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

[dkulp]

Author: dkulp
Date: Fri Apr 11 13:24:27 2008
New Revision: 647300

URL: http://svn.apache.org/viewvc?rev=647300&view=rev
Log:
Fix build errors with the latest set of stuff merged from trunk.
Remove stuff from osgi manifest that aren't in 2.0.x.

Modified:
    incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
    
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=647300&r1=647299&r2=647300&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Fri Apr 11 
13:24:27 2008
@@ -229,7 +229,6 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            antlr*;resolution:=optional,
                             com.ctc.wstx*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
@@ -238,14 +237,12 @@
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             org.apache.commons.lang*;resolution:=optional,
-                            org.apache.commons.codec*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
                             org.apache.tools.ant*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.ws.security*;resolution:=optional,
                             org.codehaus.jra*;resolution:=optional,
-                            org.codehaus.jettison*;resolution:=optional,
                             org.jdom*;resolution:=optional,
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=647300&r1=647299&r2=647300&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 Fri Apr 11 13:24:27 2008
@@ -24,8 +24,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXSource;