From 6fec1adc6432eeafcdea2ab165989e170cb6e64e Mon Sep 17 00:00:00 2001
From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 19 Dec 2012 17:03:15 +0000
Subject: 2012-12-19  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (20121202).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * sources.am, gcj/javaprims.h: Regenerate.
        * gnu/java/nio/FileLockImpl.java (close): New override.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194618 138bc75d-0d04-0410-961f-82ee72b054a4
---
 .../classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod  | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent        | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent        | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent       | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent        | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent        | 2 +-
 .../tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent       | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'libjava/classpath/tools/resource')

diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod
index 144d38deac4..5d11345accd 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod
@@ -7,7 +7,7 @@
      Corporation, Norman Walsh, and the Organization for the Advancement
      of Structured Information Standards (OASIS).
 
-     $Id: dbcentx.mod,v 1.1 2008/05/27 19:26:05 jsumali Exp $
+     $Id: dbcentx.mod,v 1.1 2008-05-27 19:26:05 jsumali Exp $
 
      Permission to use, copy, modify and distribute the DocBook XML DTD
      and its accompanying documentation for any purpose and without fee
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent
index c03b1c91e9c..beb34bfda83 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-amsa.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-amsa.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent
index 945d7eef431..cc8b5b53396 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-amsb.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-amsb.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent
index 604ac480c67..0d4990f5459 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-amsc.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-amsc.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent
index fbc1e94e145..9906bde8c82 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-amsn.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-amsn.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent
index 6dc68108f0c..f972ffd88e9 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-amso.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-amso.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent
index 9c370b3ad4d..c09c33beafd 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-amsr.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-amsr.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent
index 904916c908f..456c434412c 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-box.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-box.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent
index 6507c79cb5f..1caf86b8508 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-cyr1.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+     $Id: iso-cyr1.ent,v 1.1 2008-05-27 19:26:06 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent
index 50f534749a4..07d61e0ea83 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-cyr2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-cyr2.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent
index 278e5d9e08f..3e1fe7645b7 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-dia.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-dia.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent
index 848f203d079..9c85b571064 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-grk1.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-grk1.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent
index a75f5b04abb..3809376a4ad 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-grk2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-grk2.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent
index 070ef252ca4..8ca2d43876d 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-grk3.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-grk3.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent
index 18c96eb49f6..93956dc7633 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-grk4.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-grk4.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent
index 9c2c24932f3..4e60e440834 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-lat1.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-lat1.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent
index 2f146967cc4..0d5f0d3fd85 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-lat2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-lat2.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent
index b3c434e30d1..947bdae6341 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-num.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+     $Id: iso-num.ent,v 1.1 2008-05-27 19:26:07 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent
index 979d178a49d..56710314f68 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-pub.ent,v 1.1 2008/05/27 19:26:08 jsumali Exp $
+     $Id: iso-pub.ent,v 1.1 2008-05-27 19:26:08 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent
index b0aaac49c28..388d94557fa 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent
@@ -5,7 +5,7 @@
 <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
      Information Standards (OASIS).
 
-     $Id: iso-tech.ent,v 1.1 2008/05/27 19:26:08 jsumali Exp $
+     $Id: iso-tech.ent,v 1.1 2008-05-27 19:26:08 jsumali Exp $
 
      Permission to use, copy, modify and distribute this entity set
      and its accompanying documentation for any purpose and without
-- 
cgit v1.2.3