Skip to content

Commit

Permalink
Revert "Add Java 11 support for SAXParserTest as part of javapathfind…
Browse files Browse the repository at this point in the history
…er#274"

This reverts commit 7d07f31.
  • Loading branch information
varad64 committed Jul 10, 2023
1 parent 937e74d commit ed4898b
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 258 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ task compileModules(type: JavaCompile) {
'--add-reads', 'java.base=ALL-UNNAMED',
'--patch-module', "java.base=" + file('src/classes/modules/java.base'),
'--patch-module', "java.logging=" + file('src/classes/modules/java.logging'),
'--patch-module', "java.xml=" + file('src/classes/modules/java.xml'),
]
destinationDir = file('build/classes/modules')
}
Expand Down
1 change: 0 additions & 1 deletion src/classes/modules/java.base/java/io/File.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/
public class File
{

public static final String separator = System.getProperty("file.separator");
public static final char separatorChar = separator.charAt(0);
public static final String pathSeparator = System.getProperty("path.separator");
Expand Down
28 changes: 0 additions & 28 deletions src/classes/modules/java.base/java/lang/Class.java
Original file line number Diff line number Diff line change
Expand Up @@ -382,32 +382,4 @@ public boolean isSynthetic (){
public Module getModule() {
return module;
}

/**
* Return fully qualified package name
* Added to support SAXParserTest
*
* @return fully qualified package name
*/
public String getPackageName() {
String packageName = this.packageName;
if (packageName == null) {
Class<?> cls = this;
while (cls.isArray()) {
cls = cls.getComponentType();
}
if (cls.isPrimitive()) {
packageName = "java.lang";
} else {
String clsName = cls.getName();
int dot = clsName.lastIndexOf('.');
packageName = (dot != -1) ? clsName.substring(0, dot).intern() : "";
}
this.packageName = packageName;
}
return packageName;
}

private transient String packageName;

}
226 changes: 0 additions & 226 deletions src/classes/modules/java.xml/jdk/xml/internal/SecuritySupport.java

This file was deleted.

2 changes: 0 additions & 2 deletions src/tests/gov/nasa/jpf/test/xerces/SAXParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
import java.io.IOException;

import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;

import org.junit.Test;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
Expand Down

0 comments on commit ed4898b

Please sign in to comment.