You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/10/04 11:51:33 UTC
[cxf] branch 3.0.x-fixes updated (29c1740 -> db7b710)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 29c1740 Fixing merge
new e72b7d3 Setting secure processing to true for DOMUtils
new a2f807e Fixing backmerge
new db7b710 Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
core/src/main/java/org/apache/cxf/helpers/DOMUtils.java | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].
[cxf] 02/03: Fixing backmerge
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a2f807e308546ceb8170d52c106b2b635b0e28de
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 4 12:07:22 2017 +0100
Fixing backmerge
---
.../main/java/org/apache/cxf/helpers/DOMUtils.java | 49 ----------------------
1 file changed, 49 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
index 0e20013..3c24e7b 100644
--- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
@@ -57,32 +57,6 @@ public final class DOMUtils {
private static final Map<ClassLoader, DocumentBuilder> DOCUMENT_BUILDERS
= Collections.synchronizedMap(new WeakHashMap<ClassLoader, DocumentBuilder>());
private static final String XMLNAMESPACE = "xmlns";
-<<<<<<< HEAD
-=======
-
-
-
- static {
- if (System.getProperty("java.version").startsWith("9")) {
-
- try {
- Method[] methods = DOMUtils.class.getClassLoader().
- loadClass("com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl").getMethods();
- for (Method method : methods) {
- if (method.getName().equals("register")) {
- //this is the SAAJ impl in JDK9
- setJava9SAAJ(true);
- break;
- }
- }
- } catch (ClassNotFoundException cnfe) {
- LogUtils.getL7dLogger(DOMUtils.class).finest(
- "can't load class com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl");
- }
-
- }
- }
->>>>>>> 959a067ef2... Setting secure processing to true for DOMUtils
private DOMUtils() {
}
@@ -660,29 +634,6 @@ public final class DOMUtils {
findAllElementsByTagNameNS(elem, nameSpaceURI, localName, ret);
return ret;
}
-<<<<<<< HEAD
-=======
-
- /**
- * Try to get the DOM Node from the SAAJ Node with JAVA9
- * @param node The original node we need check
- * @return The DOM node
- */
- public static Node getDomElement(Node node) {
- if (node != null && isJava9SAAJ()) {
- //java9 hack since EA 159
- try {
- Method method = node.getClass().getMethod("getDomElement");
- node = (Node)method.invoke(node);
- } catch (NoSuchMethodException e) {
- //best effort to try, do nothing if NoSuchMethodException
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- return node;
- }
->>>>>>> 959a067ef2... Setting secure processing to true for DOMUtils
private static void findAllElementsByTagNameNS(Element el, String nameSpaceURI, String localName,
List<Element> elementList) {
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 01/03: Setting secure processing to true for DOMUtils
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e72b7d33e3a96e30f8b70ce77c5dbf5dfefcce4d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 4 11:22:02 2017 +0100
Setting secure processing to true for DOMUtils
# Conflicts:
# core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
---
.../main/java/org/apache/cxf/helpers/DOMUtils.java | 55 +++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
index 66c70a2..0e20013 100644
--- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
@@ -57,6 +57,32 @@ public final class DOMUtils {
private static final Map<ClassLoader, DocumentBuilder> DOCUMENT_BUILDERS
= Collections.synchronizedMap(new WeakHashMap<ClassLoader, DocumentBuilder>());
private static final String XMLNAMESPACE = "xmlns";
+<<<<<<< HEAD
+=======
+
+
+
+ static {
+ if (System.getProperty("java.version").startsWith("9")) {
+
+ try {
+ Method[] methods = DOMUtils.class.getClassLoader().
+ loadClass("com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl").getMethods();
+ for (Method method : methods) {
+ if (method.getName().equals("register")) {
+ //this is the SAAJ impl in JDK9
+ setJava9SAAJ(true);
+ break;
+ }
+ }
+ } catch (ClassNotFoundException cnfe) {
+ LogUtils.getL7dLogger(DOMUtils.class).finest(
+ "can't load class com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl");
+ }
+
+ }
+ }
+>>>>>>> 959a067ef2... Setting secure processing to true for DOMUtils
private DOMUtils() {
}
@@ -67,12 +93,16 @@ public final class DOMUtils {
loader = DOMUtils.class.getClassLoader();
}
if (loader == null) {
- return DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilderFactory f = DocumentBuilderFactory.newInstance();
+ f.setNamespaceAware(true);
+ f.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ return f.newDocumentBuilder();
}
DocumentBuilder factory = DOCUMENT_BUILDERS.get(loader);
if (factory == null) {
DocumentBuilderFactory f2 = DocumentBuilderFactory.newInstance();
f2.setNamespaceAware(true);
+ f2.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
factory = f2.newDocumentBuilder();
DOCUMENT_BUILDERS.put(loader, factory);
}
@@ -630,6 +660,29 @@ public final class DOMUtils {
findAllElementsByTagNameNS(elem, nameSpaceURI, localName, ret);
return ret;
}
+<<<<<<< HEAD
+=======
+
+ /**
+ * Try to get the DOM Node from the SAAJ Node with JAVA9
+ * @param node The original node we need check
+ * @return The DOM node
+ */
+ public static Node getDomElement(Node node) {
+ if (node != null && isJava9SAAJ()) {
+ //java9 hack since EA 159
+ try {
+ Method method = node.getClass().getMethod("getDomElement");
+ node = (Node)method.invoke(node);
+ } catch (NoSuchMethodException e) {
+ //best effort to try, do nothing if NoSuchMethodException
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return node;
+ }
+>>>>>>> 959a067ef2... Setting secure processing to true for DOMUtils
private static void findAllElementsByTagNameNS(Element el, String nameSpaceURI, String localName,
List<Element> elementList) {
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit db7b7104bc8960d1809cb8778104a7dba913a1af
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 4 12:08:28 2017 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2c91bf6..c7d9ae3 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1863,6 +1863,7 @@ B f3207adb13cbc93b578519e7ef8612fedfcc4634
B f32dcab58eeefa8a6b450a5b9affeaec5b0c2fe1
B f335e1b9f932347f2450c9026313203302b4e3de
B f33aebb65c66677bf07cb8200c4c62dfcbb8d70f
+B f388dd6ac0a3bd630f45ca14b87f7fb7ba0ce3da
B f39a7d185e0127e5507376c3034893bd149c9ed3
B f39ad3bbac2367149f0683bb2025b1df48beb11b
B f3c121dd625270d0dd2ee157306dd84f8213762e
@@ -2211,6 +2212,7 @@ M 8f2218ef37a8d5b6da84b3d2d3ec8ea83122e9b8
M 8fc7bfa3d054e9aebcb43f51e083ff7cf3b47010
M 9043011518147bbc2dac036681fd64d7ce578bc2
M 9245fcb3947411433c3c03ca7aff967365ec3fdd
+M 93e733396fac61150e800b343e3592587ccfbc23
M 94585ae070e62d08f0e064df8176fbdbdf1bb37b
M 94d6eba32c31e686def306f20b48ccc60d383fad
M 953d23f38ddfe044a4dff4783498ebe5d68d76c1
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.