Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 58511 invoked from network); 11 Apr 2008 20:24:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Apr 2008 20:24:53 -0000 Received: (qmail 49347 invoked by uid 500); 11 Apr 2008 20:24:53 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 49271 invoked by uid 500); 11 Apr 2008 20:24:53 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 49262 invoked by uid 99); 11 Apr 2008 20:24:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2008 13:24:53 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2008 20:24:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6381C1A9832; Fri, 11 Apr 2008 13:24:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Fri, 11 Apr 2008 20:24:28 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080411202429.6381C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - 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;