cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r639700 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/ rt/core/src/main/java/org/apache/cxf/bus/spring/
Date Fri, 21 Mar 2008 16:30:28 GMT
Author: dkulp
Date: Fri Mar 21 09:30:25 2008
New Revision: 639700

URL: http://svn.apache.org/viewvc?rev=639700&view=rev
Log:
Merged revisions 639288 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r639288 | bimargulies | 2008-03-20 09:30:45 -0400 (Thu, 20 Mar 2008) | 5 lines
  
  When we are loading a Spring XML file and not validating, use Woodstox 
  instead of the JDK to do the XML parsing. This cuts a bit over a second 
  out of the cost of initializing a default bus, if I'm reading my results
  correctly.
........

Added:
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
      - copied unchanged from r639288, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=639700&r1=639699&r2=639700&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Fri Mar 21 09:30:25 2008
@@ -76,11 +76,32 @@
     private StaxUtils() {
     }
 
+    /**
+     * Return a cached, namespace-aware, factory.
+     * @return
+     */
     public static XMLInputFactory getXMLInputFactory() {
         return getXMLInputFactory(true);
     }
+    
+    /**
+     * Return a cached factory.
+     * @param nsAware
+     * @return
+     */
     public static XMLInputFactory getXMLInputFactory(boolean nsAware) {
         return nsAware ? XML_NS_AWARE_INPUT_FACTORY : XML_INPUT_FACTORY;
+    }
+    
+    /**
+     * Return a new factory so that the caller can set sticky parameters.
+     * @param nsAware
+     * @return
+     */
+    public static XMLInputFactory createXMLInputFactory(boolean nsAware) {
+        XMLInputFactory factory = XMLInputFactory.newInstance();
+        factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, nsAware);
+        return factory;
     }
 
     public static XMLOutputFactory getXMLOutputFactory() {

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java?rev=639700&r1=639699&r2=639700&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
Fri Mar 21 09:30:25 2008
@@ -44,6 +44,7 @@
      */
     public ControlledValidationXmlBeanDefinitionReader(BeanDefinitionRegistry beanFactory)
{
         super(beanFactory);
+        this.setDocumentLoader(new TunedDocumentLoader());
     }
 
     @Override



Mime
View raw message