Author: alessio.soldano(a)jboss.com Date: 2011-08-31 11:04:42 -0400 (Wed, 31 Aug 2011) New Revision: 14912 Modified: common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java Log: JBPAPP-6879 Modified: common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml =================================================================== --- common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml 2011-08-31 14:58:54 UTC (rev 14911) +++ common/tags/jbossws-common-1.1.0.SP7-patch-01/pom.xml 2011-08-31 15:04:42 UTC (rev 14912) @@ -8,7 +8,7 @@ <artifactId>jbossws-common</artifactId> <packaging>jar</packaging> - <version>1.1.0.SP7</version> + <version>1.1.0.SP7-patch-01</version> <!-- Parent --> <parent> Modified: common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java =================================================================== --- common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-08-31 14:58:54 UTC (rev 14911) +++ common/tags/jbossws-common-1.1.0.SP7-patch-01/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-08-31 15:04:42 UTC (rev 14912) @@ -73,11 +73,14 @@ private static final String DISABLE_DEFERRED_NODE_EXPANSION = "org.jboss.ws.disable_deferred_node_expansion"; private static final String DEFER_NODE_EXPANSION_FEATURE = "http://apache.org/xml/features/dom/defer-node-expansion"; + private static final String ENABLE_DOCTYPE_DECL = "org.jboss.ws.enable_doctype_decl"; + private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl"; private static String documentBuilderFactoryName; private static final boolean alwaysResolveFactoryName = Boolean.getBoolean(Constants.ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY); private static final boolean disableDeferedNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION); + private static final boolean enableDoctypeDeclaration = Boolean.getBoolean(ENABLE_DOCTYPE_DECL); // All elements created by the same thread are created by the same builder and belong to the same doc private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>(); @@ -116,6 +119,10 @@ { factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false); } + if (!enableDoctypeDeclaration) + { + factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true); + } } catch (ParserConfigurationException pce) {