Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 17151 invoked from network); 27 Aug 2009 19:35:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Aug 2009 19:35:51 -0000 Received: (qmail 77418 invoked by uid 500); 27 Aug 2009 19:35:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 77315 invoked by uid 500); 27 Aug 2009 19:35:51 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 77306 invoked by uid 99); 27 Aug 2009 19:35:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Aug 2009 19:35:51 +0000 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Aug 2009 19:35:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6534123888EC; Thu, 27 Aug 2009 19:35:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r808575 - in /cxf/branches/2.1.x-fixes: ./ rt/core/ rt/core/src/main/java/org/apache/cxf/bus/spring/ systests/ Date: Thu, 27 Aug 2009 19:35:29 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090827193529.6534123888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Aug 27 19:35:28 2009 New Revision: 808575 URL: http://svn.apache.org/viewvc?rev=808575&view=rev Log: Merged revisions 806606 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r806606 | dkulp | 2009-08-21 11:46:00 -0400 (Fri, 21 Aug 2009) | 9 lines Merged revisions 806020 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r806020 | dkulp | 2009-08-19 22:08:03 -0400 (Wed, 19 Aug 2009) | 1 line [CXF-2397] Make loading of xmlfi optional if fastinfoset isn't there. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/core/pom.xml cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java cxf/branches/2.1.x-fixes/systests/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 27 19:35:28 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/core/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/pom.xml?rev=808575&r1=808574&r2=808575&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/core/pom.xml Thu Aug 27 19:35:28 2009 @@ -59,7 +59,6 @@ org.apache.geronimo.specs geronimo-javamail_1.4_spec - junit junit @@ -72,11 +71,11 @@ test - - com.sun.xml.fastinfoset - FastInfoset + + com.sun.xml.fastinfoset + FastInfoset + true - Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java?rev=808575&r1=808574&r2=808575&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java Thu Aug 27 19:35:28 2009 @@ -82,7 +82,8 @@ super(beanFactory); tunedDocumentLoader = new TunedDocumentLoader(); this.setDocumentLoader(tunedDocumentLoader); - noFastinfoset = System.getProperty("org.apache.cxf.nofastinfoset") != null; + noFastinfoset = System.getProperty("org.apache.cxf.nofastinfoset") != null + || !TunedDocumentLoader.hasFastInfoSet(); } @Override @@ -118,15 +119,16 @@ @Override public int loadBeanDefinitions(EncodedResource encodedResource) throws BeanDefinitionStoreException { - if (noFastinfoset) { - return super.loadBeanDefinitions(encodedResource); - } - - try { - return fastInfosetLoadBeanDefinitions(encodedResource); - } catch (Exception e) { - return super.loadBeanDefinitions(encodedResource); + if (!noFastinfoset) { + try { + return fastInfosetLoadBeanDefinitions(encodedResource); + } catch (BeanDefinitionStoreException bdse) { + throw bdse; + } catch (Throwable e) { + //ignore - just call the super to load them + } } + return super.loadBeanDefinitions(encodedResource); } private int fastInfosetLoadBeanDefinitions(EncodedResource encodedResource) @@ -161,7 +163,11 @@ } Resource newResource = new UrlResource(fixmlUrl); - Document doc = tunedDocumentLoader.loadFastinfosetDocument(fixmlUrl); + Document doc = TunedDocumentLoader.loadFastinfosetDocument(fixmlUrl); + if (doc == null) { + //something caused FastinfoSet to not be able to read the doc + throw new StaleFastinfosetException(); + } return registerBeanDefinitions(doc, newResource); } Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=808575&r1=808574&r2=808575&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java Thu Aug 27 19:35:28 2009 @@ -23,16 +23,14 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.logging.Logger; -import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXSource; import org.w3c.dom.Document; @@ -45,6 +43,7 @@ import com.sun.xml.fastinfoset.stax.StAXDocumentParser; import org.apache.cxf.common.classloader.ClassLoaderUtils; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.staxutils.W3CDOMStreamWriter; import org.springframework.beans.factory.xml.DefaultDocumentLoader; @@ -54,27 +53,25 @@ * A Spring DocumentLoader that uses WoodStox when we are not validating to speed up the process. */ class TunedDocumentLoader extends DefaultDocumentLoader { + private static final Logger LOG = LogUtils.getL7dLogger(TunedDocumentLoader.class); + + private static boolean hasFastInfoSet; - // DocumentBuilderFactories are somewhat expensive but not thread-safe. - // We only use this builder with WoodStox, and Fast Infoset - // and we respect Spring's desire to make new factories - // when we aren't doing the optimization. - private static DocumentBuilder documentBuilder; static { - try { - documentBuilder = - DocumentBuilderFactory.newInstance().newDocumentBuilder(); - } catch (ParserConfigurationException e) { - throw new RuntimeException(e); - } + try { + ClassLoaderUtils + .loadClass("com.sun.xml.fastinfoset.stax.StAXDocumentParser", + TunedDocumentLoader.class); + hasFastInfoSet = true; + } catch (Throwable e) { + LOG.fine("FastInfoset not found on classpath. Disabling context load optimizations."); + hasFastInfoSet = false; + } } - private TransformerFactory transformerFactory; private SAXParserFactory saxParserFactory; private SAXParserFactory nsasaxParserFactory; TunedDocumentLoader() { - transformerFactory = TransformerFactory.newInstance(); - try { Class cls = ClassLoaderUtils.loadClass("com.ctc.wstx.sax.WstxSAXParserFactory", TunedDocumentLoader.class); @@ -93,6 +90,11 @@ } catch (Throwable e) { //ignore } + + } + + public static boolean hasFastInfoSet() { + return hasFastInfoSet; } @Override @@ -100,7 +102,6 @@ ErrorHandler errorHandler, int validationMode, boolean namespaceAware) throws Exception { if (validationMode == XmlBeanDefinitionReader.VALIDATION_NONE) { - SAXParserFactory parserFactory = namespaceAware ? nsasaxParserFactory : saxParserFactory; SAXParser parser = parserFactory.newSAXParser(); @@ -108,14 +109,9 @@ reader.setEntityResolver(entityResolver); reader.setErrorHandler(errorHandler); SAXSource saxSource = new SAXSource(reader, inputSource); - Document document; - // collisions are quite unlikely here, but making documentBuilderFactory objects is expensive. - synchronized (documentBuilder) { - document = documentBuilder.newDocument(); - } - DOMResult domResult = new DOMResult(document, inputSource.getSystemId()); - transformerFactory.newTransformer().transform(saxSource, domResult); - return document; + W3CDOMStreamWriter writer = new W3CDOMStreamWriter(); + StaxUtils.copy(saxSource, writer); + return writer.getDocument(); } else { return super.loadDocument(inputSource, entityResolver, errorHandler, validationMode, namespaceAware); @@ -136,9 +132,8 @@ return factory; } - Document loadFastinfosetDocument(URL url) + static Document loadFastinfosetDocument(URL url) throws IOException, ParserConfigurationException, XMLStreamException { - InputStream is = url.openStream(); InputStream in = new BufferedInputStream(is); XMLStreamReader staxReader = new StAXDocumentParser(in); Modified: cxf/branches/2.1.x-fixes/systests/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/pom.xml?rev=808575&r1=808574&r2=808575&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/pom.xml Thu Aug 27 19:35:28 2009 @@ -482,6 +482,10 @@ + + com.sun.xml.fastinfoset + FastInfoset + rhino