Compare commits
No commits in common. 'f38' and 'c9-beta-stream-202201' have entirely different histories.
f38
...
c9-beta-st
@ -1 +0,0 @@
|
|||||||
1
|
|
||||||
@ -1,4 +1 @@
|
|||||||
/JDOM-2.0.5.tar.gz
|
SOURCES/jdom2-2.0.6.tar.gz
|
||||||
/JDOM-2.0.6.tar.gz
|
|
||||||
/jdom2-2.0.6.tar.gz
|
|
||||||
/jdom2-2.0.6.1.tar.gz
|
|
||||||
|
|||||||
@ -0,0 +1 @@
|
|||||||
|
d47a717b9ea4e9917652d4b80a669b5f55fe7639 SOURCES/jdom2-2.0.6.tar.gz
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
From 07f316957b59d305f04c7bdb26292852bcbc2eb5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rolf Lear <rolf@tuis.net>
|
||||||
|
Date: Thu, 1 Jul 2021 23:56:47 -0400
|
||||||
|
Subject: [PATCH] Update test case to ensure DTD handling is OK again. Related
|
||||||
|
#188. Related #189
|
||||||
|
|
||||||
|
---
|
||||||
|
test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||||
|
index a69380ba..a35a1b90 100644
|
||||||
|
--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||||
|
+++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||||
|
@@ -101,6 +101,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||||
|
import org.jdom2.DefaultJDOMFactory;
|
||||||
|
import org.jdom2.Document;
|
||||||
|
import org.jdom2.EntityRef;
|
||||||
|
+import org.jdom2.JDOMConstants;
|
||||||
|
import org.jdom2.JDOMException;
|
||||||
|
import org.jdom2.JDOMFactory;
|
||||||
|
import org.jdom2.UncheckedJDOMFactory;
|
||||||
|
@@ -609,11 +610,12 @@ public void testSetExternalFeature() {
|
||||||
|
XMLReader reader = sb.createParser();
|
||||||
|
assertNotNull(reader);
|
||||||
|
assertTrue(reader.getFeature(feature));
|
||||||
|
+ assertNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER));
|
||||||
|
sb.setFeature(feature, false);
|
||||||
|
reader = sb.createParser();
|
||||||
|
assertNotNull(reader);
|
||||||
|
assertFalse(reader.getFeature(feature));
|
||||||
|
-
|
||||||
|
+ assertNotNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER));
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
fail("Could not create parser: " + e.getMessage());
|
||||||
@ -0,0 +1,69 @@
|
|||||||
|
From bd3ab78370098491911d7fe9d7a43b97144a234e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Esti <esther.burs@gmail.com>
|
||||||
|
Date: Thu, 18 Feb 2021 16:40:01 +0200
|
||||||
|
Subject: [PATCH] fix setFeature bug and add test case
|
||||||
|
|
||||||
|
---
|
||||||
|
core/src/java/org/jdom2/input/SAXBuilder.java | 10 ++++------
|
||||||
|
.../test/cases/input/TestSAXBuilder.java | 20 +++++++++++++++++++
|
||||||
|
2 files changed, 24 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||||
|
index d7105ec6..a1462334 100644
|
||||||
|
--- a/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||||
|
+++ b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||||
|
@@ -971,11 +971,6 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- // Set any user-specified features on the parser.
|
||||||
|
- for (final Map.Entry<String, Boolean> me : features.entrySet()) {
|
||||||
|
- internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey());
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
// Set any user-specified properties on the parser.
|
||||||
|
for (final Map.Entry<String, Object> me : properties.entrySet()) {
|
||||||
|
internalSetProperty(parser, me.getKey(), me.getValue(), me.getKey());
|
||||||
|
@@ -1007,7 +1002,10 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH
|
||||||
|
// No lexical reporting available
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+ // Set any user-specified features on the parser.
|
||||||
|
+ for (final Map.Entry<String, Boolean> me : features.entrySet()) {
|
||||||
|
+ internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey());
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||||
|
index 4ef34834..a69380ba 100644
|
||||||
|
--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||||
|
+++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||||
|
@@ -600,6 +600,26 @@ public void testSetFeature() {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @Test
|
||||||
|
+ public void testSetExternalFeature() {
|
||||||
|
+ String feature = "http://xml.org/sax/features/external-general-entities";
|
||||||
|
+ MySAXBuilder sb = new MySAXBuilder();
|
||||||
|
+ try {
|
||||||
|
+ sb.setFeature(feature, true);
|
||||||
|
+ XMLReader reader = sb.createParser();
|
||||||
|
+ assertNotNull(reader);
|
||||||
|
+ assertTrue(reader.getFeature(feature));
|
||||||
|
+ sb.setFeature(feature, false);
|
||||||
|
+ reader = sb.createParser();
|
||||||
|
+ assertNotNull(reader);
|
||||||
|
+ assertFalse(reader.getFeature(feature));
|
||||||
|
+
|
||||||
|
+ } catch (Exception e) {
|
||||||
|
+ e.printStackTrace();
|
||||||
|
+ fail("Could not create parser: " + e.getMessage());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@Test
|
||||||
|
public void testSetProperty() {
|
||||||
|
LexicalHandler lh = new LexicalHandler() {
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
From dd4f3c2fc7893edd914954c73eb577f925a7d361 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rolf Lear <rolf@tuis.net>
|
||||||
|
Date: Thu, 1 Jul 2021 23:42:05 -0400
|
||||||
|
Subject: [PATCH] Addresses #189 - synchronizes external entity expansion
|
||||||
|
setting
|
||||||
|
|
||||||
|
---
|
||||||
|
core/src/java/org/jdom2/input/SAXBuilder.java | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||||
|
index a1462334..514b026d 100644
|
||||||
|
--- a/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||||
|
+++ b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||||
|
@@ -82,6 +82,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||||
|
import org.jdom2.DocType;
|
||||||
|
import org.jdom2.Document;
|
||||||
|
import org.jdom2.EntityRef;
|
||||||
|
+import org.jdom2.JDOMConstants;
|
||||||
|
import org.jdom2.JDOMException;
|
||||||
|
import org.jdom2.JDOMFactory;
|
||||||
|
import org.jdom2.Verifier;
|
||||||
|
@@ -797,6 +798,11 @@ public void setFastReconfigure(final boolean fastReconfigure) {
|
||||||
|
public void setFeature(final String name, final boolean value) {
|
||||||
|
// Save the specified feature for later.
|
||||||
|
features.put(name, value ? Boolean.TRUE : Boolean.FALSE);
|
||||||
|
+ if (JDOMConstants.SAX_FEATURE_EXTERNAL_ENT.equals(name)) {
|
||||||
|
+ // See issue https://github.com/hunterhacker/jdom/issues/189
|
||||||
|
+ // And PR https://github.com/hunterhacker/jdom/pull/188
|
||||||
|
+ setExpandEntities(value);
|
||||||
|
+ }
|
||||||
|
engine = null;
|
||||||
|
}
|
||||||
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_contexts:
|
|
||||||
- bodhi_update_push_testing
|
|
||||||
- bodhi_update_push_stable
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
summary: Run javapackages-specific tests
|
|
||||||
discover:
|
|
||||||
how: fmf
|
|
||||||
url: https://src.fedoraproject.org/tests/javapackages
|
|
||||||
ref: f37
|
|
||||||
execute:
|
|
||||||
how: tmt
|
|
||||||
Loading…
Reference in new issue