You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2008/11/18 20:49:41 UTC
svn commit: r718692 - in
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
config/ConfigParser.java menu/MenuContentHandlerImpl.java
metadata/RegionMetadata.java share/xml/JaxpXMLProvider.java
skin/SkinUtils.java
Author: jwaldman
Date: Tue Nov 18 11:49:40 2008
New Revision: 718692
URL: http://svn.apache.org/viewvc?rev=718692&view=rev
Log:
TRINIDAD-1310 use state SAXParserFactory instead of calling newInstance each time
trunk
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java?rev=718692&r1=718691&r2=718692&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/ConfigParser.java Tue Nov 18 11:49:40 2008
@@ -70,9 +70,7 @@
input.setByteStream(in);
input.setPublicId(_CONFIG_FILE);
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
- XMLReader reader = factory.newSAXParser().getXMLReader();
+ XMLReader reader = _SAX_PARSER_FACTORY.newSAXParser().getXMLReader();
reader.setContentHandler(new Handler(bean,externalContext));
reader.parse(input);
@@ -334,6 +332,13 @@
private Map<String, Object> _applicationMap;
}
+ private static final SAXParserFactory _SAX_PARSER_FACTORY;
+ static
+ {
+ _SAX_PARSER_FACTORY = SAXParserFactory.newInstance();
+ _SAX_PARSER_FACTORY.setNamespaceAware(true);
+ }
+
static private final String _CONFIG_FILE = "/WEB-INF/trinidad-config.xml";
static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ConfigParser.class);
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java?rev=718692&r1=718691&r2=718692&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java Tue Nov 18 11:49:40 2008
@@ -501,8 +501,7 @@
{
// Get a parser. NOTE: we are using the jdk's 1.5 SAXParserFactory
// and SAXParser here.
- SAXParserFactory factory = SAXParserFactory.newInstance();
- SAXParser parser = factory.newSAXParser();
+ SAXParser parser = _SAX_PARSER_FACTORY.newSAXParser();
// Call the local menu model's getStream() method. This is a model
// method so that it can be overridden by any model extending
@@ -1054,6 +1053,12 @@
private final static String _DEFAULT_FOCUS_PATH_ATTR = "defaultFocusPath";
private final static String _VISIBLE_ATTR = "visible";
+ private static final SAXParserFactory _SAX_PARSER_FACTORY;
+ static
+ {
+ _SAX_PARSER_FACTORY = SAXParserFactory.newInstance();
+ }
+
private final static TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(MenuContentHandlerImpl.class);
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java?rev=718692&r1=718691&r2=718692&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java Tue Nov 18 11:49:40 2008
@@ -181,10 +181,8 @@
input.setByteStream(in);
input.setPublicId(publicId);
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
DefaultHandler handler = new Handler(bean);
- factory.newSAXParser().parse(input, handler);
+ _SAX_PARSER_FACTORY.newSAXParser().parse(input, handler);
}
catch (IOException ioe)
{
@@ -601,6 +599,14 @@
// package private for testing purposes:
// the leading "/" is needed when classpath points to a jar file:
static final String __CONFIG_FILE_OTHER = "/META-INF/region-metadata.xml";
+
+ private static final SAXParserFactory _SAX_PARSER_FACTORY;
+ static
+ {
+ _SAX_PARSER_FACTORY = SAXParserFactory.newInstance();
+ _SAX_PARSER_FACTORY.setNamespaceAware(true);
+ }
+
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(RegionMetadata.class);
private static final String _KEY = RegionMetadata.class.getName();
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java?rev=718692&r1=718691&r2=718692&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/JaxpXMLProvider.java Tue Nov 18 11:49:40 2008
@@ -48,9 +48,7 @@
{
try
{
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
- return factory.newSAXParser().getXMLReader();
+ return _SAX_PARSER_FACTORY.newSAXParser().getXMLReader();
}
catch (ParserConfigurationException pce)
{
@@ -92,6 +90,13 @@
return null;
}
+ private static final SAXParserFactory _SAX_PARSER_FACTORY;
+ static
+ {
+ _SAX_PARSER_FACTORY = SAXParserFactory.newInstance();
+ _SAX_PARSER_FACTORY.setNamespaceAware(true);
+ }
+
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(JaxpXMLProvider.class);
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java?rev=718692&r1=718691&r2=718692&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java Tue Nov 18 11:49:40 2008
@@ -237,9 +237,6 @@
InputSource input = new InputSource();
input.setByteStream(inputStream);
input.setPublicId(configFile);
-
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
ParseContextImpl context = new ParseContextImpl();