Author: mrglavas
Date: Sun Aug 14 17:13:50 2011
New Revision: 1157564
URL: http://svn.apache.org/viewvc?rev=1157564&view=rev
Log:
Fixing JIRA Issue #1523: http://issues.apache.org/jira/browse/XERCESJ-1523.
Allow Xerces to be built with Java SE 7.
Modified:
xerces/java/trunk/tools/bin/xjavac.jar
xerces/java/trunk/tools/src/XJavac.java
Modified: xerces/java/trunk/tools/bin/xjavac.jar
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/tools/bin/xjavac.jar?rev=1157564&r1=1157563&r2=1157564&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=1157564&r1=1157563&r2=1157564&view=diff
==============================================================================
--- xerces/java/trunk/tools/src/XJavac.java (original)
+++ xerces/java/trunk/tools/src/XJavac.java Sun Aug 14 17:13:50 2011
@@ -61,9 +61,10 @@ public class XJavac extends Javac {
// we're on an IBM 1.4 or higher; fiddle with the
bootclasspath.
setBootclasspath(createIBMJDKBootclasspath());
}
- // need to do special things for Sun too and also
+ // need to do special things for Sun/Oracle too and also
// for Apple, HP, FreeBSD, SableVM, Kaffe and Blackdown: a Linux
port of Sun Java
else if( (vendor.indexOf("SUN") >= 0) ||
+ (vendor.indexOf("ORACLE") >= 0) ||
(vendor.indexOf("BLACKDOWN") >= 0) ||
(vendor.indexOf("APPLE") >= 0) ||
(vendor.indexOf("HEWLETT-PACKARD") >= 0) ||
@@ -94,10 +95,14 @@ public class XJavac extends Javac {
Path bcp = createBootclasspath();
String javaHome = System.getProperty("java.home");
StringBuffer bcpMember = new StringBuffer();
- bcpMember.append(javaHome).append("/lib/charsets.jar:");
+ bcpMember.append(javaHome).append("/bin/default/jclSC170/vm.jar:");
+ bcp.createPathElement().setPath(bcpMember.toString());
+ bcpMember.replace(javaHome.length(), bcpMember.length(),
"/lib/charsets.jar:");
bcp.createPathElement().setPath(bcpMember.toString());
bcpMember.replace(javaHome.length(), bcpMember.length(),
"/lib/core.jar:");
bcp.createPathElement().setPath(bcpMember.toString());
+ bcpMember.replace(javaHome.length(), bcpMember.length(),
"/lib/math.jar:");
+ bcp.createPathElement().setPath(bcpMember.toString());
bcpMember.replace(javaHome.length(), bcpMember.length(),
"/lib/vm.jar:");
bcp.createPathElement().setPath(bcpMember.toString());
bcpMember.replace(javaHome.length(), bcpMember.length(),
"/lib/java.util.jar:");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
