Author: fanningpj
Date: Wed Dec 16 20:40:34 2020
New Revision: 1884525
URL: http://svn.apache.org/viewvc?rev=1884525&view=rev
Log:
[github-3] remove XBLogger and use slf4j logging instead. This closes #3
Added:
xmlbeans/trunk/.gitignore
xmlbeans/trunk/.travis.yml
Removed:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NullLogger.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XBLogFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XBLogger.java
Modified:
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
xmlbeans/trunk/src/main/resources/maven/pom.xml
Added: xmlbeans/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/.gitignore?rev=1884525&view=auto
==============================================================================
--- xmlbeans/trunk/.gitignore (added)
+++ xmlbeans/trunk/.gitignore Wed Dec 16 20:40:34 2020
@@ -0,0 +1,2 @@
+
+lib/**/*.jar
Added: xmlbeans/trunk/.travis.yml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/.travis.yml?rev=1884525&view=auto
==============================================================================
--- xmlbeans/trunk/.travis.yml (added)
+++ xmlbeans/trunk/.travis.yml Wed Dec 16 20:40:34 2020
@@ -0,0 +1,14 @@
+dist: bionic
+language: java
+jdk:
+- openjdk11
+before_install:
+ - wget https://www.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.tar.gz
+ - tar -xzvf apache-ant-1.10.9-bin.tar.gz
+ - export PATH=`pwd`/apache-ant-1.10.9/bin:$PATH
+ - echo $(ant -version)
+ - svn co https://svn.apache.org/repos/asf/poi/site/src/documentation
src/documentation
+install: /bin/true
+before_script: /bin/true
+script:
+- ant clean test
Modified: xmlbeans/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1884525&r1=1884524&r2=1884525&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Wed Dec 16 20:40:34 2020
@@ -120,6 +120,7 @@
<!-- dependencies -->
<dependency prefix="xml-apis" artifact="xml-apis:xml-apis:1.4.01"
usage="java8"/>
+ <dependency prefix="slf4j-api" artifact="org.slf4j:slf4j-api:1.7.30"
usage="main"/>
<dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:10.2"
usage="main"/>
<dependency prefix="ant" artifact="org.apache.ant:ant:1.10.8"
usage="main"/>
<dependency prefix="javaparser.core"
artifact="com.github.javaparser:javaparser-core:3.16.1" usage="main"/>
@@ -137,7 +138,8 @@
<dependency prefix="forbidden" artifact="de.thetaphi:forbiddenapis:3.0.1"
usage="util"/>
<!-- test dependencies -->
- <dependency prefix="junit" artifact="junit:junit:4.13" usage="tests"/>
+ <dependency prefix="junit" artifact="junit:junit:4.13.1" usage="tests"/>
+ <dependency prefix="slf4j-simple" artifact="org.slf4j:slf4j-simple:1.7.30"
usage="tests"/>
<dependency prefix="ant-junit" artifact="org.apache.ant:ant-junit:1.10.8"
usage="tests"/>
<dependency prefix="ant-junit4"
artifact="org.apache.ant:ant-junit4:1.10.8" usage="tests"/>
<dependency prefix="hamcrest" artifact="org.hamcrest:hamcrest:2.2"
usage="tests"/>
@@ -151,6 +153,8 @@
<pathelement location="${ant-junit.jar}"/>
<pathelement location="${ant-junit4.jar}"/>
<pathelement location="${saxon.jar}"/>
+ <pathelement location="${slf4j-api.jar}"/>
+ <pathelement location="${slf4j-simple.jar}"/>
<pathelement location="test/lib/w3c_domts.jar"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${hamcrest.jar}"/>
@@ -188,6 +192,8 @@
<available file="${old.xmlbeans.jar}"/>
<available file="${javaparser.core.jar}"/>
<available file="${saxon.jar}"/>
+ <available file="${slf4j-api.jar}"/>
+ <available file="${slf4j-simple.jar}"/>
<available file="${junit.jar}"/>
<available file="${hamcrest.jar}"/>
<available file="${xerces.jar}"/>
@@ -217,6 +223,8 @@
<downloadfile dest="${old.xmlbeans.jar}" src="${old.xmlbeans.url}"/>
<downloadfile dest="${javaparser.core.jar}"
src="${javaparser.core.url}"/>
<downloadfile dest="${saxon.jar}" src="${saxon.url}"/>
+ <downloadfile dest="${slf4j-api.jar}" src="${slf4j-api.url}"/>
+ <downloadfile dest="${slf4j-simple.jar}" src="${slf4j-simple.url}"/>
<downloadfile dest="${junit.jar}" src="${junit.url}"/>
<downloadfile dest="${hamcrest.jar}" src="${hamcrest.url}"/>
<downloadfile dest="${xerces.jar}" src="${xerces.url}"/>
@@ -346,6 +354,7 @@
<pathelement location="${ant-junit.jar}"/>
<pathelement location="${ant-junit4.jar}"/>
<pathelement location="${saxon.jar}"/>
+ <pathelement location="${slf4j-api.jar}"/>
<pathelement location="${javaparser.core.jar}"/>
</classpath>
</javac>
@@ -360,6 +369,7 @@
<!-- now generate new xmlbeans re-/sources and remove the traces of
the oldxbean generated re-/sources -->
<path id="oldschemas">
+ <pathelement location="${slf4j-api.jar}"/>
<pathelement location="${ant.jar}"/>
<pathelement location="${ant-junit.jar}"/>
<pathelement location="${ant-junit4.jar}"/>
@@ -387,6 +397,7 @@
source="${jdk.version.source}">
<src refid="sources"/>
<classpath path="${saxon.jar}"/>
+ <classpath path="${slf4j-api.jar}"/>
</javac>
<javac release="9"
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java?rev=1884525&r1=1884524&r2=1884525&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java
Wed Dec 16 20:40:34 2020
@@ -16,6 +16,8 @@
package org.apache.xmlbeans.impl.common;
import org.apache.xmlbeans.XmlOptionsBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
@@ -32,7 +34,7 @@ import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit;
public final class DocumentHelper {
- private static final XBLogger logger =
XBLogFactory.getLogger(DocumentHelper.class);
+ private static final Logger logger =
LoggerFactory.getLogger(DocumentHelper.class);
private static long lastLog;
private DocumentHelper() {}
@@ -40,20 +42,19 @@ public final class DocumentHelper {
private static class DocHelperErrorHandler implements ErrorHandler {
public void warning(SAXParseException exception) throws SAXException {
- printError(XBLogger.WARN, exception);
+ logger.warn(asString(exception), exception);
}
public void error(SAXParseException exception) throws SAXException {
- printError(XBLogger.ERROR, exception);
+ logger.error(asString(exception), exception);
}
public void fatalError(SAXParseException exception) throws
SAXException {
- printError(XBLogger.FATAL, exception);
+ logger.error(asString(exception), exception);
throw exception;
}
- /** Prints the error message. */
- private void printError(int type, SAXParseException ex) {
+ private String asString(SAXParseException ex) {
StringBuilder sb = new StringBuilder();
String systemId = ex.getSystemId();
@@ -70,7 +71,7 @@ public final class DocumentHelper {
sb.append(": ");
sb.append(ex.getMessage());
- logger.log(type, sb.toString(), ex);
+ return sb.toString();
}
}
@@ -107,9 +108,9 @@ public final class DocumentHelper {
try {
dbf.setFeature(feature, enabled);
} catch (Exception e) {
- logger.log(XBLogger.WARN, "SAX Feature unsupported", feature, e);
+ logger.warn("SAX Feature unsupported: {}", feature, e);
} catch (AbstractMethodError ame) {
- logger.log(XBLogger.WARN, "Cannot set SAX feature because outdated
XML parser in classpath", feature, ame);
+ logger.warn("Cannot set SAX feature {} because of outdated XML
parser in classpath", feature, ame);
}
}
@@ -130,7 +131,7 @@ public final class DocumentHelper {
// continue without log, this is expected in some setups
} catch (Throwable e) { // NOSONAR - also catch things like
NoClassDefError here
if(System.currentTimeMillis() > lastLog +
TimeUnit.MINUTES.toMillis(5)) {
- logger.log(XBLogger.WARN, "DocumentBuilderFactory Security
Manager could not be setup [log suppressed for 5 minutes]", e);
+ logger.warn("DocumentBuilderFactory Security Manager could
not be setup [log suppressed for 5 minutes]", e);
lastLog = System.currentTimeMillis();
}
}
@@ -141,7 +142,7 @@ public final class DocumentHelper {
dbf.setAttribute(XMLBeansConstants.ENTITY_EXPANSION_LIMIT,
options.getEntityExpansionLimit());
} catch (Throwable e) {
if(System.currentTimeMillis() > lastLog +
TimeUnit.MINUTES.toMillis(5)) {
- logger.log(XBLogger.WARN, "DocumentBuilderFactory Entity
Expansion Limit could not be setup [log suppressed for 5 minutes]", e);
+ logger.warn("DocumentBuilderFactory Entity Expansion Limit
could not be setup [log suppressed for 5 minutes]", e);
lastLog = System.currentTimeMillis();
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java?rev=1884525&r1=1884524&r2=1884525&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java
Wed Dec 16 20:40:34 2020
@@ -17,6 +17,8 @@ package org.apache.xmlbeans.impl.common;
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.XmlOptionsBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -34,7 +36,7 @@ import java.util.concurrent.TimeUnit;
* Provides handy methods for working with SAX parsers and readers
*/
public final class SAXHelper {
- private static final XBLogger logger =
XBLogFactory.getLogger(SAXHelper.class);
+ private static final Logger logger =
LoggerFactory.getLogger(SAXHelper.class);
private static long lastLog;
private SAXHelper() {
@@ -77,9 +79,9 @@ public final class SAXHelper {
try {
spf.setFeature(feature, flag);
} catch (Exception e) {
- logger.log(XBLogger.WARN, "SAX Feature unsupported", feature, e);
+ logger.warn("SAX Feature unsupported: {}", feature, e);
} catch (AbstractMethodError ame) {
- logger.log(XBLogger.WARN, "Cannot set SAX feature because outdated
XML parser in classpath", feature, ame);
+ logger.warn("Cannot set SAX feature {} because outdated XML parser
in classpath", feature, ame);
}
}
@@ -87,9 +89,9 @@ public final class SAXHelper {
try {
xmlReader.setFeature(feature, true);
} catch (Exception e) {
- logger.log(XBLogger.WARN, "SAX Feature unsupported", feature, e);
+ logger.warn("SAX Feature unsupported: {}", feature, e);
} catch (AbstractMethodError ame) {
- logger.log(XBLogger.WARN, "Cannot set SAX feature because outdated
XML parser in classpath", feature, ame);
+ logger.warn("Cannot set SAX feature {} because outdated XML parser
in classpath", feature, ame);
}
}
@@ -109,7 +111,7 @@ public final class SAXHelper {
} catch (Throwable e) { // NOSONAR - also catch things like
NoClassDefError here
// throttle the log somewhat as it can spam the log otherwise
if (System.currentTimeMillis() > lastLog +
TimeUnit.MINUTES.toMillis(5)) {
- logger.log(XBLogger.WARN, "SAX Security Manager could not
be setup [log suppressed for 5 minutes]", e);
+ logger.warn("SAX Security Manager could not be setup [log
suppressed for 5 minutes]", e);
lastLog = System.currentTimeMillis();
}
}
@@ -121,7 +123,7 @@ public final class SAXHelper {
} catch (SAXException e) { // NOSONAR - also catch things like
NoClassDefError here
// throttle the log somewhat as it can spam the log otherwise
if (System.currentTimeMillis() > lastLog +
TimeUnit.MINUTES.toMillis(5)) {
- logger.log(XBLogger.WARN, "SAX Security Manager could not be
setup [log suppressed for 5 minutes]", e);
+ logger.warn("SAX Security Manager could not be setup [log
suppressed for 5 minutes]", e);
lastLog = System.currentTimeMillis();
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java?rev=1884525&r1=1884524&r2=1884525&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java
Wed Dec 16 20:40:34 2020
@@ -20,12 +20,14 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import org.apache.xmlbeans.XmlOptionsBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provides handy methods for working with StAX parsers and readers
*/
public final class StaxHelper {
- private static final XBLogger logger =
XBLogFactory.getLogger(StaxHelper.class);
+ private static final Logger logger =
LoggerFactory.getLogger(StaxHelper.class);
private StaxHelper() {}
@@ -61,9 +63,9 @@ public final class StaxHelper {
try {
factory.setProperty(feature, flag);
} catch (Exception e) {
- logger.log(XBLogger.WARN, "StAX Property unsupported", feature, e);
+ logger.warn("StAX Property unsupported: {}", feature, e);
} catch (AbstractMethodError ame) {
- logger.log(XBLogger.WARN, "Cannot set StAX property because
outdated StAX parser in classpath", feature, ame);
+ logger.warn("Cannot set StAX property {} because outdated StAX
parser in classpath", feature, ame);
}
}
@@ -71,9 +73,9 @@ public final class StaxHelper {
try {
factory.setProperty(feature, flag);
} catch (Exception e) {
- logger.log(XBLogger.WARN, "StAX Property unsupported", feature, e);
+ logger.warn("StAX Property unsupported: {}", feature, e);
} catch (AbstractMethodError ame) {
- logger.log(XBLogger.WARN, "Cannot set StAX property because
outdated StAX parser in classpath", feature, ame);
+ logger.warn("Cannot set StAX property {} because outdated StAX
parser in classpath", feature, ame);
}
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java?rev=1884525&r1=1884524&r2=1884525&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java Wed
Dec 16 20:40:34 2020
@@ -21,6 +21,8 @@ import org.apache.xmlbeans.impl.common.*
import org.apache.xmlbeans.impl.store.Cur.Locations;
import org.apache.xmlbeans.impl.store.DomImpl.Dom;
import org.apache.xmlbeans.impl.store.Saaj.SaajCallback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.*;
import org.xml.sax.*;
import org.xml.sax.ext.DeclHandler;
@@ -44,7 +46,7 @@ import static org.apache.xmlbeans.impl.v
public final class Locale
implements DOMImplementation, SaajCallback, XmlLocale {
- private static final XBLogger logger =
XBLogFactory.getLogger(Locale.class);
+ private static final Logger logger = LoggerFactory.getLogger(Locale.class);
static final int ROOT = Cur.ROOT;
static final int ELEM = Cur.ELEM;
@@ -2757,7 +2759,7 @@ public final class Locale
try {
_xr.setProperty("http://xml.org/sax/properties/declaration-handler";, this);
} catch (Throwable e) {
- logger.log(XBLogger.WARN, "SAX Declaration Handler is not
supported", e);
+ logger.warn("SAX Declaration Handler is not supported", e);
}
}
Modified: xmlbeans/trunk/src/main/resources/maven/pom.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/resources/maven/pom.xml?rev=1884525&r1=1884524&r2=1884525&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/resources/maven/pom.xml (original)
+++ xmlbeans/trunk/src/main/resources/maven/pom.xml Wed Dec 16 20:40:34 2020
@@ -78,6 +78,11 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.30</version>
+ </dependency>
+ <dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>10.2</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
