Author: alessio.soldano(a)jboss.com Date: 2011-08-25 05:21:31 -0400 (Thu, 25 Aug 2011) New Revision: 14902 Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/wsdl20.xsd legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/wseventing/WEB-INF/wsdl/ws-addr.xsd Log: [JBPAPP-6879] Fix for 1.2.1.GA_CP06 Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2011-08-25 09:21:31 UTC (rev 14902) @@ -67,6 +67,11 @@ public final class DOMUtils { private static Logger log = Logger.getLogger(DOMUtils.class); + + 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 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 documentThreadLocal = new ThreadLocal(); @@ -77,6 +82,10 @@ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setNamespaceAware(true); + if (!enableDoctypeDeclaration) + { + factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true); + } DocumentBuilder builder = factory.newDocumentBuilder(); builder.setEntityResolver(new JBossWSEntityResolver()); return builder; Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"--> <!-- W3C XML Schema defined in the Web Services Addressing 1.0 specification http://www.w3.org/TR/ws-addr-core Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/wsdl20.xsd =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/wsdl20.xsd 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/wsdl20.xsd 2011-08-25 09:21:31 UTC (rev 14902) @@ -15,7 +15,7 @@ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 --> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"--> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2003/11/wsdl" targetNamespace="http://www.w3.org/2003/11/wsdl" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<!--DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"--> <web-app id="WebApp_ID"> <display-name>include-test</display-name> Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"--> <!-- W3C XML Schema defined in the Web Services Addressing 1.0 specification http://www.w3.org/TR/ws-addr-core Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/wseventing/WEB-INF/wsdl/ws-addr.xsd =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/wseventing/WEB-INF/wsdl/ws-addr.xsd 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/wseventing/WEB-INF/wsdl/ws-addr.xsd 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"--> <!-- W3C XML Schema defined in the Web Services Addressing 1.0 specification http://www.w3.org/TR/ws-addr-core