Author: mukulg Date: Wed Sep 11 06:08:56 2019 New Revision: 1866774 URL: http://svn.apache.org/viewvc?rev=1866774&view=rev Log: committing fix for jira issue XERCESJ-1707
Modified: xerces/java/trunk/src/org/apache/html/dom/HTMLFrameElementImpl.java xerces/java/trunk/src/org/apache/html/dom/HTMLIFrameElementImpl.java xerces/java/trunk/src/org/apache/html/dom/HTMLObjectElementImpl.java xerces/java/trunk/tools/bin/xjavac.jar xerces/java/trunk/tools/src/XJavac.java Modified: xerces/java/trunk/src/org/apache/html/dom/HTMLFrameElementImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/html/dom/HTMLFrameElementImpl.java?rev=1866774&r1=1866773&r2=1866774&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/html/dom/HTMLFrameElementImpl.java (original) +++ xerces/java/trunk/src/org/apache/html/dom/HTMLFrameElementImpl.java Wed Sep 11 06:08:56 2019 @@ -16,6 +16,7 @@ */ package org.apache.html.dom; +import org.w3c.dom.Document; import org.w3c.dom.html.HTMLFrameElement; /** @@ -126,6 +127,12 @@ public class HTMLFrameElementImpl { setAttribute( "src", src ); } + + + // added, so that xerces can be built with JDK 9 & above + public Document getContentDocument() { + return null; + } /** Modified: xerces/java/trunk/src/org/apache/html/dom/HTMLIFrameElementImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/html/dom/HTMLIFrameElementImpl.java?rev=1866774&r1=1866773&r2=1866774&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/html/dom/HTMLIFrameElementImpl.java (original) +++ xerces/java/trunk/src/org/apache/html/dom/HTMLIFrameElementImpl.java Wed Sep 11 06:08:56 2019 @@ -16,6 +16,7 @@ */ package org.apache.html.dom; +import org.w3c.dom.Document; import org.w3c.dom.html.HTMLIFrameElement; /** @@ -149,6 +150,12 @@ public class HTMLIFrameElementImpl { setAttribute( "width", width ); } + + + // added, so that xerces can be built with JDK 9 & above + public Document getContentDocument() { + return null; + } /** Modified: xerces/java/trunk/src/org/apache/html/dom/HTMLObjectElementImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/html/dom/HTMLObjectElementImpl.java?rev=1866774&r1=1866773&r2=1866774&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/html/dom/HTMLObjectElementImpl.java (original) +++ xerces/java/trunk/src/org/apache/html/dom/HTMLObjectElementImpl.java Wed Sep 11 06:08:56 2019 @@ -16,6 +16,7 @@ */ package org.apache.html.dom; +import org.w3c.dom.Document; import org.w3c.dom.html.HTMLObjectElement; /** @@ -240,6 +241,11 @@ public class HTMLObjectElementImpl } + // added, so that xerces can be built with JDK 9 & above + public Document getContentDocument() { + return null; + } + /** * Constructor requires owner document. Modified: xerces/java/trunk/tools/bin/xjavac.jar URL: http://svn.apache.org/viewvc/xerces/java/trunk/tools/bin/xjavac.jar?rev=1866774&r1=1866773&r2=1866774&view=diff ============================================================================== Binary files - no diff available. Modified: xerces/java/trunk/tools/src/XJavac.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/tools/src/XJavac.java?rev=1866774&r1=1866773&r2=1866774&view=diff ============================================================================== --- xerces/java/trunk/tools/src/XJavac.java (original) +++ xerces/java/trunk/tools/src/XJavac.java Wed Sep 11 06:08:56 2019 @@ -46,15 +46,17 @@ public class XJavac extends Javac { * @exception BuildException if the compilation has problems. */ public void execute() throws BuildException { - if(isJDK14OrHigher()) { + Properties props = null; + try { + props = System.getProperties(); + } catch (Exception e) { + throw new BuildException("unable to determine java vendor because could not access system properties!"); + } + String currBCP = (String)props.get("sun.boot.class.path"); // this property is absent / null with JDK 9 & above + + if(isJDK14OrHigher() && !(currBCP == null)) { // maybe the right one; check vendor: - // by checking system properties: - Properties props = null; - try { - props = System.getProperties(); - } catch (Exception e) { - throw new BuildException("unable to determine java vendor because could not access system properties!"); - } + // by checking system properties: // this is supposed to be provided by all JVM's from time immemorial String vendor = ((String)props.get("java.vendor")).toUpperCase(Locale.ENGLISH); if (vendor.indexOf("IBM") >= 0) { @@ -76,8 +78,7 @@ public class XJavac extends Javac { // we must use the classpath Path bcp = createBootclasspath(); Path clPath = getClasspath(); - bcp.append(clPath); - String currBCP = (String)props.get("sun.boot.class.path"); + bcp.append(clPath); Path currBCPath = new Path(null); currBCPath.createPathElement().setPath(currBCP); bcp.append(currBCPath); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org For additional commands, e-mail: commits-h...@xerces.apache.org