changeset 103:47f3c1f894d2

. Merge from main OpenJDK repository.
author glewis@misty.eyesbeyond.com
date Mon, 07 Sep 2009 10:54:05 -0700
parents 25b32432ad4c 37c805b6156f
children 3204a672841b
files
diffstat 11 files changed, 19 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jul 25 20:54:52 2009 -0700
+++ b/.hgtags	Mon Sep 07 10:54:05 2009 -0700
@@ -41,3 +41,8 @@
 a10eec7a1edf536f39b5828d8623054dbc62c2b7 jdk7-b64
 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65
 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66
+a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67
+83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68
+a4ab0d6ded63bed0fd1e5be55d38090e0ee5efb7 jdk7-b69
+c83f0106b78a85c7e614d27a328675460b2081cf jdk7-b70
+ff94d8ce0daded647bb326630e643d010357afce jdk7-b71
--- a/THIRD_PARTY_README	Sat Jul 25 20:54:52 2009 -0700
+++ b/THIRD_PARTY_README	Mon Sep 07 10:54:05 2009 -0700
@@ -32,7 +32,7 @@
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
--- a/make/build.properties	Sat Jul 25 20:54:52 2009 -0700
+++ b/make/build.properties	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,8 @@
 # one of the standard user build.properties files (see build.xml)
 
 # options for the <javac> tasks used to compile the tools
-javac.source = 5
-javac.target = 5
+javac.source = 7
+javac.target = 7
 javac.debug = true
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
--- a/make/build.xml	Sat Jul 25 20:54:52 2009 -0700
+++ b/make/build.xml	Mon Sep 07 10:54:05 2009 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc.  All Rights Reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
--- a/make/jprt.properties	Sat Jul 25 20:54:52 2009 -0700
+++ b/make/jprt.properties	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Sat Jul 25 20:54:52 2009 -0700
+++ b/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Sat Jul 25 20:54:52 2009 -0700
+++ b/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  */
 
 /*
--- a/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Sat Jul 25 20:54:52 2009 -0700
+++ b/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  */
 
 /*
--- a/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Sat Jul 25 20:54:52 2009 -0700
+++ b/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Mon Sep 07 10:54:05 2009 -0700
@@ -1027,6 +1027,9 @@
                     int c = fEntityScanner.peekChar();
                     if (XMLChar.isMarkup(c) || c == ']') {
                         fStringBuffer.append((char)fEntityScanner.scanChar());
+                    } else if (c != -1 && isInvalidLiteral(c)) {
+                        reportFatalError("InvalidCharInSystemID",
+                            new Object[] {Integer.toString(c, 16)});
                     }
                 } while (fEntityScanner.scanLiteral(quote, ident) != quote);
                 fStringBuffer.append(ident);
--- a/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java	Sat Jul 25 20:54:52 2009 -0700
+++ b/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java	Sat Jul 25 20:54:52 2009 -0700
+++ b/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java	Mon Sep 07 10:54:05 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it