any (code generated for the type by an IDL comp
been compiled with the object implementation). As a result, the object receiving the
any does not have a portable method of using it.
-DynAnys enable traversal of the data value associated with an
-any at runtime, and extraction of the primitive constituents of the data value.
-This is especially helpful for writing powerful generic servers (bridges, event channels
-supporting filtering). Similarly, this facility enables the construction of an
-any at runtime, without having static knowledge of its type. This is especially
+
DynAnys enable traversal of the data value associated with an
+any at runtime, and extraction of the primitive constituents of the data value.
+This is especially helpful for writing powerful generic servers (bridges, event channels
+supporting filtering). Similarly, this facility enables the construction of an
+any at runtime, without having static knowledge of its type. This is especially
helpful for writing generic clients (bridges, browsers, debuggers, user interface tools).
-
Any values can be dynamically interpreted (traversed) and constructed through
-DynAny objects. A DynAny object is associated with a data
-value which corresponds to a copy of the value inserted into an Any. A
+
Any values can be dynamically interpreted (traversed) and constructed through
+DynAny objects. A DynAny object is associated with a data
+value which corresponds to a copy of the value inserted into an Any. A
DynAny object may be viewed as an ordered collection of component
-DynAnys. For DynAnys representing a basic type, such as long,
-or a type without components, such as an empty exception, the ordered collection of
-components is empty.
+DynAnys. For DynAnys representing a basic type, such as long,
+or a type without components, such as an empty exception, the ordered collection of
+components is empty.
-
Each DynAny object maintains the notion of a current position into its collection -of component DynAnys. The current position is identified by an index value that runs -from 0 to n-1, where n is the number of components. The special index value -1 +
Each DynAny object maintains the notion of a current position into its collection
+of component DynAnys. The current position is identified by an index value that runs
+from 0 to n-1, where n is the number of components. The special index value -1
indicates a current position that points nowhere.
For values that cannot have a current position (such as an empty exception),
the index value is fixed at -1.
- If a DynAny is initialized with a value that has components, the index is
+ If a DynAny is initialized with a value that has components, the index is
initialized to 0.
- After creation of an uninitialized DynAny (that is, a DynAny that
+ After creation of an uninitialized DynAny (that is, a DynAny that
has no value but a TypeCode
that permits components), the current position depends on the type of value represented by
- the DynAny. (The current position is set to 0 or -1, depending on whether the
+ the DynAny. (The current position is set to 0 or -1, depending on whether the
new DynAny
gets default values for its components.)
-
-
-
The iteration operations rewind, seek, and next
+
+
+
The iteration operations rewind, seek, and next
can be used to change the current position
- and the current_component operation returns the component at the current
+ and the current_component operation returns the component at the current
position.
- The component_count operation returns the number of components of a
+ The component_count operation returns the number of components of a
DynAny.
- Collectively, these operations enable iteration over the components of a
+ Collectively, these operations enable iteration over the components of a
DynAny, for example,
to (recursively) examine its contents.
-
A constructed DynAny object is a DynAny object associated with
+
A constructed DynAny object is a DynAny object associated with
a constructed type.
- There is a different interface, inheriting from the DynAny interface,
+ There is a different interface, inheriting from the DynAny interface,
associated with
each kind of constructed type in IDL (fixed, enum, struct, sequence, union, array,
- exception, and value type). A constructed DynAny object exports operations
+ exception, and value type). A constructed DynAny object exports operations
that enable the creation of new DynAny objects,
each of them associated with a component of the constructed data value.
- As an example, a DynStruct is associated with a struct value. This
+ As an example, a DynStruct is associated with a struct value. This
means that the DynStruct
may be seen as owning an ordered collection of components, one for each structure member.
- The DynStruct object exports operations that enable the creation of new
+ The DynStruct object exports operations that enable the creation of new
DynAny objects,
each of them associated with a member of the struct.
-
-
-
If a DynAny object has been obtained from another (constructed)
+
+
+
If a DynAny object has been obtained from another (constructed)
DynAny object,
- such as a DynAny representing a structure member that was created from a
+ such as a DynAny representing a structure member that was created from a
DynStruct,
the member DynAny is logically contained in the DynStruct.
- Calling an insert or get operation leaves the current position
+ Calling an insert or get operation leaves the current position
unchanged.
- Destroying a top-level DynAny object (one that was not obtained as a component
+ Destroying a top-level DynAny object (one that was not obtained as a component
of another DynAny)
also destroys any component DynAny objects obtained from it.
Destroying a non-top level DynAny object does nothing.
- Invoking operations on a destroyed top-level DynAny or any of its descendants
+ Invoking operations on a destroyed top-level DynAny or any of its descendants
raises OBJECT_NOT_EXIST.
- If the programmer wants to destroy a DynAny object but still wants to
+ If the programmer wants to destroy a DynAny object but still wants to
manipulate some component
- of the data value associated with it, then he or she should first create a
+ of the data value associated with it, then he or she should first create a
DynAny for the component
and, after that, make a copy of the created DynAny object.
-
-
-
The behavior of DynAny objects has been defined in order to enable efficient
+
+
+
The behavior of DynAny objects has been defined in order to enable efficient
implementations
- in terms of allocated memory space and speed of access. DynAny objects are
+in terms of allocated memory space and speed of access. DynAny objects are
intended to be used
- for traversing values extracted from anys or constructing values of
+for traversing values extracted from anys or constructing values of
anys at runtime.
- Their use for other purposes is not recommended.
-
-
-
+Their use for other purposes is not recommended.
+
+
+
Insert and get operations are necessary to handle basic
+
+
Insert and get operations are necessary to handle basic
DynAny objects
but are also helpful to handle constructed DynAny objects.
Inserting a basic data type value into a constructed DynAny object
@@ -145,9 +145,8 @@ equivalent to
the TypeCode contained in the DynAny or, if the
DynAny has components, is equivalent to the TypeCode
of the DynAny at the current position.
-
+
Basic operations include: -
DynAny and DynAnyFactory objects are intended to be local to
+
+
+
DynAny and DynAnyFactory objects are intended to be local to
the process in which they are
- created and used. This means that references to DynAny and
+ created and used. This means that references to DynAny and
DynAnyFactory objects cannot be exported
to other processes, or externalized with ORB.object_to_string().
- If any attempt is made to do so, the offending operation will raise a MARSHAL system
+ If any attempt is made to do so, the offending operation will raise a MARSHAL system
exception.
- Since their interfaces are specified in IDL, DynAny objects export operations
+ Since their interfaces are specified in IDL, DynAny objects export operations
defined in the standard
- org.omg.CORBA.Object interface. However, any attempt to invoke operations
+ org.omg.CORBA.Object interface. However, any attempt to invoke operations
exported through the Object
interface may raise the standard NO_IMPLEMENT exception.
- An attempt to use a DynAny object with the DII may raise the NO_IMPLEMENT
+ An attempt to use a DynAny object with the DII may raise the NO_IMPLEMENT
exception.
For a precise list of supported sections of official specifications with which
-the Java[tm] Platform, Standard Edition 6 ORB complies, see Official Specifications for CORBA
+ For a precise list of supported sections of official specifications with which
+the Java[tm] Platform, Standard Edition 6 ORB complies, see Official Specifications for CORBA
support in Java[tm] SE 6.
@since 1.4
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 36118304912..7ccce8f8bd5 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -468,3 +468,4 @@ ee878f3d6732856f7725c590312bfbe2ffa52cc7 jdk9-b58
2ac9b6b36689b50d1562627067c92d51781b5684 jdk9-b63
bf92b8db249cdfa5651ef954b6c0743a7e0ea4cd jdk9-b64
e7ae94c4f35e940ea423fc1dd260435df34a77c0 jdk9-b65
+197e94e0dacddd16816f101d24fc0442ab518326 jdk9-b66
diff --git a/hotspot/agent/make/Makefile b/hotspot/agent/make/Makefile
index 8462ef68086..f120c60fa68 100644
--- a/hotspot/agent/make/Makefile
+++ b/hotspot/agent/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -79,11 +79,10 @@ sun.jvm.hotspot.debugger.windbg \
sun.jvm.hotspot.debugger.windbg.amd64 \
sun.jvm.hotspot.debugger.windbg.x86 \
sun.jvm.hotspot.debugger.x86 \
-sun.jvm.hotspot.gc_implementation \
-sun.jvm.hotspot.gc_implementation.g1 \
-sun.jvm.hotspot.gc_implementation.parallelScavenge \
-sun.jvm.hotspot.gc_implementation.shared \
-sun.jvm.hotspot.gc_interface \
+sun.jvm.hotspot.gc \
+sun.jvm.hotspot.gc.g1 \
+sun.jvm.hotspot.gc.parallel \
+sun.jvm.hotspot.gc.shared \
sun.jvm.hotspot.interpreter \
sun.jvm.hotspot.jdi \
sun.jvm.hotspot.memory \
@@ -168,9 +167,9 @@ sun/jvm/hotspot/debugger/win32/coff/*.java \
sun/jvm/hotspot/debugger/windbg/*.java \
sun/jvm/hotspot/debugger/windbg/x86/*.java \
sun/jvm/hotspot/debugger/x86/*.java \
-sun/jvm/hotspot/gc_implementation/g1/*.java \
-sun/jvm/hotspot/gc_implementation/parallelScavenge/*.java \
-sun/jvm/hotspot/gc_implementation/shared/*.java \
+sun/jvm/hotspot/gc/g1/*.java \
+sun/jvm/hotspot/gc/parallel/*.java \
+sun/jvm/hotspot/gc/shared/*.java \
sun/jvm/hotspot/interpreter/*.java \
sun/jvm/hotspot/jdi/*.java \
sun/jvm/hotspot/memory/*.java \
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
index c43c5b1b88e..bb5cfe16c82 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -33,8 +33,8 @@ import java.util.*;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.compiler.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.parallel.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
@@ -927,7 +927,7 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
if (curVFrame.isCompiledFrame()) {
CodeBlob cb = VM.getVM().getCodeCache().findBlob(curFrame.getPC());
ImmutableOopMapSet maps = cb.getOopMaps();
- if ((maps == null) || (maps.getSize() == 0)) {
+ if ((maps == null) || (maps.getCount() == 0)) {
shouldSkipOopMaps = true;
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java
index 5c975fc5298..fa8b27e61c4 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapPair.java
@@ -71,4 +71,8 @@ public class ImmutableOopMapPair {
offsetField = type.getCIntegerField("_oopmap_offset");
classSize = type.getSize();
}
+
+ public String toString() {
+ return "Pair{pc_offset = " + getPC() + ", data_offset = " + getOffset() + "}";
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java
index b2ece64f639..c8b771d8aaf 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java
@@ -106,19 +106,19 @@ public class ImmutableOopMapSet extends VMObject {
/**
* Returns the number of OopMaps in this ImmutableOopMapSet
*/
- public long getSize() {
- return countField.getValue(addr);
- }
-
public int getCount() { return (int) countField.getValue(addr); }
private Address dataStart() {
- return (addr.addOffsetTo(ImmutableOopMapSet.classSize * getCount()));
+ return (pairStart().addOffsetTo(ImmutableOopMapPair.classSize() * getCount()));
+ }
+
+ private Address pairStart() {
+ return addr.addOffsetTo(ImmutableOopMapSet.classSize);
}
public ImmutableOopMapPair pairAt(int index) {
Assert.that((index >= 0) && (index < getCount()), "bad index");
- return new ImmutableOopMapPair(addr.addOffsetTo(index * ImmutableOopMapPair.classSize()));
+ return new ImmutableOopMapPair(pairStart().addOffsetTo(index * ImmutableOopMapPair.classSize()));
}
/**
@@ -126,7 +126,7 @@ public class ImmutableOopMapSet extends VMObject {
*/
public ImmutableOopMap getMapAt(int index) {
if (Assert.ASSERTS_ENABLED) {
- Assert.that((index >= 0) && (index <= getSize()), "bad index");
+ Assert.that((index >= 0) && (index <= getCount()), "bad index");
}
ImmutableOopMapPair immutableOopMapPair = pairAt(index);
@@ -135,7 +135,7 @@ public class ImmutableOopMapSet extends VMObject {
public ImmutableOopMap findMapAtOffset(long pcOffset, boolean debugging) {
int i;
- int len = (int) getSize();
+ int len = getCount();
if (Assert.ASSERTS_ENABLED) {
Assert.that(len > 0, "must have pointer maps");
}
@@ -253,14 +253,14 @@ public class ImmutableOopMapSet extends VMObject {
if (!VM.getVM().isDebugging()) {
if (Assert.ASSERTS_ENABLED) {
ImmutableOopMapSet maps = cb.getOopMaps();
- Assert.that((maps != null) && (maps.getSize() > 0), "found null or empty ImmutableOopMapSet for CodeBlob");
+ Assert.that((maps != null) && (maps.getCount() > 0), "found null or empty ImmutableOopMapSet for CodeBlob");
}
} else {
// Hack for some topmost frames that have been found with empty
// OopMapSets. (Actually have not seen the null case, but don't
// want to take any chances.) See HSDB.showThreadStackMemory().
ImmutableOopMapSet maps = cb.getOopMaps();
- if ((maps == null) || (maps.getSize() == 0)) {
+ if ((maps == null) || (maps.getCount() == 0)) {
return;
}
}
@@ -311,8 +311,28 @@ public class ImmutableOopMapSet extends VMObject {
return pairAt(index);
}
+ private int getSize() {
+ return (int) sizeField.getValue(addr);
+ }
+
public ImmutableOopMap getMap(ImmutableOopMapPair pair) {
- Assert.that(pair.getOffset() < (int) sizeField.getValue(), "boundary check");
+ Assert.that(pair.getOffset() < getSize(), "boundary check: this: " + this + " offset: " + pair);
return new ImmutableOopMap(dataStart().addOffsetTo(pair.getOffset()));
}
+
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("Set{ ")
+ .append("addr = ").append(addr)
+ .append(", count = ").append(getCount())
+ .append(", size = ").append(getSize())
+ .append(", pairs = [");
+
+ for (int i = 0; i < getCount(); ++i) {
+ builder.append(getPairAt(i));
+ }
+
+ builder.append("]");
+ return builder.toString();
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java
index 19dca2610ce..3e9a518b074 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java
@@ -1,7 +1,7 @@
/*
* @(#)AdaptiveFreeList.java
*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -24,7 +24,7 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
import java.util.Observable;
import java.util.Observer;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java
index cdbfd3cfda9..feaac965aaa 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. 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
@@ -22,11 +22,12 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java
index 28205ae0b03..1ffcf405f6e 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java
similarity index 91%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java
index ed26af725e0..86b2d520516 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,25 +22,18 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
+import java.io.*;
+import java.util.*;
-import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.debugger.Debugger;
-import sun.jvm.hotspot.oops.ObjectHeap;
-import sun.jvm.hotspot.oops.Oop;
-import sun.jvm.hotspot.runtime.VM;
-import sun.jvm.hotspot.runtime.VMObjectFactory;
-import sun.jvm.hotspot.types.AddressField;
-import sun.jvm.hotspot.types.Type;
-import sun.jvm.hotspot.types.TypeDataBase;
-import sun.jvm.hotspot.utilities.Assert;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.memory.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
public class CompactibleFreeListSpace extends CompactibleSpace {
private static AddressField collectorField;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java
index a9eaa9fc55d..86b1caad447 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,11 +22,12 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java
index e51c2834ea9..e8af2723727 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java
@@ -1,6 +1,6 @@
/*
* @(#)BinaryTreeDictionary.java
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -23,7 +23,7 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java
similarity index 86%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java
index 04721a0e6b8..eefe84a9d84 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,9 +22,11 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.cms;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.serial.*;
+import sun.jvm.hotspot.gc.shared.*;
public class ParNewGeneration extends DefNewGeneration {
public ParNewGeneration(Address addr) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1Allocator.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1Allocator.java
index 1195eed06bb..4307ba24a7d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1Allocator.java
@@ -1,4 +1,4 @@
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Observable;
import java.util.Observer;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
index 815a74bc276..0197f90a558 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. 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
@@ -22,17 +22,17 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
import java.util.Observer;
import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.gc_interface.CollectedHeap;
-import sun.jvm.hotspot.gc_interface.CollectedHeapName;
+import sun.jvm.hotspot.gc.shared.CollectedHeap;
+import sun.jvm.hotspot.gc.shared.CollectedHeapName;
+import sun.jvm.hotspot.gc.shared.SpaceClosure;
import sun.jvm.hotspot.memory.MemRegion;
-import sun.jvm.hotspot.memory.SpaceClosure;
import sun.jvm.hotspot.runtime.VM;
import sun.jvm.hotspot.runtime.VMObjectFactory;
import sun.jvm.hotspot.types.AddressField;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
similarity index 97%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
index e8bbaaa0553..da8abd80223 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
index a9ced52b635..e59825dca7c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Observable;
import java.util.Observer;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java
index 8d924973d8f..61b2bb1aec5 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. 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
@@ -22,14 +22,14 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.ArrayList;
import java.util.List;
import java.util.Observable;
import java.util.Observer;
import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.memory.CompactibleSpace;
+import sun.jvm.hotspot.gc.shared.CompactibleSpace;
import sun.jvm.hotspot.memory.MemRegion;
import sun.jvm.hotspot.runtime.VM;
import sun.jvm.hotspot.types.AddressField;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
index 2a2a26f3947..b80c60350f4 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java
index 94c3e239990..bd64e0249e4 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetCount.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetCount.java
index 2a4483a54c8..2c9fd8280c8 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetCount.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java
index 7f173bc3937..61a3b749c34 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ImmutableSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.shared;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java
index f0f33245434..7a6aa3914ad 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/MutableSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.shared;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java
index 4735ecc3fd8..161c61ee940 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,13 +22,12 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_implementation.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java
index b8c36bc1793..f092d052fb3 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,13 +22,12 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_implementation.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java
index e99316718ab..9db4b041acd 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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
@@ -22,13 +22,13 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java
index bbc44198406..620c2d76cdf 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/serial/DefNewGeneration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -22,12 +22,13 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.serial;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java
index 50ac92752b8..9a81b0774e7 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -22,12 +22,13 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.serial;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java
index 1ea450a6df2..3d96d33d81e 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.shared;
import sun.jvm.hotspot.debugger.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
similarity index 98%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
index c66a791dfd8..7646a2ced6c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
similarity index 97%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
index 7e18cfa5075..13419091e18 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
/** Mimics the enums in the VM under CollectedHeap::Name */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java
index dfbc5232b80..a3af6048bdb 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CompactibleSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.shared;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java
index 6092609dc74..c62c47dc97c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/ContiguousSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -22,12 +22,13 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java
index d3d15512b04..871af8aae9d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot
//code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
index fc8f251f919..3b9655b922c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
index f8985778d35..9a7a4de3872 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java
similarity index 91%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java
index 74d4a83f744..83530d4a502 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. 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
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java
similarity index 98%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java
index 074e7fa286e..7f4579f879d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GenCollectedHeap.java
@@ -22,13 +22,12 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Generation.java
similarity index 98%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Generation.java
index 0da3de8b1ed..d00bf48ef01 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Generation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. 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
@@ -22,13 +22,14 @@
*
*/
-package sun.jvm.hotspot.memory;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
/** The (supported) Generation hierarchy currently looks like this: A Space describes a heap area. Class Space is an abstract base
class.
+ * The {@code pack} methods may be used by application developers who
+ * wish to deploy large JARs on the web. The {@code unpack} methods
+ * may be used by deployment applications such as Java Web Start and
+ * Java Plugin.
+ *
+ *
+ * In typical use, the packed output should be further compressed
+ * using a suitable tool such as gzip or
+ * {@code java.util.zip.GZIPOutputStream}. The resulting file (with
+ * a suffix ".pack.gz") should be hosted on a HTTP/1.1 compliant
+ * server, which will be capable of handling "Accept-Encoding", as
+ * specified by the HTTP 1.1 RFC2616 specification.
+ *
+ *
+ * NOTE: It is recommended that the original ".jar" file be
+ * hosted in addition to the ".pack.gz" file, so that older client
+ * implementations will continue to work reliably. (On-demand
+ * compression by the server is not recommended.)
+ *
+ *
+ * When a client application requests a ".jar" file (call it
+ * "Large.jar"), the client will transmit the headers
+ * "Content-Type=application/x-java-archive" as well as
+ * "Accept-Encoding=pack200-gzip". This indicates to the server that
+ * the client application desires an version of the file encoded with
+ * Pack200 and further compressed with gzip.
+ *
+ *
+ * The server implementation will typically check for the existence of
+ * "Large.pack.gz". If that file is available, the server will
+ * transmit it with the headers "Content-Encoding=pack200-gzip" and
+ * "Content-Type=application/x-java-archive".
+ *
+ *
+ * If the ".pack.gz" file, is not available, then the server will
+ * transmit the original ".jar" with "Content-Encoding=null" and
+ * "Content-Type=application/x-java-archive".
+ *
+ *
+ * A MIME type of "application/x-java-pack200" may be specified by the
+ * client application to indicate a ".pack" file is required.
+ * However, this has limited capability, and is not recommended.
+ *
+ *
-This package provides methods to read files from a JAR file and
-to transform them to a more compact transfer format called Pack200.
-It also provides methods to receive the transmitted data and expand
-it into a JAR file equivalent to the original JAR file.
-
-
-The pack methods may be used by application developers
-who wish to deploy large JARs on the web. The unpack methods may be used
-by deployment applications such as Java Web Start and Java Plugin.
-
-
-In typical use, the packed output should be further compressed using
-a suitable tool such as gzip or java.util.zip.GZIPOutputStream.
-The resulting file (with a suffix ".pack.gz") should be hosted on a HTTP/1.1
-compliant server, which will be capable of handling "Accept-Encoding",
-as specified by the HTTP 1.1 RFC2616 specification.
-
-
-NOTE: It is recommended that the original ".jar" file be hosted
-in addition to the ".pack.gz" file, so that older client implementations
-will continue to work reliably.
-(On-demand compression by the server is not recommended.)
-
-
-When a client application requests a ".jar" file (call it "Large.jar"),
-the client will transmit the headers
-"Content-Type=application/x-java-archive" as well as "Accept-Encoding=pack200-gzip".
-This indicates to the server that the client application desires an version
-of the file encoded with Pack200 and further compressed with gzip.
-
-
-The server implementation will typically check for the existence of "Large.pack.gz".
-If that file is available, the server will transmit it with the headers
-"Content-Encoding=pack200-gzip" and "Content-Type=application/x-java-archive".
-
-
-If the ".pack.gz" file, is not available, then the server will transmit
-the original ".jar"
-with "Content-Encoding=null" and "Content-Type=application/x-java-archive".
-
-
-A MIME type of "application/x-java-pack200" may be specified by the
-client application to indicate a ".pack" file is required.
-However, this has limited capability, and is not recommended.
-
- Each reference-object type is implemented by a subclass of the
+ * abstract base {@link java.lang.ref.Reference} class.
+ * An instance of one of these subclasses encapsulates a single
+ * reference to a particular object, called the referent.
+ * Every reference object provides methods for getting and clearing
+ * the reference. Aside from the clearing operation reference objects
+ * are otherwise immutable, so no {@code set} operation is
+ * provided. A program may further subclass these subclasses, adding
+ * whatever fields and methods are required for its purposes, or it
+ * may use these subclasses without change.
+ *
+ * The relationship between a registered reference object and its
+ * queue is one-sided. That is, a queue does not keep track of the
+ * references that are registered with it. If a registered reference
+ * becomes unreachable itself, then it will never be enqueued. It is
+ * the responsibility of the program using reference objects to ensure
+ * that the objects remain reachable for as long as the program is
+ * interested in their referents.
+ *
+ * While some programs will choose to dedicate a thread to
+ * removing reference objects from one or more queues and processing
+ * them, this is by no means necessary. A tactic that often works
+ * well is to examine a reference queue in the course of performing
+ * some other fairly-frequent action. For example, a hashtable that
+ * uses weak references to implement weak keys could poll its
+ * reference queue each time the table is accessed. This is how the
+ * {@link java.util.WeakHashMap} class works. Because
+ * the {@link java.lang.ref.ReferenceQueue#poll
+ * ReferenceQueue.poll} method simply checks an internal data
+ * structure, this check will add little overhead to the hashtable
+ * access methods.
+ *
+ * Each reference-object type is implemented by a subclass of the abstract
-base The relationship between a registered reference object and its queue is
-one-sided. That is, a queue does not keep track of the references that are
-registered with it. If a registered reference becomes unreachable itself, then
-it will never be enqueued. It is the responsibility of the program using
-reference objects to ensure that the objects remain reachable for as long as
-the program is interested in their referents.
-
- While some programs will choose to dedicate a thread to removing reference
-objects from one or more queues and processing them, this is by no means
-necessary. A tactic that often works well is to examine a reference queue in
-the course of performing some other fairly-frequent action. For example, a
-hashtable that uses weak references to implement weak keys could poll its
-reference queue each time the table is accessed. This is how the Only developers who are defining new selector providers or
+ * asynchronous channel providers should need to make direct use of
+ * this package. Unless otherwise noted, passing a {@code null} argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio.channels.spi;
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html b/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html
deleted file mode 100644
index a6f8cbfdcb3..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/channels/spi/package.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- Only developers who are defining new selector providers or asynchronous
-channel providers should need to make direct use of this package. Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
index 8d67ebbc8d6..a242b9c7ac8 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -30,6 +30,7 @@ import java.nio.CharBuffer;
import java.nio.charset.spi.CharsetProvider;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -336,12 +337,10 @@ public abstract class Charset
//
private static Iterator A charset is named mapping between sequences of
+ * sixteen-bit Unicode characters and sequences of bytes, in the sense
+ * defined in RFC 2278.
+ * A decoder is an engine which transforms bytes in a specific
+ * charset into characters, and an encoder is an engine which
+ * transforms characters into bytes. Encoders and decoders operate on
+ * byte and character buffers. They are collectively referred to as
+ * coders.
+ *
+ * The {@link java.nio.charset.Charset} class defines methods for
+ * creating coders for a given charset and for retrieving the various
+ * names associated with a charset. It also defines static methods
+ * for testing whether a particular charset is supported, for locating
+ * charset instances by name, and for constructing a map that contains
+ * every charset for which support is available in the current Java
+ * virtual machine.
+ *
+ * Most users will not use these classes directly; instead they
+ * will use the existing charset-related constructors and methods in
+ * the {@link java.lang.String} class, together with the existing
+ * {@link java.io.InputStreamReader} and {@link
+ * java.io.OutputStreamWriter} classes, all of whose implementations
+ * have been reworked to make use of the charset facilities defined in
+ * this package. A small number of changes have been made to the
+ * {@link java.io.InputStreamReader} and {@link
+ * java.io.OutputStreamWriter} classes in order to allow explicit
+ * charset objects to be specified in the construction of instances of
+ * those classes.
+ *
+ * Support for new charsets can be made available via the
+ * interface defined in the {@link
+ * java.nio.charset.spi.CharsetProvider} class in the {@link
+ * java.nio.charset.spi} package.
+ *
+ * Unless otherwise noted, passing a null argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio.charset;
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/package.html b/jdk/src/java.base/share/classes/java/nio/charset/package.html
deleted file mode 100644
index 69b160b8139..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/charset/package.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
- Class name Description A charset is named mapping between sequences of sixteen-bit Unicode
-characters and sequences of bytes, in the sense defined in RFC 2278. A
-decoder is an engine which transforms bytes in a specific charset into
-characters, and an encoder is an engine which transforms characters into
-bytes. Encoders and decoders operate on byte and character buffers. They are
-collectively referred to as coders.
-
- The {@link java.nio.charset.Charset} class defines methods for creating
-coders for a given charset and for retrieving the various names associated with
-a charset. It also defines static methods for testing whether a particular
-charset is supported, for locating charset instances by name, and for
-constructing a map that contains every charset for which support is available
-in the current Java virtual machine.
-
- Most users will not use these classes directly; instead they will use the
-existing charset-related constructors and methods in the {@link
-java.lang.String} class, together with the existing {@link
-java.io.InputStreamReader} and {@link java.io.OutputStreamWriter} classes, all
-of whose implementations have been reworked to make use of the charset
-facilities defined in this package. A small number of changes have been made
-to the {@link java.io.InputStreamReader} and {@link java.io.OutputStreamWriter}
-classes in order to allow explicit charset objects to be specified in the
-construction of instances of those classes.
-
- Support for new charsets can be made available via the interface defined in
-the {@link java.nio.charset.spi.CharsetProvider} class in the {@link
-java.nio.charset.spi} package.
-
- Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java b/jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java
similarity index 65%
rename from jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
rename to jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java
index 55b22bcc67a..8e5e81da703 100644
--- a/jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/spi/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2005, Oracle and/or its affiliates. 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
@@ -23,21 +23,19 @@
* questions.
*/
-package sun.tools.native2ascii.resources;
-
-import java.util.ListResourceBundle;
-
-public class MsgNative2ascii extends ListResourceBundle {
-
- public Object[][] getContents() {
- Object[][] temp = new Object[][] {
- {"err.bad.arg", "-encoding requires argument"},
- {"err.cannot.read", "{0} could not be read."},
- {"err.cannot.write", "{0} could not be written."},
- {"usage", "Usage: native2ascii" +
- " [-reverse] [-encoding encoding] [inputfile [outputfile]]"},
- };
-
- return temp;
- }
-}
+/**
+ * Service-provider classes for the {@link java.nio.charset} package.
+ *
+ * Only developers who are defining new charsets should need to
+ * make direct use of this package. Unless otherwise noted, passing a {@code null} argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio.charset.spi;
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html b/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html
deleted file mode 100644
index a7b7ab18879..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/charset/spi/package.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- Only developers who are defining new charsets should need to make direct
-use of this package. Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/nio/package-info.java b/jdk/src/java.base/share/classes/java/nio/package-info.java
new file mode 100644
index 00000000000..374e0bb59a9
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/nio/package-info.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Defines buffers, which are containers for data, and provides an
+ * overview of the other NIO packages.
+ *
+ *
+ * The central abstractions of the NIO APIs are: Buffers, which are containers for data;
+ * Charsets and their
+ * associated decoders and encoders, Channels of
+ * various types, which represent connections Selectors and selection keys, which
+ * together with The java.nio package defines the buffer classes, which
+ * are used throughout the NIO APIs. The charset API is defined in
+ * the {@link java.nio.charset} package, and the channel and selector
+ * APIs are defined in the {@link java.nio.channels} package. Each of
+ * these subpackages has its own service-provider (SPI) subpackage,
+ * the contents of which can be used to extend the platform's default
+ * implementations or to construct alternative implementations.
+ *
+ *
+ *
+ * A buffer is a container for a fixed amount of data of a
+ * specific primitive type. In addition to its content a buffer has a
+ * position, which is the index of the next element to be read
+ * or written, and a limit, which is the index of the first
+ * element that should not be read or written. The base {@link
+ * java.nio.Buffer} class defines these properties as well as methods
+ * for clearing, flipping, and rewinding, for
+ * marking the current position, and for resetting the
+ * position to the previous mark.
+ *
+ * There is a buffer class for each non-boolean primitive type.
+ * Each class defines a family of get and put methods
+ * for moving data out of and in to a buffer, methods for
+ * compacting, duplicating, and slicing a buffer,
+ * and static methods for allocating a new buffer as well as
+ * for wrapping an existing array into a buffer.
+ *
+ * Byte buffers are distinguished in that they can be used as the
+ * sources and targets of I/O operations. They also support several
+ * features not found in the other buffer classes:
+ *
+ * A byte buffer can be allocated as a direct buffer, in which
+ * case the Java virtual machine will make a best effort to perform
+ * native I/O operations directly upon it. A byte buffer can be created by {@link
+ * java.nio.channels.FileChannel#map mapping} a region of a
+ * file directly into memory, in which case a few additional
+ * file-related operations defined in the {@link
+ * java.nio.MappedByteBuffer} class are available. A byte buffer provides access to its content as either a
+ * heterogeneous or homogeneous sequence of binary data of any
+ * non-boolean primitive type, in either big-endian or little-endian
+ * byte order. Unless otherwise noted, passing a null argument to a
+ * constructor or method in any class or interface in this package
+ * will cause a {@link java.lang.NullPointerException
+ * NullPointerException} to be thrown.
+ *
+ * @since 1.4
+ * @author Mark Reinhold
+ * @author JSR-51 Expert Group
+ */
+package java.nio;
diff --git a/jdk/src/java.base/share/classes/java/nio/package.html b/jdk/src/java.base/share/classes/java/nio/package.html
deleted file mode 100644
index 1ce7131f869..00000000000
--- a/jdk/src/java.base/share/classes/java/nio/package.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
- The central abstractions of the NIO APIs are: Buffers, which are containers for data;
- Charsets and their
- associated decoders and encoders, Channels of
- various types, which represent connections Selectors and selection keys, which together with The java.nio package defines the buffer classes, which are used
-throughout the NIO APIs. The charset API is defined in the {@link
-java.nio.charset} package, and the channel and selector APIs are defined in the
-{@link java.nio.channels} package. Each of these subpackages has its own
-service-provider (SPI) subpackage, the contents of which can be used to extend
-the platform's default implementations or to construct alternative
-implementations.
-
-
-
-
- Buffers Description A buffer is a container for a fixed amount of data of a specific
-primitive type. In addition to its content a buffer has a position,
-which is the index of the next element to be read or written, and a
-limit, which is the index of the first element that should not be read
-or written. The base {@link java.nio.Buffer} class defines these properties as
-well as methods for clearing, flipping, and rewinding, for
-marking the current position, and for resetting the position to
-the previous mark.
-
- There is a buffer class for each non-boolean primitive type. Each class
-defines a family of get and put methods for moving data out of
-and in to a buffer, methods for compacting, duplicating, and
-slicing a buffer, and static methods for allocating a new buffer
-as well as for wrapping an existing array into a buffer.
-
- Byte buffers are distinguished in that they can be used as the sources and
-targets of I/O operations. They also support several features not found in the
-other buffer classes:
-
- A byte buffer can be allocated as a
- direct buffer, in which case the Java virtual machine will make a
- best effort to perform native I/O operations directly upon it. A byte buffer can be created by {@link
- java.nio.channels.FileChannel#map mapping} a region of a
- file directly into memory, in which case a few additional file-related
- operations defined in the {@link java.nio.MappedByteBuffer} class are
- available. A byte buffer provides access to its content as either a heterogeneous
- or homogeneous sequence of binary data
- of any non-boolean primitive type, in either big-endian or little-endian byte order. Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a {@link
-java.lang.NullPointerException NullPointerException} to be thrown.
-
-@since 1.4
-@author Mark Reinhold
-@author JSR-51 Expert Group
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/text/AttributedString.java b/jdk/src/java.base/share/classes/java/text/AttributedString.java
index daceb62a70f..6e89fdec599 100644
--- a/jdk/src/java.base/share/classes/java/text/AttributedString.java
+++ b/jdk/src/java.base/share/classes/java/text/AttributedString.java
@@ -332,7 +332,7 @@ public class AttributedString {
* @param beginIndex Index of the first character of the range.
* @param endIndex Index of the character following the last character of the range.
* @exception NullPointerException if These classes are capable of formatting dates, numbers, and
+ * messages, parsing; searching and sorting strings; and iterating
+ * over characters, words, sentences, and line breaks. This package
+ * contains three main groups of classes and interfaces:
+ *
+ *
-These classes are capable of formatting dates, numbers, and messages, parsing;
-searching and sorting strings; and iterating over characters, words, sentences,
-and line breaks. This package contains three main groups of classes and
-interfaces:
-
- * Beyond dates and times, the API also allows the storage of period and durations of time.
+ * Beyond dates and times, the API also allows the storage of periods and durations of time.
* A {@link java.time.Duration} is a simple measure of time along the time-line in nanoseconds.
- * A {@link java.time.Period} expresses an amount of time in units meaningful to humans, such as years or hours.
+ * A {@link java.time.Period} expresses an amount of time in units meaningful
+ * to humans, such as years or days.
* The {@link #loadFromXML(InputStream)} and {@link
* #storeToXML(OutputStream, String, String)} methods load and store properties
@@ -108,9 +107,6 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
* This class is thread-safe: multiple threads can share a single
* Properties object without the need for external synchronization.
*
- * @see native2ascii tool for Solaris
- * @see native2ascii tool for Windows
- *
* @author Arthur van Hoff
* @author Michael McCloskey
* @author Xueming Shen
diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
index 3c01aacecc2..f565bc02361 100644
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -268,13 +268,25 @@ class JarFile extends ZipFile {
}
/**
- * Returns an enumeration of the zip file entries.
+ * Returns an enumeration of the jar file entries.
+ *
+ * @return an enumeration of the jar file entries
+ * @throws IllegalStateException
+ * may be thrown if the jar file has been closed
*/
public Enumeration
+ * In JAR files, all file names must be encoded in the UTF-8 encoding.
+ *
- In JAR files, all file names must be encoded in the UTF-8 encoding.
- An instance of the {@link java.util.regex.Pattern} class
+ * represents a regular expression that is specified in string form in
+ * a syntax similar to that used by Perl.
+ *
+ * Instances of the {@link java.util.regex.Matcher} class are used
+ * to match character sequences against a given pattern. Input is
+ * provided to matchers via the {@link java.lang.CharSequence}
+ * interface in order to support matching against characters from a
+ * wide variety of input sources. Unless otherwise noted, passing a null argument to a
+ * method in any class or interface in this package will cause a
+ * {@link java.lang.NullPointerException NullPointerException} to be
+ * thrown.
+ *
+ * An excellent tutorial and overview of regular expressions is Mastering Regular
+ * Expressions, Jeffrey E. F. Friedl, O'Reilly and Associates,
+ * 1997. An instance of the {@link java.util.regex.Pattern} class represents a
-regular expression that is specified in string form in a syntax similar to
-that used by Perl.
-
- Instances of the {@link java.util.regex.Matcher} class are used to match
-character sequences against a given pattern. Input is provided to matchers via
-the {@link java.lang.CharSequence} interface in order to support matching
-against characters from a wide variety of input sources. Unless otherwise noted, passing a null argument to a method
-in any class or interface in this package will cause a
-{@link java.lang.NullPointerException NullPointerException} to be thrown.
-
- An excellent tutorial and overview of regular expressions is Mastering Regular
-Expressions, Jeffrey E. F. Friedl, O'Reilly and Associates, 1997. Note that these interfaces are intended only for key
+ * implementations whose key material is accessible and
+ * available. These interfaces are not intended for key implementations
+ * whose key material resides in inaccessible, protected storage (such
+ * as in a hardware device).
+ *
+ * For more developer information on how to use these interfaces,
+ * including information on how to design
-Note that these interfaces are intended only
-for key implementations whose key material
-is accessible and available. These
-interfaces are not intended for key
-implementations whose key material resides
-in inaccessible, protected storage (such as
-in a hardware device).
-
-For more developer information on how to use
-these interfaces, including information on
-how to design Support for encryption includes symmetric, asymmetric, block,
+ * and stream ciphers. This package also supports secure streams and
+ * sealed objects.
+ *
+ * Many of the classes provided in this package are provider-based.
+ * The class itself defines a programming interface to which
+ * applications may write. The implementations themselves may then be
+ * written by independent third-party vendors and plugged in
+ * seamlessly as needed. Therefore application developers may take
+ * advantage of any number of provider-based implementations without
+ * having to add or rewrite code.
+ *
+ * Support for encryption includes symmetric, asymmetric, block, and
-stream ciphers. This package also supports secure streams and sealed
-objects.
-
- Many of the classes provided in this package are provider-based. The
-class itself defines a programming interface to which applications may
-write. The implementations themselves may then be written by
-independent third-party vendors and plugged in seamlessly as needed.
-Therefore application developers may take advantage of any number of
-provider-based implementations without having to add or rewrite code.
-
- A key specification is a transparent representation of the key
+ * material that constitutes a key. A key may be specified in an
+ * algorithm-specific way, or in an algorithm-independent encoding
+ * format (such as ASN.1). This package contains key specifications
+ * for Diffie-Hellman public and private keys, as well as key
+ * specifications for DES, Triple DES, and PBE secret keys.
+ *
+ * An algorithm parameter specification is a transparent
+ * representation of the sets of parameters used with an
+ * algorithm. This package contains algorithm parameter specifications
+ * for parameters used with the Diffie-Hellman, DES, Triple DES, PBE,
+ * RC2 and RC5 algorithms.
+ *
+ *
+ * A key specification is a transparent representation of the key
-material that constitutes a key. A key may be specified in an
-algorithm-specific way, or in an algorithm-independent encoding format
-(such as ASN.1). This package contains key specifications for
-Diffie-Hellman public and private keys, as well as key specifications for DES,
-Triple DES, and PBE secret keys.
-
- An algorithm parameter specification is a transparent representation
-of the sets of parameters used with an algorithm. This package contains
-algorithm parameter specifications for parameters used with the
-Diffie-Hellman, DES, Triple DES, PBE, RC2 and RC5 algorithms.
-
-
-
- Licensee impact of JDK 1.4 reflection changes
-
-
-
-Sun's JDK 1.4 contains a new implementation of java.lang.reflect which
-offers substantially higher performance than previous JDKs' native
-code. Licensees can at their discretion port these changes. There are
-no public API or documentation changes associated with the new
-reflection implementation aside from a few minor clarifications in the
-specifications of Method.invoke(), Constructor.newInstance(), and a
-few methods in java.lang.reflect.Field.
-
-
-
-The bulk of the new implementation is Java programming language code
-which generates bytecodes, and is therefore portable. If licensees
-desire to port it, the following JVM changes are required:
-
-
-
-The following changes were discovered to be necessary for backward
-compatibility with certain applications (see bug 4474172):
-
-
-
-The following JVM entry points may be deleted:
-
- Package Specification
+ * Network Transfer Format Specification :
+ * http://jcp.org/en/jsr/detail?id=200
+ *
+ * Related Documentation
+ * For overviews, tutorials, examples, guides, and tool documentation, please
+ * see:
+ *
+ *
+ *
+ *
+ * Package Specification
-Network Transfer Format Specification :
-http://jcp.org/en/jsr/detail?id=200
-
- Related Documentation
-For overviews, tutorials, examples, guides, and tool documentation, please
-see:
-
-
-
-
-
-
-
diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/package-info.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/package-info.java
new file mode 100644
index 00000000000..eb59e238164
--- /dev/null
+++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1999, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes related to creating and configuring secure socket
+ * factories. These classes are used with the Sun reference
+ * implementation of the Java Secure Socket Extension (JSSE).
+ */
+package com.sun.net.ssl;
diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/package.html b/jdk/src/java.base/share/classes/com/sun/net/ssl/package.html
deleted file mode 100644
index 20352c2b117..00000000000
--- a/jdk/src/java.base/share/classes/com/sun/net/ssl/package.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes related to creating and configuring secure socket factories.
-These classes are used with the Sun reference implementation of the Java
-Secure Socket Extension (JSSE).
-
-
-
-
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java b/jdk/src/java.base/share/classes/java/io/package-info.java
similarity index 58%
rename from nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java
rename to jdk/src/java.base/share/classes/java/io/package-info.java
index e1357d6c4c9..cf1b699cd0d 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java
+++ b/jdk/src/java.base/share/classes/java/io/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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
@@ -23,34 +23,27 @@
* questions.
*/
-package jdk.nashorn.internal.runtime;
-
-import jdk.nashorn.api.scripting.JSObject;
-
/**
- * A ListAdapter that can wraps a JSObject.
+ * Provides for system input and output through data streams,
+ * serialization and the file system.
+ *
+ * Unless otherwise noted, passing a null argument to a constructor or
+ * method in any class or interface in this package will cause a
+ * {@code NullPointerException} to be thrown.
+ *
+ * Package Specification
+ *
+ *
+ * Related Documentation
+ *
+ * For overviews, tutorials, examples, guides, and tool documentation,
+ * please see:
+ *
+ *
+ *
+ * @since 1.0
*/
-public final class JSObjectListAdapter extends ListAdapter {
- /**
- * Creates a new list wrapper for the specified JSObject.
- * @param obj JSOcript the object to wrap
- */
- public JSObjectListAdapter(final JSObject obj) {
- super(obj);
- }
-
- @Override
- public int size() {
- return JSType.toInt32(((JSObject)obj).getMember("length"));
- }
-
- @Override
- protected Object getAt(final int index) {
- return ((JSObject)obj).getSlot(index);
- }
-
- @Override
- protected void setAt(final int index, final Object element) {
- ((JSObject)obj).setSlot(index, element);
- }
-}
+package java.io;
diff --git a/jdk/src/java.base/share/classes/java/io/package.html b/jdk/src/java.base/share/classes/java/io/package.html
deleted file mode 100644
index 5d80e56da9d..00000000000
--- a/jdk/src/java.base/share/classes/java/io/package.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-Provides for system input and output through data streams,
-serialization and the file system.
-
-Unless otherwise noted, passing a null argument to a constructor
-or method in any class or interface in this package will cause a
-NullPointerException to be thrown.
-
-Package Specification
-
-
-Related Documentation
-
-For overviews, tutorials, examples, guides, and tool documentation,
-please see:
-
-
-@since 1.0
-
-
diff --git a/jdk/src/java.base/share/classes/java/lang/ref/package-info.java b/jdk/src/java.base/share/classes/java/lang/ref/package-info.java
new file mode 100644
index 00000000000..a6273a92183
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/lang/ref/package-info.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 1998, 2003, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides reference-object classes, which support a limited degree
+ * of interaction with the garbage collector. A program may use a
+ * reference object to maintain a reference to some other object in
+ * such a way that the latter object may still be reclaimed by the
+ * collector. A program may also arrange to be notified some time
+ * after the collector has determined that the reachability of a given
+ * object has changed.
+ *
+ *Package Specification
+ *
+ * A reference object encapsulates a reference to some other
+ * object so that the reference itself may be examined and manipulated
+ * like any other object. Three types of reference objects are
+ * provided, each weaker than the last: soft, weak,
+ * and phantom. Each type corresponds to a different level
+ * of reachability, as defined below. Soft references are for
+ * implementing memory-sensitive caches, weak references are for
+ * implementing canonicalizing mappings that do not prevent their keys
+ * (or values) from being reclaimed, and phantom references are for
+ * scheduling pre-mortem cleanup actions in a more flexible way than
+ * is possible with the Java finalization mechanism.
+ *
+ * Notification
+ *
+ * A program may request to be notified of changes in an object's
+ * reachability by registering an appropriate reference
+ * object with a reference queue at the time the reference
+ * object is created. Some time after the garbage collector
+ * determines that the reachability of the referent has changed to the
+ * value corresponding to the type of the reference, it will add the
+ * reference to the associated queue. At this point, the reference is
+ * considered to be enqueued. The program may remove
+ * references from a queue either by polling or by blocking until a
+ * reference becomes available. Reference queues are implemented by
+ * the {@link java.lang.ref.ReferenceQueue} class.
+ *
+ * Automatically-cleared references
+ *
+ * Soft and weak references are automatically cleared by the collector
+ * before being added to the queues with which they are registered, if
+ * any. Therefore soft and weak references need not be registered
+ * with a queue in order to be useful, while phantom references do.
+ * An object that is reachable via phantom references will remain so
+ * until all such references are cleared or themselves become
+ * unreachable.
+ *
+ *
+ * Reachability
+ *
+ * Going from strongest to weakest, the different levels of
+ * reachability reflect the life cycle of an object. They are
+ * operationally defined as follows:
+ *
+ *
+ *
+ *
+ *
+ * @author Mark Reinhold
+ * @since 1.2
+ */
+package java.lang.ref;
diff --git a/jdk/src/java.base/share/classes/java/lang/ref/package.html b/jdk/src/java.base/share/classes/java/lang/ref/package.html
deleted file mode 100644
index f22a455f6ac..00000000000
--- a/jdk/src/java.base/share/classes/java/lang/ref/package.html
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-Provides reference-object classes, which support a limited degree of
-interaction with the garbage collector. A program may use a reference object
-to maintain a reference to some other object in such a way that the latter
-object may still be reclaimed by the collector. A program may also arrange to
-be notified some time after the collector has determined that the reachability
-of a given object has changed.
-
-
-Package Specification
-
-A reference object encapsulates a reference to some other object so
-that the reference itself may be examined and manipulated like any other
-object. Three types of reference objects are provided, each weaker than the
-last: soft, weak, and phantom. Each type
-corresponds to a different level of reachability, as defined below. Soft
-references are for implementing memory-sensitive caches, weak references are
-for implementing canonicalizing mappings that do not prevent their keys (or
-values) from being reclaimed, and phantom references are for scheduling
-pre-mortem cleanup actions in a more flexible way than is possible with the
-Java finalization mechanism.
-
-{@link java.lang.ref.Reference} class. An instance of one of
-these subclasses encapsulates a single reference to a particular object, called
-the referent. Every reference object provides methods for getting and
-clearing the reference. Aside from the clearing operation reference objects
-are otherwise immutable, so no set operation is provided. A
-program may further subclass these subclasses, adding whatever fields and
-methods are required for its purposes, or it may use these subclasses without
-change.
-
-
-Notification
-
-A program may request to be notified of changes in an object's reachability by
-registering an appropriate reference object with a reference
-queue at the time the reference object is created. Some time after the
-garbage collector determines that the reachability of the referent has changed
-to the value corresponding to the type of the reference, it will add the
-reference to the associated queue. At this point, the reference is considered
-to be enqueued. The program may remove references from a queue either
-by polling or by blocking until a reference becomes available. Reference
-queues are implemented by the {@link java.lang.ref.ReferenceQueue}
-class.
-
-{@link
-java.util.WeakHashMap} class works. Because the {@link
-java.lang.ref.ReferenceQueue#poll ReferenceQueue.poll} method simply
-checks an internal data structure, this check will add little overhead to the
-hashtable access methods.
-
-
-Automatically-cleared references
-
-Soft and weak references are automatically cleared by the collector before
-being added to the queues with which they are registered, if any. Therefore
-soft and weak references need not be registered with a queue in order to be
-useful, while phantom references do. An object that is reachable via phantom
-references will remain so until all such references are cleared or themselves
-become unreachable.
-
-
-
-Reachability
-
-Going from strongest to weakest, the different levels of reachability reflect
-the life cycle of an object. They are operationally defined as follows:
-
-
-
-
-
-
-@author Mark Reinhold
-@since 1.2
-
-
-
-
diff --git a/jdk/src/java.base/share/classes/java/math/BigDecimal.java b/jdk/src/java.base/share/classes/java/math/BigDecimal.java
index 2afd6e3b7a2..44d7a9f65f6 100644
--- a/jdk/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/jdk/src/java.base/share/classes/java/math/BigDecimal.java
@@ -5176,7 +5176,7 @@ public class BigDecimal extends Number implements Comparable
+ *
+ *
+ *
Class name Description {@link java.nio.charset.Charset}
+ * A named mapping between characters
and bytes{@link java.nio.charset.CharsetDecoder}
+ * Decodes bytes into characters {@link java.nio.charset.CharsetEncoder}
+ * Encodes characters into bytes {@link java.nio.charset.CoderResult}
+ * Describes coder results {@link java.nio.charset.CodingErrorAction}
+ * Describes actions to take when
coding errors are detected
-
-
-
{@link java.nio.charset.Charset}
- A named mapping between characters
and bytes{@link java.nio.charset.CharsetDecoder}
- Decodes bytes into characters {@link java.nio.charset.CharsetEncoder}
- Encodes characters into bytes {@link java.nio.charset.CoderResult}
- Describes coder results {@link java.nio.charset.CodingErrorAction}
- Describes actions to take when
coding errors are detected
+ *
+ *
+ *
+ *
which
+ * translate between bytes and Unicode characters;
to entities
+ * capable of performing I/O operations; and
selectable channels define a multiplexed,
+ * non-blocking
I/O facility.
+ *
+ *
+ *
Buffers Description {@link java.nio.Buffer}
+ * Position, limit, and capacity;
+ *
clear, flip, rewind, and mark/reset {@link java.nio.ByteBuffer}
+ * Get/put, compact, views; allocate, wrap {@link java.nio.MappedByteBuffer}
+ * A byte buffer mapped to a file {@link java.nio.CharBuffer}
+ * Get/put, compact; allocate, wrap {@link java.nio.DoubleBuffer}
+ * ' ' {@link java.nio.FloatBuffer}
+ * ' ' {@link java.nio.IntBuffer}
+ * ' ' {@link java.nio.LongBuffer}
+ * ' ' {@link java.nio.ShortBuffer}
+ * ' ' {@link java.nio.ByteOrder}
+ * Typesafe enumeration for byte orders
+ *
+ *
+ *
+ *
-
-
-
-
which translate between
- bytes and Unicode characters;
to entities capable of
- performing I/O operations; and
- selectable channels define a multiplexed, non-blocking
- I/O facility.
-
-
-
{@link java.nio.Buffer}
- Position, limit, and capacity;
-
clear, flip, rewind, and mark/reset {@link java.nio.ByteBuffer}
- Get/put, compact, views; allocate, wrap {@link java.nio.MappedByteBuffer}
- A byte buffer mapped to a file {@link java.nio.CharBuffer}
- Get/put, compact; allocate, wrap {@link java.nio.DoubleBuffer}
- ' ' {@link java.nio.FloatBuffer}
- ' ' {@link java.nio.IntBuffer}
- ' ' {@link java.nio.LongBuffer}
- ' ' {@link java.nio.ShortBuffer}
- ' ' {@link java.nio.ByteOrder}
- Typesafe enumeration for byte orders
-
-
-
-attribute is null.
- * @exception IllegalArgumentException if beginIndex is less then 0, endIndex is
+ * @exception IllegalArgumentException if beginIndex is less than 0, endIndex is
* greater than the length of the string, or beginIndex and endIndex together don't
* define a non-empty subrange of the string.
*/
@@ -357,7 +357,7 @@ public class AttributedString {
* @param endIndex Index of the character following the last
* character of the range.
* @exception NullPointerException if attributes is null.
- * @exception IllegalArgumentException if beginIndex is less then
+ * @exception IllegalArgumentException if beginIndex is less than
* 0, endIndex is greater than the length of the string, or
* beginIndex and endIndex together don't define a non-empty
* subrange of the string and the attributes parameter is not an
@@ -580,7 +580,7 @@ public class AttributedString {
* @param beginIndex the index of the first character
* @param endIndex the index of the character following the last character
* @return an iterator providing access to the text and its attributes
- * @exception IllegalArgumentException if beginIndex is less then 0,
+ * @exception IllegalArgumentException if beginIndex is less than 0,
* endIndex is greater than the length of the string, or beginIndex is
* greater than endIndex.
*/
diff --git a/jdk/src/java.base/share/classes/java/text/package-info.java b/jdk/src/java.base/share/classes/java/text/package-info.java
new file mode 100644
index 00000000000..b4c411844bd
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/text/package-info.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1998, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes and interfaces for handling text, dates, numbers,
+ * and messages in a manner independent of natural languages. This
+ * means your main application or applet can be written to be
+ * language-independent, and it can rely upon separate,
+ * dynamically-linked localized resources. This allows the flexibility
+ * of adding localizations for new localizations at any time.
+ *
+ *
+ *
+ *
+ * @since 1.1
+ */
+package java.text;
diff --git a/jdk/src/java.base/share/classes/java/text/package.html b/jdk/src/java.base/share/classes/java/text/package.html
deleted file mode 100644
index 3e9e51f15c7..00000000000
--- a/jdk/src/java.base/share/classes/java/text/package.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes and interfaces for handling text, dates, numbers, and messages
-in a manner independent of natural languages. This means your main application
-or applet can be written to be language-independent, and it can rely upon
-separate, dynamically-linked localized resources. This allows the flexibility
-of adding localizations for new localizations at any time.
-
-
-
-
-@since 1.1
-
-
diff --git a/jdk/src/java.base/share/classes/java/text/spi/package-info.java b/jdk/src/java.base/share/classes/java/text/spi/package-info.java
new file mode 100644
index 00000000000..3b8fa8bc9a1
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/text/spi/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2005, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Service provider classes for the classes in the java.text package.
+ *
+ * @since 1.6
+ */
+package java.text.spi;
diff --git a/jdk/src/java.base/share/classes/java/text/spi/package.html b/jdk/src/java.base/share/classes/java/text/spi/package.html
deleted file mode 100644
index fa08ec1fb35..00000000000
--- a/jdk/src/java.base/share/classes/java/text/spi/package.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-Service provider classes for the classes in the java.text package.
-
-
-@since 1.6
-
-
diff --git a/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
index 3dbbec5c0a4..ebe4e8a29d4 100644
--- a/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
+++ b/jdk/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
@@ -490,6 +490,16 @@ public final class HijrahChronology extends AbstractChronology implements Serial
return yearOfEra;
}
+ /**
+ * Creates the HijrahEra object from the numeric value.
+ * The Hijrah calendar system has only one era covering the
+ * proleptic years greater than zero.
+ * This method returns the singleton HijrahEra for the value 1.
+ *
+ * @param eraValue the era value
+ * @return the calendar system era, not null
+ * @throws DateTimeException if unable to create the era
+ */
@Override
public HijrahEra eraOf(int eraValue) {
switch (eraValue) {
diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
index 4a5a53cd83c..32e17093c68 100644
--- a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
+++ b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. 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
@@ -1333,8 +1333,8 @@ public final class DateTimeFormatter {
* If the time '23:59:60' is received, then a simple conversion is applied,
* replacing the second-of-minute of 60 with 59. This query can be used
* on the parse result to determine if the leap-second adjustment was made.
- * The query will return one second of excess if it did adjust to remove
- * the leap-second, and zero if not. Note that applying a leap-second
+ * The query will return {@code true} if it did adjust to remove the
+ * leap-second, and {@code false} if not. Note that applying a leap-second
* smoothing mechanism, such as UTC-SLS, is the responsibility of the
* application, as follows:
*
diff --git a/jdk/src/java.base/share/classes/java/time/package-info.java b/jdk/src/java.base/share/classes/java/time/package-info.java
index cea222126f1..f078a08306d 100644
--- a/jdk/src/java.base/share/classes/java/time/package-info.java
+++ b/jdk/src/java.base/share/classes/java/time/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. 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
@@ -120,9 +120,10 @@
*
*
Duration and Period
* Additional value types
diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
index a075da67d1c..0d983e52f96 100644
--- a/jdk/src/java.base/share/classes/java/util/Properties.java
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java
@@ -73,8 +73,7 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
* Unicode escapes as defined in section 3.3 of
* The Java™ Language Specification;
* only a single 'u' character is allowed in an escape
- * sequence. The native2ascii tool can be used to convert property files to and
- * from other character encodings.
+ * sequence.
*
* Package Specification
+ *
+ * The java.util.jar package is based on the following
+ * specifications:
+ *
+ *
+ *
+ *
+ * @since 1.2
+ */
+package java.util.jar;
diff --git a/jdk/src/java.base/share/classes/java/util/jar/package.html b/jdk/src/java.base/share/classes/java/util/jar/package.html
deleted file mode 100644
index 5c3a366122c..00000000000
--- a/jdk/src/java.base/share/classes/java/util/jar/package.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes for reading and writing the JAR (Java ARchive) file
-format, which is based on the standard ZIP file format with an
-optional manifest file. The manifest stores meta-information about the
-JAR file contents and is also used for signing JAR files.
-
-
-Package Specification
-
-The java.util.jar package is based on the following specifications:
-
-
-
-
-
-@since 1.2
-
-
diff --git a/jdk/src/java.base/share/classes/java/util/package-info.java b/jdk/src/java.base/share/classes/java/util/package-info.java
new file mode 100644
index 00000000000..ab706e0d179
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/util/package-info.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1998, 2006, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Contains the collections framework, legacy collection classes,
+ * event model, date and time facilities, internationalization, and
+ * miscellaneous utility classes (a string tokenizer, a random-number
+ * generator, and a bit array).
+ *
+ * Package Specification
+ *
+ *
+ * Related Documentation
+ * For overviews, tutorials, examples, guides, and tool documentation,
+ * please see:
+ *
+ *
+ * @since 1.0
+ */
+package java.util;
diff --git a/jdk/src/java.base/share/classes/java/util/package.html b/jdk/src/java.base/share/classes/java/util/package.html
deleted file mode 100644
index eb77a146b0f..00000000000
--- a/jdk/src/java.base/share/classes/java/util/package.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-Contains the collections framework, legacy collection classes, event model,
-date and time facilities, internationalization, and miscellaneous utility
-classes (a string tokenizer, a random-number generator, and a bit array).
-
-Package Specification
-
-
-Related Documentation
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-
-
-@since 1.0
-
-
diff --git a/jdk/src/java.base/share/classes/java/util/regex/package-info.java b/jdk/src/java.base/share/classes/java/util/regex/package-info.java
new file mode 100644
index 00000000000..2907f10c003
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/util/regex/package-info.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Classes for matching character sequences against patterns specified
+ * by regular expressions.
+ *
+ * Related Documentation
+ *
+ * Related Documentation
-
-Key classes for
+ * hardware devices, please refer to the cryptographic provider
+ * developer guide:
+ *
+ * Package Specification
+ *
+ *
+ *
+ *
+ * Related Documentation
+ *
+ * For further documentation, please see:
+ *
+ *
+ * @since 1.4
+ */
+package javax.crypto.interfaces;
diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html b/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
deleted file mode 100644
index c43000e80a7..00000000000
--- a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-Provides interfaces for Diffie-Hellman keys as defined in
-RSA Laboratories' PKCS #3.
-Key classes
-for hardware devices, please refer to the
-cryptographic provider developer guide:
-Package Specification
-
-
-
-
-Related Documentation
-
-For further documentation, please see:
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/crypto/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/package-info.java
new file mode 100644
index 00000000000..754b5f643c8
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/crypto/package-info.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides the classes and interfaces for cryptographic
+ * operations. The cryptographic operations defined in this package
+ * include encryption, key generation and key agreement, and Message
+ * Authentication Code (MAC) generation.
+ *
+ * Related Documentation
+ *
+ * For further documentation, please see:
+ *
+ *
+ *
+ * @since 1.4
+ */
+package javax.crypto;
diff --git a/jdk/src/java.base/share/classes/javax/crypto/package.html b/jdk/src/java.base/share/classes/javax/crypto/package.html
deleted file mode 100644
index c1d46ff528c..00000000000
--- a/jdk/src/java.base/share/classes/javax/crypto/package.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-Provides the classes and interfaces for cryptographic operations. The
-cryptographic operations defined in this package include encryption,
-key generation and key agreement, and Message Authentication Code
-(MAC) generation.
-
-Package Specification
-
-
-
-Related Documentation
-
-For further documentation, please see:
-
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java
new file mode 100644
index 00000000000..a9b4589321e
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes and interfaces for key specifications and
+ * algorithm parameter specifications.
+ *
+ *
+ *
+ *
+ * Related Documentation
+ *
+ * For documentation that includes information about algorithm
+ * parameter and key specifications, please see:
+ *
+ *
+ *
+ *
+ * @since 1.4
+ */
+package javax.crypto.spec;
diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/package.html b/jdk/src/java.base/share/classes/javax/crypto/spec/package.html
deleted file mode 100644
index 7f563fbb372..00000000000
--- a/jdk/src/java.base/share/classes/javax/crypto/spec/package.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-Provides classes and interfaces for key specifications and algorithm
-parameter specifications.
-
-Package Specification
-
-
-
-
-Related Documentation
-
-For documentation that includes information about algorithm parameter
-and key specifications, please see:
-
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/net/package-info.java b/jdk/src/java.base/share/classes/javax/net/package-info.java
new file mode 100644
index 00000000000..71de9e40091
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/net/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 1999, 2001, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes for networking applications. These classes include
+ * factories for creating sockets. Using socket factories you can
+ * encapsulate socket creation and configuration behavior.
+ *
+ * @since 1.4
+ */
+package javax.net;
diff --git a/jdk/src/java.base/share/classes/javax/net/package.html b/jdk/src/java.base/share/classes/javax/net/package.html
deleted file mode 100644
index 35845a1830a..00000000000
--- a/jdk/src/java.base/share/classes/javax/net/package.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes for networking applications. These classes include
-factories for creating sockets. Using socket factories you can encapsulate
-socket creation and configuration behavior.
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java b/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java
new file mode 100644
index 00000000000..9fd6868587e
--- /dev/null
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/package-info.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes for the secure socket package. Using the secure
+ * socket classes, you can communicate using SSL or a related security
+ * protocol to reliably detect any errors introduced into the network
+ * byte stream and to optionally encrypt the data and/or authenticate
+ * the communicating peers.
+ *
+ *
+ *
+ * @since 1.4
+ */
+package javax.net.ssl;
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/package.html b/jdk/src/java.base/share/classes/javax/net/ssl/package.html
deleted file mode 100644
index d75e1d397a0..00000000000
--- a/jdk/src/java.base/share/classes/javax/net/ssl/package.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-Provides classes for the secure socket package. Using the secure socket
-classes, you can communicate using SSL or a related security protocol
-to reliably detect any errors introduced into the network byte stream
-and to optionally encrypt the data and/or authenticate the communicating peers.
-
-Package Specification
-
-
-
-
-
-@since 1.4
-
-
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
index 57115f2139d..eb2c5f7028e 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
@@ -162,8 +162,8 @@ public abstract class Parser {
* Possible character type values are:
- 0 for underscore ('_') or any
* lower and upper case alphabetical character value;
- 1 for colon
* (':') character;
- 2 for dash ('-') and dot ('.') or any decimal
- * digit character value;
- 3 for any kind of white space character
An ASCII (7 bit) character which does not fall in any category listed
+ * digit character value;
- 3 for any kind of white space character
+ * An ASCII (7 bit) character which does not fall in any category listed
* above is mapped to 0xff.
*/
private static final byte nmttyp[];
diff --git a/jdk/src/java.base/share/classes/sun/reflect/package.html b/jdk/src/java.base/share/classes/sun/reflect/package.html
deleted file mode 100644
index 18ff61624bb..00000000000
--- a/jdk/src/java.base/share/classes/sun/reflect/package.html
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-The first three return the declared constructors, fields, and methods
-for a given class, with an option to return only the public ones. They
-are similar in functionality to the earlier GetClassConstructors,
-GetClassFields, and GetClassMethods. JVM_GetClassDeclaredFields and
-JVM_GetClassDeclaredMethods must intern the Strings for the names of
-the Field and Method objects returned. The fouth returns the access
-flags for a given class as marked in the class file, as opposed to in
-the InnerClasses attribute if the class is an inner class, and
-therefore differs from JVM_GetClassModifiers for inner classes (most
-importantly, protected inner classes; see 4471811.)
-
-
-
-
-
-
-
-
-
- -To keep using the previous reflection implementation, licensees should -not take changes from Sun's JDK 1.4 relating specifically to the -implementation of reflection in the following classes/methods and -any associated native code: - -
@@ -2282,10 +2243,6 @@ public class PolicyFile extends java.security.Policy {
// Stores grant entries in the policy
final List
+ *
- * Characters in
+ *
* The corbaname URL is parsed into two parts: a corbaloc URL and a COS name.
- * The corbaloc URL is constructed by concatenation "corbaloc:" with
- *
+ * The corbaloc URL is constructed by concatenation {@code "corbaloc:"} with
+ * {@code
* A corbaname URL is resolved by:
- *
* This method effective does the following:
- *
- * Methods in the interfaces {@link ResultSet},
* {@link CallableStatement}, and {@link PreparedStatement}, such as
- *
- * All methods on the
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * After The The {@code Clob} interface provides methods for getting the
+ * length of an SQL {@code CLOB} (Character Large Object) value,
+ * for materializing a {@code CLOB} value on the client, and for
+ * searching for a substring or {@code CLOB} object within a
+ * {@code CLOB} value.
* Methods in the interfaces {@link ResultSet},
* {@link CallableStatement}, and {@link PreparedStatement}, such as
- *
- * All methods on the
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * Note: If the value specified for
- * After
+
@since 1.4
{@code
* corbaname url = "corbaname:"
+ * Characters in {@code {@code
* ; / : ? @ & = + $ , - _ . ! ~ * ; ( )
+ * }
* Escaped characters is escaped by using a % followed by its 2 hexadecimal
* numbers representing the octet.
- *
- *
*
* @author Rosanna Lee
*/
diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
index d6ed5fd71fd..a51d6a4880c 100644
--- a/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
+++ b/jdk/src/java.corba/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
@@ -38,6 +38,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
*
* The format of an iiopname URL is defined in INS 98-10-11 as follows:
*
+ *
+ *
+ * }
+ * {@code
* nctx = ORB.string_to_object(corbalocUrl);
- *
* iiopname url = "iiopname://" [addr_list]["/" string_name]
* addr_list = [address ","]* address
* address = [version host [":" port]]
@@ -46,19 +47,23 @@ import com.sun.jndi.toolkit.url.UrlUtil;
* port = number
* major = number
* minor = number
- * string_name = stringified name | empty_string
+ * string_name = stringified name | empty_string
+ *
*
* The default port is 9999. The default version is "1.0"
* US-ASCII alphanumeric characters are not escaped. Any characters outside
* of this range are escaped except for the following:
+ * {@code
* ; / : ? : @ & = + $ , - _ . ! ~ * ' ( )
+ * }
* Escaped characters is escaped by using a % followed by its 2 hexadecimal
* numbers representing the octet.
*
* For backward compatibility, the "iiop" URL as defined in INS 97-6-6
* is also supported:
- *
+ * {@code
* iiop url = "iiop://" [host [":" port]] ["/" string_name]
+ * }
* The default port is 900.
*
* @author Rosanna Lee
diff --git a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
index 3802f5f106c..2fa43bca79e 100644
--- a/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
+++ b/jdk/src/java.corba/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
@@ -56,7 +56,7 @@ public class CorbaUtils {
* object by using the javax.rmi.CORBA package.
*
+ *
*
* @param remoteObj The non-null remote object for
* @param orb The non-null ORB to connect the remote object to
diff --git a/jdk/src/java.management/share/classes/sun/management/Agent.java b/jdk/src/java.management/share/classes/sun/management/Agent.java
index ffb3105255e..e0b781dc71c 100644
--- a/jdk/src/java.management/share/classes/sun/management/Agent.java
+++ b/jdk/src/java.management/share/classes/sun/management/Agent.java
@@ -345,6 +345,7 @@ public class Agent {
if (jmxServer != null) {
ConnectorBootstrap.unexportRegistry();
+ ConnectorAddressLink.unexportRemote();
// Attempt to stop already stopped agent
// Don't cause any errors.
diff --git a/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
index 893f11c1f46..4ec5ec799cc 100644
--- a/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
+++ b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. 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
@@ -27,6 +27,7 @@ package sun.management;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -45,9 +46,26 @@ import sun.management.counter.perf.PerfInstrumentation;
* @since 1.5
*/
public class ConnectorAddressLink {
+ /**
+ * A simple wrapper for the perf-counter backing {@linkplain ByteBuffer}
+ */
+ private static final class PerfHandle {
+ private ByteBuffer bb;
+
+ private PerfHandle(ByteBuffer bb) {
+ this.bb = bb.order(ByteOrder.nativeOrder());
+ }
+
+ private void putLong(long l) {
+ this.bb = bb.clear();
+ this.bb.asLongBuffer().put(l);
+ }
+ }
private static final String CONNECTOR_ADDRESS_COUNTER =
"sun.management.JMXConnectorServer.address";
+ private static final String REMOTE_CONNECTOR_STATE_COUNTER =
+ "sun.management.JMXConnectorServer.remote.enabled";
/*
* The format of the jvmstat counters representing the properties of
@@ -78,7 +96,9 @@ public class ConnectorAddressLink {
* JMX remote connector counter (it will be incremented every
* time a new out-of-the-box JMX remote connector is created).
*/
- private static AtomicInteger counter = new AtomicInteger();
+ private static final AtomicInteger counter = new AtomicInteger();
+
+ private static PerfHandle remotePerfHandle = null;
/**
* Exports the specified connector address to the instrumentation buffer
@@ -93,7 +113,17 @@ public class ConnectorAddressLink {
}
Perf perf = Perf.getPerf();
perf.createString(
- CONNECTOR_ADDRESS_COUNTER, 1, Units.STRING.intValue(), address);
+ CONNECTOR_ADDRESS_COUNTER, 1, Units.STRING.intValue(), address);
+ }
+
+ public static void unexportRemote() {
+ unexport(remotePerfHandle);
+ }
+
+ private static void unexport(PerfHandle ph) {
+ if (ph != null) {
+ ph.putLong(-1L);
+ }
}
/**
@@ -143,6 +173,13 @@ public class ConnectorAddressLink {
perf.createString(REMOTE_CONNECTOR_COUNTER_PREFIX + index + "." +
entry.getKey(), 1, Units.STRING.intValue(), entry.getValue());
}
+ if (remotePerfHandle != null) {
+ remotePerfHandle.putLong(index);
+ } else {
+ remotePerfHandle = new PerfHandle(
+ perf.createLong(REMOTE_CONNECTOR_STATE_COUNTER, 1, Units.NONE.intValue(), (long)index)
+ );
+ }
}
/**
diff --git a/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java b/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
index 63dfcfb166e..1e93cb88a32 100644
--- a/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
+++ b/jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
@@ -1013,7 +1013,6 @@ class WindowsPreferences extends AbstractPreferences {
* description of the encoding algorithm.
*/
private static String toJavaValueString(byte[] windowsNameArray) {
- // Use modified native2ascii algorithm
String windowsName = byteArrayToString(windowsNameArray);
StringBuilder javaName = new StringBuilder();
char ch;
@@ -1055,8 +1054,7 @@ class WindowsPreferences extends AbstractPreferences {
* Encoding algorithm adds "/" character to capital letters, i.e.
* "A" is encoded as "/A". Character '\' is encoded as '//',
* '/' is encoded as '\'.
- * Then encoding scheme similar to jdk's native2ascii converter is used
- * to convert java string to a byte array of ASCII characters.
+ * Then convert java string to a byte array of ASCII characters.
*/
private static byte[] toWindowsValueString(String javaName) {
StringBuilder windowsName = new StringBuilder();
diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
index 5d04247df99..c090b308d4c 100644
--- a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
+++ b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngine.java
@@ -132,7 +132,9 @@ public interface ScriptEngine {
*
* @return The value returned from the execution of the script.
*
- * @throws ScriptException if an error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ *
* java.lang.Object stub;
* try {
* stub = PortableRemoteObject.toStub(remoteObj);
@@ -72,6 +72,7 @@ public class CorbaUtils {
* // ignore 'already connected' error
* }
* return (javax.rmi.CORBA.Stub)stub;
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if either argument is null.
*/
public Object eval(Reader reader , ScriptContext context) throws ScriptException;
@@ -145,7 +147,9 @@ public interface ScriptEngine {
*
* @return The value returned from the execution of the script.
*
- * @throws ScriptException if error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if the argument is null.
*/
public Object eval(String script) throws ScriptException;
@@ -158,7 +162,9 @@ public interface ScriptEngine {
*
* @return The value returned by the script.
*
- * @throws ScriptException if an error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if the argument is null.
*/
public Object eval(Reader reader) throws ScriptException;
@@ -177,7 +183,9 @@ public interface ScriptEngine {
*
* @return The value returned by the script.
*
- * @throws ScriptException if an error occurs in script.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if either argument is null.
*/
public Object eval(String script, Bindings n) throws ScriptException;
@@ -191,7 +199,9 @@ public interface ScriptEngine {
*
* @return The value returned by the script.
*
- * @throws ScriptException if an error occurs.
+ * @throws ScriptException if an error occurs in script. ScriptEngines should create and throw
+ * ScriptException wrappers for checked Exceptions thrown by underlying scripting
+ * implementations.
* @throws NullPointerException if either argument is null.
*/
public Object eval(Reader reader , Bindings n) throws ScriptException;
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
index 1fbb7a1de0b..262debcaf40 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
@@ -85,7 +85,7 @@ public class Krb5AcceptCredential
if (creds == null)
throw new GSSException(GSSException.NO_CRED, -1,
- "Failed to find any Kerberos credentails");
+ "Failed to find any Kerberos credentials");
if (name == null) {
String fullName = creds.getName();
diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
index f2f74ab5c67..395738095a7 100644
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java
@@ -110,8 +110,10 @@ public class Config {
* java.security.krb5.kdc not specified, error reading configuration file.
*/
- public static synchronized void refresh() throws KrbException {
- singleton = new Config();
+ public static void refresh() throws KrbException {
+ synchronized (Config.class) {
+ singleton = new Config();
+ }
KdcComm.initStatic();
EType.initStatic();
Checksum.initStatic();
diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
index 8fb0b5be9e2..a97a27244af 100644
--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
@@ -1059,7 +1059,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* (acceptChanges) or population. This method may also be called
* while performing updates to the insert row.
* undoUpdateTINYINT, SMALLINT, INTEGER
- * BIGINT, REAL, FLOAT, DOUBLE, DECIMAL, NUMERIC, BIT, CHAR,
- * VARCHAR or LONGVARCHAR< value. The bold SQL type
- * designates the recommended return type.
+ * column does not store an SQL {@code TINYINT, SMALLINT, INTEGER
+ * BIGINT, REAL, FLOAT, DOUBLE, DECIMAL, NUMERIC, BIT, }
+ * {@code CHAR, VARCHAR} or
+ * {@code LONGVARCHAR} value.
+ * The bold SQL type designates the recommended return type.
*/
public String getString(String columnName) throws SQLException {
return getString(getColIdxByName(columnName));
@@ -7748,7 +7749,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* Updates the designated column with a RowId value. The updater
* methods are used to update column values in the current row or the insert
* row. The updater methods do not update the underlying database; instead
- * the updateRow or insertRow methods are called
+ * the {@code updateRow} or {@code insertRow} methods are called
* to update the database.
*
* @param columnIndex the first column is 1, the second 2, ...
@@ -7764,7 +7765,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* Updates the designated column with a RowId value. The updater
* methods are used to update column values in the current row or the insert
* row. The updater methods do not update the underlying database; instead
- * the updateRow or insertRow methods are called
+ * the {@code updateRow} or {@code insertRow} methods are called
* to update the database.
*
* @param columnName the name of the column
diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
index 79c3e78fc00..a3979499f28 100644
--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
@@ -182,7 +182,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable {
private CachedRowSetImpl crsResolve;
/**
- * This ArrayList will hold the values of SyncResolver.*
+ * This {@code ArrayList} will hold the values of SyncResolver.*
*/
private ArrayListBLOB value. An SQL BLOB is a built-in type
+ * the Java™ programming language of an SQL
+ * {@code BLOB} value. An SQL {@code BLOB} is a built-in type
* that stores a Binary Large Object as a column value in a row of
- * a database table. By default drivers implement Blob using
- * an SQL locator(BLOB), which means that a
- * Blob object contains a logical pointer to the
- * SQL BLOB data rather than the data itself.
- * A Blob object is valid for the duration of the
+ * a database table. By default drivers implement {@code Blob} using
+ * an SQL {@code locator(BLOB)}, which means that a
+ * {@code Blob} object contains a logical pointer to the
+ * SQL {@code BLOB} data rather than the data itself.
+ * A {@code Blob} object is valid for the duration of the
* transaction in which is was created.
*
* getBlob and setBlob allow a programmer to
- * access an SQL BLOB value.
- * The Blob interface provides methods for getting the
- * length of an SQL BLOB (Binary Large Object) value,
- * for materializing a BLOB value on the client, and for
+ * {@code getBlob} and {@code setBlob} allow a programmer to
+ * access an SQL {@code BLOB} value.
+ * The {@code Blob} interface provides methods for getting the
+ * length of an SQL {@code BLOB} (Binary Large Object) value,
+ * for materializing a {@code BLOB} value on the client, and for
* determining the position of a pattern of bytes within a
- * BLOB value. In addition, this interface has methods for updating
- * a BLOB value.
+ * {@code BLOB} value. In addition, this interface has methods for updating
+ * a {@code BLOB} value.
* Blob interface must be fully implemented if the
+ * All methods on the {@code Blob} interface must be fully implemented if the
* JDBC driver supports the data type.
*
* @since 1.2
@@ -60,51 +59,52 @@ import java.io.InputStream;
public interface Blob {
/**
- * Returns the number of bytes in the BLOB value
- * designated by this Blob object.
- * @return length of the BLOB in bytes
+ * Returns the number of bytes in the {@code BLOB} value
+ * designated by this {@code Blob} object.
+ *
+ * @return length of the {@code BLOB} in bytes
* @exception SQLException if there is an error accessing the
- * length of the BLOB
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * length of the {@code BLOB}
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long length() throws SQLException;
/**
- * Retrieves all or part of the BLOB
- * value that this Blob object represents, as an array of
- * bytes. This byte array contains up to length
- * consecutive bytes starting at position pos.
+ * Retrieves all or part of the {@code BLOB}
+ * value that this {@code Blob} object represents, as an array of
+ * bytes. This {@code byte} array contains up to {@code length}
+ * consecutive bytes starting at position {@code pos}.
*
* @param pos the ordinal position of the first byte in the
- * BLOB value to be extracted; the first byte is at
+ * {@code BLOB} value to be extracted; the first byte is at
* position 1
* @param length the number of consecutive bytes to be copied; the value
- * for length must be 0 or greater
- * @return a byte array containing up to length
- * consecutive bytes from the BLOB value designated
- * by this Blob object, starting with the
- * byte at position pos
+ * for length must be 0 or greater
+ * @return a byte array containing up to {@code length}
+ * consecutive bytes from the {@code BLOB} value designated
+ * by this {@code Blob} object, starting with the
+ * byte at position {@code pos}
* @exception SQLException if there is an error accessing the
- * BLOB value; if pos is less than 1 or length is
- * less than 0
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value; if pos is less than 1 or length is
+ * less than 0
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setBytes
* @since 1.2
*/
byte[] getBytes(long pos, int length) throws SQLException;
/**
- * Retrieves the BLOB value designated by this
- * Blob instance as a stream.
+ * Retrieves the {@code BLOB} value designated by this
+ * {@code Blob} instance as a stream.
*
- * @return a stream containing the BLOB data
+ * @return a stream containing the {@code BLOB} data
* @exception SQLException if there is an error accessing the
- * BLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setBinaryStream
* @since 1.2
*/
@@ -112,38 +112,38 @@ public interface Blob {
/**
* Retrieves the byte position at which the specified byte array
- * pattern begins within the BLOB
- * value that this Blob object represents. The
- * search for pattern begins at position
- * start.
+ * {@code pattern} begins within the {@code BLOB}
+ * value that this {@code Blob} object represents.
+ * The search for {@code pattern} begins at position
+ * {@code start}.
*
* @param pattern the byte array for which to search
* @param start the position at which to begin searching; the
* first position is 1
* @return the position at which the pattern appears, else -1
* @exception SQLException if there is an error accessing the
- * BLOB or if start is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} or if start is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(byte pattern[], long start) throws SQLException;
/**
- * Retrieves the byte position in the BLOB value
- * designated by this Blob object at which
- * pattern begins. The search begins at position
- * start.
+ * Retrieves the byte position in the {@code BLOB} value
+ * designated by this {@code Blob} object at which
+ * {@code pattern} begins. The search begins at position
+ * {@code start}.
*
- * @param pattern the Blob object designating
- * the BLOB value for which to search
- * @param start the position in the BLOB value
+ * @param pattern the {@code Blob} object designating
+ * the {@code BLOB} value for which to search
+ * @param start the position in the {@code BLOB} value
* at which to begin searching; the first position is 1
* @return the position at which the pattern begins, else -1
* @exception SQLException if there is an error accessing the
- * BLOB value or if start is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if start is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(Blob pattern, long start) throws SQLException;
@@ -151,152 +151,155 @@ public interface Blob {
// -------------------------- JDBC 3.0 -----------------------------------
/**
- * Writes the given array of bytes to the BLOB value that
- * this Blob object represents, starting at position
- * pos, and returns the number of bytes written.
+ * Writes the given array of bytes to the {@code BLOB} value that
+ * this {@code Blob} object represents, starting at position
+ * {@code pos}, and returns the number of bytes written.
* The array of bytes will overwrite the existing bytes
- * in the Blob object starting at the position
- * pos. If the end of the Blob value is reached
- * while writing the array of bytes, then the length of the Blob
+ * in the {@code Blob} object starting at the position
+ * {@code pos}. If the end of the {@code Blob} value is reached
+ * while writing the array of bytes, then the length of the {@code Blob}
* value will be increased to accommodate the extra bytes.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position in the BLOB object at which
+ * @param pos the position in the {@code BLOB} object at which
* to start writing; the first position is 1
- * @param bytes the array of bytes to be written to the BLOB
- * value that this Blob object represents
+ * @param bytes the array of bytes to be written to the {@code BLOB}
+ * value that this {@code Blob} object represents
* @return the number of bytes written
* @exception SQLException if there is an error accessing the
- * BLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getBytes
* @since 1.4
*/
int setBytes(long pos, byte[] bytes) throws SQLException;
/**
- * Writes all or part of the given byte array to the
- * BLOB value that this Blob object represents
+ * Writes all or part of the given {@code byte} array to the
+ * {@code BLOB} value that this {@code Blob} object represents
* and returns the number of bytes written.
- * Writing starts at position pos in the BLOB
- * value; len bytes from the given byte array are written.
+ * Writing starts at position {@code pos} in the {@code BLOB}
+ * value; {@code len} bytes from the given byte array are written.
* The array of bytes will overwrite the existing bytes
- * in the Blob object starting at the position
- * pos. If the end of the Blob value is reached
- * while writing the array of bytes, then the length of the Blob
+ * in the {@code Blob} object starting at the position
+ * {@code pos}. If the end of the {@code Blob} value is reached
+ * while writing the array of bytes, then the length of the {@code Blob}
* value will be increased to accommodate the extra bytes.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position in the BLOB object at which
+ * @param pos the position in the {@code BLOB} object at which
* to start writing; the first position is 1
- * @param bytes the array of bytes to be written to this BLOB
+ * @param bytes the array of bytes to be written to this {@code BLOB}
* object
- * @param offset the offset into the array bytes at which
+ * @param offset the offset into the array {@code bytes} at which
* to start reading the bytes to be set
- * @param len the number of bytes to be written to the BLOB
- * value from the array of bytes bytes
+ * @param len the number of bytes to be written to the {@code BLOB}
+ * value from the array of bytes {@code bytes}
* @return the number of bytes written
* @exception SQLException if there is an error accessing the
- * BLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getBytes
* @since 1.4
*/
int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException;
/**
- * Retrieves a stream that can be used to write to the BLOB
- * value that this Blob object represents. The stream begins
- * at position pos.
+ * Retrieves a stream that can be used to write to the {@code BLOB}
+ * value that this {@code Blob} object represents. The stream begins
+ * at position {@code pos}.
* The bytes written to the stream will overwrite the existing bytes
- * in the Blob object starting at the position
- * pos. If the end of the Blob value is reached
- * while writing to the stream, then the length of the Blob
+ * in the {@code Blob} object starting at the position
+ * {@code pos}. If the end of the {@code Blob} value is reached
+ * while writing to the stream, then the length of the {@code Blob}
* value will be increased to accommodate the extra bytes.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position in the BLOB value at which
+ * @param pos the position in the {@code BLOB} value at which
* to start writing; the first position is 1
- * @return a java.io.OutputStream object to which data can
+ * @return a {@code java.io.OutputStream} object to which data can
* be written
* @exception SQLException if there is an error accessing the
- * BLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getBinaryStream
* @since 1.4
*/
java.io.OutputStream setBinaryStream(long pos) throws SQLException;
/**
- * Truncates the BLOB value that this Blob
- * object represents to be len bytes in length.
+ * Truncates the {@code BLOB} value that this {@code Blob}
+ * object represents to be {@code len} bytes in length.
* pos
- * is greater then the length+1 of the BLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code BLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param len the length, in bytes, to which the BLOB value
- * that this Blob object represents should be truncated
+ * @param len the length, in bytes, to which the {@code BLOB} value
+ * that this {@code Blob} object represents should be truncated
* @exception SQLException if there is an error accessing the
- * BLOB value or if len is less than 0
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code BLOB} value or if len is less than 0
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
void truncate(long len) throws SQLException;
/**
- * This method frees the Blob object and releases the resources that
- * it holds. The object is invalid once the free
+ * This method frees the {@code Blob} object and releases the resources that
+ * it holds. The object is invalid once the {@code free}
* method is called.
* free has been called, any attempt to invoke a
- * method other than free will result in a SQLException
- * being thrown. If free is called multiple times, the subsequent
- * calls to free are treated as a no-op.
+ * After {@code free} has been called, any attempt to invoke a
+ * method other than {@code free} will result in an {@code SQLException}
+ * being thrown. If {@code free} is called multiple times, the subsequent
+ * calls to {@code free} are treated as a no-op.
*
* @throws SQLException if an error occurs releasing
- * the Blob's resources
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * the Blob's resources
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
void free() throws SQLException;
/**
- * Returns an InputStream object that contains a partial Blob value,
- * starting with the byte specified by pos, which is length bytes in length.
+ * Returns an {@code InputStream} object that contains
+ * a partial {@code Blob} value, starting with the byte
+ * specified by pos, which is length bytes in length.
*
- * @param pos the offset to the first byte of the partial value to be retrieved.
- * The first byte in the Blob is at position 1
+ * @param pos the offset to the first byte of the partial value to be
+ * retrieved. The first byte in the {@code Blob} is at position 1.
* @param length the length in bytes of the partial value to be retrieved
- * @return InputStream through which the partial Blob value can be read.
- * @throws SQLException if pos is less than 1 or if pos is greater than the number of bytes
- * in the Blob or if pos + length is greater than the number of bytes
- * in the Blob
+ * @return {@code InputStream} through which
+ * the partial {@code Blob} value can be read.
+ * @throws SQLException if pos is less than 1 or if pos is greater
+ * than the number of bytes in the {@code Blob} or if
+ * pos + length is greater than the number of bytes
+ * in the {@code Blob}
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
InputStream getBinaryStream(long pos, long length) throws SQLException;
diff --git a/jdk/src/java.sql/share/classes/java/sql/Clob.java b/jdk/src/java.sql/share/classes/java/sql/Clob.java
index b074ac604c0..3c4bfda793a 100644
--- a/jdk/src/java.sql/share/classes/java/sql/Clob.java
+++ b/jdk/src/java.sql/share/classes/java/sql/Clob.java
@@ -29,28 +29,28 @@ import java.io.Reader;
/**
* The mapping in the Java™ programming language
- * for the SQL CLOB type.
- * An SQL CLOB is a built-in type
+ * for the SQL {@code CLOB} type.
+ * An SQL {@code CLOB} is a built-in type
* that stores a Character Large Object as a column value in a row of
* a database table.
- * By default drivers implement a Clob object using an SQL
- * locator(CLOB), which means that a Clob object
- * contains a logical pointer to the SQL CLOB data rather than
- * the data itself. A Clob object is valid for the duration
+ * By default drivers implement a {@code Clob} object using an SQL
+ * {@code locator(CLOB)}, which means that a {@code Clob} object
+ * contains a logical pointer to the SQL {@code CLOB} data rather than
+ * the data itself. A {@code Clob} object is valid for the duration
* of the transaction in which it was created.
- * Clob interface provides methods for getting the
- * length of an SQL CLOB (Character Large Object) value,
- * for materializing a CLOB value on the client, and for
- * searching for a substring or CLOB object within a
- * CLOB value.
+ * getClob and setClob allow a programmer to
- * access an SQL CLOB value. In addition, this interface
- * has methods for updating a CLOB value.
+ * {@code getClob} and {@code setClob} allow a programmer to
+ * access an SQL {@code CLOB} value. In addition, this interface
+ * has methods for updating a {@code CLOB} value.
* Clob interface must be fully implemented if the
- * JDBC driver supports the data type.
+ * All methods on the {@code Clob} interface must be
+ * fully implemented if the JDBC driver supports the data type.
*
* @since 1.2
*/
@@ -59,67 +59,67 @@ public interface Clob {
/**
* Retrieves the number of characters
- * in the CLOB value
- * designated by this Clob object.
+ * in the {@code CLOB} value
+ * designated by this {@code Clob} object.
*
- * @return length of the CLOB in characters
+ * @return length of the {@code CLOB} in characters
* @exception SQLException if there is an error accessing the
- * length of the CLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * length of the {@code CLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long length() throws SQLException;
/**
* Retrieves a copy of the specified substring
- * in the CLOB value
- * designated by this Clob object.
+ * in the {@code CLOB} value
+ * designated by this {@code Clob} object.
* The substring begins at position
- * pos and has up to length consecutive
+ * {@code pos} and has up to {@code length} consecutive
* characters.
*
* @param pos the first character of the substring to be extracted.
- * The first character is at position 1.
+ * The first character is at position 1.
* @param length the number of consecutive characters to be copied;
- * the value for length must be 0 or greater
- * @return a String that is the specified substring in
- * the CLOB value designated by this Clob object
+ * the value for length must be 0 or greater
+ * @return a {@code String} that is the specified substring in
+ * the {@code CLOB} value designated by this {@code Clob} object
* @exception SQLException if there is an error accessing the
- * CLOB value; if pos is less than 1 or length is
- * less than 0
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value; if pos is less than 1 or length is
+ * less than 0
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
String getSubString(long pos, int length) throws SQLException;
/**
- * Retrieves the CLOB value designated by this Clob
- * object as a java.io.Reader object (or as a stream of
+ * Retrieves the {@code CLOB} value designated by this {@code Clob}
+ * object as a {@code java.io.Reader} object (or as a stream of
* characters).
*
- * @return a java.io.Reader object containing the
- * CLOB data
+ * @return a {@code java.io.Reader} object containing the
+ * {@code CLOB} data
* @exception SQLException if there is an error accessing the
- * CLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setCharacterStream
* @since 1.2
*/
java.io.Reader getCharacterStream() throws SQLException;
/**
- * Retrieves the CLOB value designated by this Clob
+ * Retrieves the {@code CLOB} value designated by this {@code Clob}
* object as an ascii stream.
*
- * @return a java.io.InputStream object containing the
- * CLOB data
+ * @return a {@code java.io.InputStream} object containing the
+ * {@code CLOB} data
* @exception SQLException if there is an error accessing the
- * CLOB value
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #setAsciiStream
* @since 1.2
*/
@@ -127,38 +127,38 @@ public interface Clob {
/**
* Retrieves the character position at which the specified substring
- * searchstr appears in the SQL CLOB value
- * represented by this Clob object. The search
- * begins at position start.
+ * {@code searchstr} appears in the SQL {@code CLOB} value
+ * represented by this {@code Clob} object. The search
+ * begins at position {@code start}.
*
* @param searchstr the substring for which to search
- * @param start the position at which to begin searching; the first position
- * is 1
+ * @param start the position at which to begin searching;
+ * the first position is 1
* @return the position at which the substring appears or -1 if it is not
* present; the first position is 1
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(String searchstr, long start) throws SQLException;
/**
* Retrieves the character position at which the specified
- * Clob object searchstr appears in this
- * Clob object. The search begins at position
- * start.
+ * {@code Clob} object {@code searchstr} appears in this
+ * {@code Clob} object. The search begins at position
+ * {@code start}.
*
- * @param searchstr the Clob object for which to search
+ * @param searchstr the {@code Clob} object for which to search
* @param start the position at which to begin searching; the first
* position is 1
- * @return the position at which the Clob object appears
- * or -1 if it is not present; the first position is 1
+ * @return the position at which the {@code Clob} object appears
+ * or -1 if it is not present; the first position is 1
* @exception SQLException if there is an error accessing the
- * CLOB value or if start is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if start is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.2
*/
long position(Clob searchstr, long start) throws SQLException;
@@ -166,90 +166,91 @@ public interface Clob {
//---------------------------- jdbc 3.0 -----------------------------------
/**
- * Writes the given Java String to the CLOB
- * value that this Clob object designates at the position
- * pos. The string will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing the given string, then the length of the Clob
+ * Writes the given Java {@code String} to the {@code CLOB}
+ * value that this {@code Clob} object designates at the position
+ * {@code pos}. The string will overwrite the existing characters
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing the given string, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param pos the position at which to start writing to the CLOB
- * value that this Clob object represents;
- * The first position is 1
- * @param str the string to be written to the CLOB
- * value that this Clob designates
+ * @param pos the position at which to start writing to the {@code CLOB}
+ * value that this {@code Clob} object represents;
+ * the first position is 1.
+ * @param str the string to be written to the {@code CLOB}
+ * value that this {@code Clob} designates
* @return the number of characters written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
+ * {@code CLOB} value or if pos is less than 1
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
int setString(long pos, String str) throws SQLException;
/**
- * Writes len characters of str, starting
- * at character offset, to the CLOB value
- * that this Clob represents. The string will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing the given string, then the length of the Clob
+ * Writes {@code len} characters of {@code str}, starting
+ * at character {@code offset}, to the {@code CLOB} value
+ * that this {@code Clob} represents.
+ * The string will overwrite the existing characters
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing the given string, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
* @param pos the position at which to start writing to this
- * CLOB object; The first position is 1
- * @param str the string to be written to the CLOB
- * value that this Clob object represents
- * @param offset the offset into str to start reading
+ * {@code CLOB} object; The first position is 1
+ * @param str the string to be written to the {@code CLOB}
+ * value that this {@code Clob} object represents
+ * @param offset the offset into {@code str} to start reading
* the characters to be written
* @param len the number of characters to be written
* @return the number of characters written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
+ * {@code CLOB} value or if pos is less than 1
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
int setString(long pos, String str, int offset, int len) throws SQLException;
/**
* Retrieves a stream to be used to write Ascii characters to the
- * CLOB value that this Clob object represents,
- * starting at position pos. Characters written to the stream
+ * {@code CLOB} value that this {@code Clob} object represents,
+ * starting at position {@code pos}. Characters written to the stream
* will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing characters to the stream, then the length of the Clob
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing characters to the stream, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
* @param pos the position at which to start writing to this
- * CLOB object; The first position is 1
+ * {@code CLOB} object; The first position is 1
* @return the stream to which ASCII encoded characters can be written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getAsciiStream
*
* @since 1.4
@@ -258,28 +259,28 @@ public interface Clob {
/**
* Retrieves a stream to be used to write a stream of Unicode characters
- * to the CLOB value that this Clob object
- * represents, at position pos. Characters written to the stream
+ * to the {@code CLOB} value that this {@code Clob} object
+ * represents, at position {@code pos}. Characters written to the stream
* will overwrite the existing characters
- * in the Clob object starting at the position
- * pos. If the end of the Clob value is reached
- * while writing characters to the stream, then the length of the Clob
+ * in the {@code Clob} object starting at the position
+ * {@code pos}. If the end of the {@code Clob} value is reached
+ * while writing characters to the stream, then the length of the {@code Clob}
* value will be increased to accommodate the extra characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
* @param pos the position at which to start writing to the
- * CLOB value; The first position is 1
+ * {@code CLOB} value; The first position is 1
*
* @return a stream to which Unicode encoded characters can be written
* @exception SQLException if there is an error accessing the
- * CLOB value or if pos is less than 1
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * {@code CLOB} value or if pos is less than 1
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @see #getCharacterStream
*
* @since 1.4
@@ -287,60 +288,64 @@ public interface Clob {
java.io.Writer setCharacterStream(long pos) throws SQLException;
/**
- * Truncates the CLOB value that this Clob
- * designates to have a length of len
+ * Truncates the {@code CLOB} value that this {@code Clob}
+ * designates to have a length of {@code len}
* characters.
* pos
- * is greater then the length+1 of the CLOB value then the
- * behavior is undefined. Some JDBC drivers may throw a
- * SQLException while other drivers may support this
+ * Note: If the value specified for {@code pos}
+ * is greater than the length+1 of the {@code CLOB} value then the
+ * behavior is undefined. Some JDBC drivers may throw an
+ * {@code SQLException} while other drivers may support this
* operation.
*
- * @param len the length, in characters, to which the CLOB value
+ * @param len the length, in characters, to which the {@code CLOB} value
* should be truncated
* @exception SQLException if there is an error accessing the
- * CLOB value or if len is less than 0
+ * {@code CLOB} value or if len is less than 0
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.4
*/
void truncate(long len) throws SQLException;
/**
- * This method releases the resources that the Clob object
- * holds. The object is invalid once the free method
+ * This method releases the resources that the {@code Clob} object
+ * holds. The object is invalid once the {@code free} method
* is called.
* free has been called, any attempt to invoke a
- * method other than free will result in a SQLException
- * being thrown. If free is called multiple times, the subsequent
- * calls to free are treated as a no-op.
+ * After {@code free} has been called, any attempt to invoke a
+ * method other than {@code free} will result in a {@code SQLException}
+ * being thrown. If {@code free} is called multiple times, the subsequent
+ * calls to {@code free} are treated as a no-op.
*
* @throws SQLException if an error occurs releasing
- * the Clob's resources
+ * the Clob's resources
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
void free() throws SQLException;
/**
- * Returns a Reader object that contains a partial Clob value, starting
- * with the character specified by pos, which is length characters in length.
+ * Returns a {@code Reader} object that contains
+ * a partial {@code Clob} value, starting with the character
+ * specified by pos, which is length characters in length.
*
* @param pos the offset to the first character of the partial value to
* be retrieved. The first character in the Clob is at position 1.
* @param length the length in characters of the partial value to be retrieved.
- * @return Reader through which the partial Clob value can be read.
- * @throws SQLException if pos is less than 1 or if pos is greater than the number of
- * characters in the Clob or if pos + length is greater than the number of
- * characters in the Clob
+ * @return {@code Reader} through which
+ * the partial {@code Clob} value can be read.
+ * @throws SQLException if pos is less than 1;
+ * or if pos is greater than the number of characters
+ * in the {@code Clob};
+ * or if pos + length is greater than the number of
+ * characters in the {@code Clob}
*
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
- * this method
+ * @exception SQLFeatureNotSupportedException if the JDBC driver
+ * does not support this method
* @since 1.6
*/
Reader getCharacterStream(long pos, long length) throws SQLException;
diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html b/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html
index daa9e6807ca..0d74a973014 100644
--- a/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html
+++ b/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html
@@ -35,7 +35,7 @@ manager to enlist and delist resource objects (supplied by the
resource manager driver) in JTA transactions. The driver vendor
for a specific resource manager provides the implementation of
this API.
-