Author: jboynes
Date: Sun Nov 30 22:13:21 2014
New Revision: 1642609
URL: http://svn.apache.org/r1642609
Log:
Move XmlUtil to util package as we can also use it from the TLVs
Added:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
- copied, changed from r1642607,
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
Removed:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java?rev=1642609&r1=1642608&r2=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
Sun Nov 30 22:13:21 2014
@@ -32,6 +32,7 @@ import javax.xml.transform.sax.Transform
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.tag.common.core.Util;
+import org.apache.taglibs.standard.util.XmlUtil;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java?rev=1642609&r1=1642608&r2=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Sun Nov 30 22:13:21 2014
@@ -37,6 +37,7 @@ import javax.xml.transform.stream.Stream
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.tag.common.core.Util;
import org.apache.taglibs.standard.util.UnclosableWriter;
+import org.apache.taglibs.standard.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java?rev=1642609&r1=1642608&r2=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
Sun Nov 30 22:13:21 2014
@@ -21,6 +21,7 @@ import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
import javax.xml.transform.TransformerException;
+import org.apache.taglibs.standard.util.XmlUtil;
import org.apache.xpath.VariableStack;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XBoolean;
Copied:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
(from r1642607,
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java)
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java?p2=tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java&p1=tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java&r1=1642607&r2=1642609&rev=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Sun Nov 30 22:13:21 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.taglibs.standard.tag.common.xml;
+package org.apache.taglibs.standard.util;
import java.io.FileNotFoundException;
import java.io.InputStream;
@@ -42,7 +42,6 @@ import javax.xml.transform.sax.Transform
import javax.xml.transform.stream.StreamSource;
import org.apache.taglibs.standard.resources.Resources;
-import org.apache.taglibs.standard.util.UrlUtil;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -99,7 +98,7 @@ public class XmlUtil {
*
* @return a new empty document
*/
- static Document newEmptyDocument() {
+ public static Document newEmptyDocument() {
return newDocumentBuilder().newDocument();
}
@@ -108,7 +107,7 @@ public class XmlUtil {
*
* @return a new, configured DocumentBuilder
*/
- static DocumentBuilder newDocumentBuilder() {
+ public static DocumentBuilder newDocumentBuilder() {
try {
return PARSER_FACTORY.newDocumentBuilder();
} catch (ParserConfigurationException e) {
@@ -120,7 +119,7 @@ public class XmlUtil {
* Create a new TransformerHandler.
* @return a new TransformerHandler
*/
- static TransformerHandler newTransformerHandler() throws
TransformerConfigurationException {
+ public static TransformerHandler newTransformerHandler() throws
TransformerConfigurationException {
return TRANSFORMER_FACTORY.newTransformerHandler();
}
@@ -130,7 +129,7 @@ public class XmlUtil {
* @return a new Transformer
* @throws TransformerConfigurationException if there was a problem
creating the Transformer from the XSLT
*/
- static Transformer newTransformer(Source source) throws
TransformerConfigurationException {
+ public static Transformer newTransformer(Source source) throws
TransformerConfigurationException {
Transformer transformer = TRANSFORMER_FACTORY.newTransformer(source);
// Although newTansformer() is not allowed to return null, Xalan does.
// Trap that here by throwing the expected
TransformerConfigurationException.
@@ -149,7 +148,7 @@ public class XmlUtil {
* @param systemId the system id
* @return a configured InputSource
*/
- static InputSource newInputSource(Reader reader, String systemId) {
+ public static InputSource newInputSource(Reader reader, String systemId) {
InputSource source = new InputSource(reader);
source.setSystemId(wrapSystemId(systemId));
return source;
@@ -161,7 +160,7 @@ public class XmlUtil {
* @return a new XMLReader
* @throws SAXException if there was a problem creating the reader
*/
- static XMLReader newXMLReader(JstlEntityResolver entityResolver) throws
SAXException {
+ public static XMLReader newXMLReader(JstlEntityResolver entityResolver)
throws SAXException {
XMLReader xmlReader = runWithOurClassLoader(new Callable<XMLReader>() {
public XMLReader call() throws SAXException {
return XMLReaderFactory.createXMLReader();
@@ -180,7 +179,7 @@ public class XmlUtil {
* @return a new SAXSource
* @throws SAXException if there was a problem creating the source
*/
- static SAXSource newSAXSource(Reader reader, String systemId,
JstlEntityResolver entityResolver) throws SAXException {
+ public static SAXSource newSAXSource(Reader reader, String systemId,
JstlEntityResolver entityResolver) throws SAXException {
SAXSource source = new SAXSource(newXMLReader(entityResolver), new
InputSource(reader));
source.setSystemId(wrapSystemId(systemId));
return source;
@@ -204,7 +203,7 @@ public class XmlUtil {
/**
* JSTL-specific implementation of EntityResolver.
*/
- static class JstlEntityResolver implements EntityResolver {
+ public static class JstlEntityResolver implements EntityResolver {
private final PageContext ctx;
public JstlEntityResolver(PageContext ctx) {
@@ -249,7 +248,7 @@ public class XmlUtil {
/**
* JSTL-specific implementation of URIResolver.
*/
- static class JstlUriResolver implements URIResolver {
+ public static class JstlUriResolver implements URIResolver {
private final PageContext ctx;
public JstlUriResolver(PageContext ctx) {
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java?rev=1642609&r1=1642608&r2=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
Sun Nov 30 22:13:21 2014
@@ -25,6 +25,8 @@ import javax.xml.parsers.DocumentBuilder
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+
+import org.apache.taglibs.standard.util.XmlUtil;
import org.w3c.dom.Document;
import static org.easymock.EasyMock.createMock;
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java?rev=1642609&r1=1642608&r2=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
Sun Nov 30 22:13:21 2014
@@ -33,6 +33,7 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.apache.taglibs.standard.util.XmlUtil;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xpath.CachedXPathAPI;
import org.apache.xpath.XPath;
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java?rev=1642609&r1=1642608&r2=1642609&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
Sun Nov 30 22:13:21 2014
@@ -27,6 +27,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.apache.taglibs.standard.util.XmlUtil;
import org.apache.xml.utils.QName;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XBoolean;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
