# HG changeset patch
# User sspitsyn
# Date 1481154331 0
# Node ID 2d3bde7569e083fe99d422e86eb95633a7dc11eb
# Parent  f4b39e85487d1e48f17585b0c7d04471f357c6a6# Parent  6c6bdb0d227c5b6e5db855198901ec192ddb4696
Merge

diff -r f4b39e85487d -r 2d3bde7569e0 hotspot/src/share/vm/prims/jvmti.xml
--- a/hotspot/src/share/vm/prims/jvmti.xml	Wed Dec 07 23:38:37 2016 +0100
+++ b/hotspot/src/share/vm/prims/jvmti.xml	Wed Dec 07 23:45:31 2016 +0000
@@ -404,7 +404,7 @@
     interfaces are more appropriate than <jvmti/> for many tools. 
     For more information on the Java Platform Debugger Architecture, 
     see the 
-    <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/architecture.html">Java 
+    <externallink id="docs/technotes/guides/jpda/architecture.html">Java 
       Platform Debugger Architecture website</externallink>. 
   </intro>
 
@@ -764,7 +764,8 @@
     An agent creates a <jvmti/> environment 
     by passing a <jvmti/> version 
     as the interface ID to the JNI Invocation API function 
-    <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/invocation.html#GetEnv"><code>GetEnv</code></externallink>.
+    <externallink id="docs/technotes/guides/jni/spec/invocation.html#GetEnv">
+      <code>GetEnv</code></externallink>.
     See <internallink id="jvmtiEnvAccess">Accessing <jvmti/> Functions</internallink>
     for more details on the creation and use of 
     <jvmti/> environments.
@@ -885,7 +886,7 @@
     Modified UTF-8 differs 
     from standard UTF-8 in the representation of supplementary characters 
     and of the null character. See the
-    <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html#wp16542">
+    <externallink id="docs/technotes/guides/jni/spec/types.html#modified_utf_8_strings">
       Modified UTF-8 Strings</externallink>
     section of the JNI specification for details.
   </intro>
@@ -915,7 +916,7 @@
     by calling <jvmti/> functions. 
     Access to <jvmti/> functions is by use of an interface pointer
     in the same manner as 
-    <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/design.html">Java 
+    <externallink id="docs/technotes/guides/jni/spec/design.html">Java 
       Native Interface (JNI) functions</externallink> are accessed.
     The <jvmti/> interface pointer is called the 
     <i>environment pointer</i>.
@@ -1007,7 +1008,8 @@
     local references--these local references are created 
     during the <jvmti/> call.
     Local references are a resource that must be managed (see the 
-    <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html#wp18654">JNI Documentation</externallink>).  
+    <externallink id="docs/technotes/guides/jni/spec/functions.html#local_references">
+      JNI Documentation</externallink>).  
     When threads return from native code all local references
     are freed.  Note that some threads, including typical
     agent threads, will never return from native code.
@@ -1042,7 +1044,7 @@
       <jvmti/> function.
       See the
       <externallink 
-        id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/design.html#wp770"
+        id="docs/technotes/guides/jni/spec/design.html#java_exceptions"
              >Java Exceptions</externallink>
       section of the JNI specification for information on handling exceptions.
     </intro>
@@ -2107,8 +2109,8 @@
         <functionlink id="GetAllStackTraces"/>).
 	<p/>
 	Upon execution of <code>proc</code>, the new thread will be attached to the
-	VM--see the JNI documentation on 
-	<externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/invocation.html#wp1060"
+	VM -- see the JNI documentation on 
+	<externallink id="docs/technotes/guides/jni/spec/invocation.html#attaching_to_the_vm"
 		      >Attaching to the VM</externallink>.
       </description>
       <origin>jvmdiClone</origin>
@@ -6650,7 +6652,7 @@
       <synopsis>Get Class Signature</synopsis>
       <description>
         For the class indicated by <code>klass</code>, return the 
-        <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/types.html#wp16432">JNI 
+        <externallink id="docs/technotes/guides/jni/spec/types.html#type_signatures">JNI 
             type signature</externallink> 
         and the generic signature of the class.
         For example, <code>java.util.List</code> is <code>"Ljava/util/List;"</code>
@@ -7770,8 +7772,9 @@
 	return the field name via <paramlink id="name_ptr"/> and field signature via
 	<paramlink id="signature_ptr"/>.
 	<p/>
-        Field signatures are defined in the JNI Specification and 
-        are referred to as <code>field descriptors</code> in
+        Field signatures are defined in the
+        <externallink id="docs/technotes/guides/jni/spec/jniTOC.html">JNI Specification</externallink>
+        and are referred to as <code>field descriptors</code> in
         <vmspec chapter="4.3.2"/>.
       </description>
       <origin>jvmdiClone</origin>
@@ -7966,8 +7969,9 @@
 	return the method name via <code>name_ptr</code> and method signature via
 	<code>signature_ptr</code>.
         <p/>
-        Method signatures are defined in the JNI Specification and are 
-        referred to as <code>method descriptors</code> in 
+        Method signatures are defined in the
+        <externallink id="docs/technotes/guides/jni/spec/jniTOC.html">JNI Specification</externallink>
+        and are referred to as <code>method descriptors</code> in 
         <vmspec chapter="4.3.3"/>.
 	Note this is different
 	than method signatures as defined in the <i>Java Language Specification</i>.
@@ -8939,7 +8943,7 @@
       Provides the ability to intercept and resend 
       Java Native Interface (JNI) function calls
       by manipulating the JNI function table.
-      See <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html">JNI
+      See <externallink id="docs/technotes/guides/jni/spec/functions.html">JNI
 	Functions</externallink> in the <i>Java Native Interface Specification</i>.
       <p/>
       The following example illustrates intercepting the 
@@ -10640,7 +10644,7 @@
 	  for a class. The segment is typically a directory or JAR file.
 	  <p/>	  
 	  In the live phase the <paramlink id="segment"/> may be used to specify any platform-dependent
-	  path to a <externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html">
+	  path to a <externallink id="docs/technotes/guides/jar/jar.html">
 	  JAR file</externallink>. The agent should take care that the JAR file does not
           contain any classes or resources other than those to be defined by the bootstrap
           class loader for the purposes of instrumentation.
@@ -10687,8 +10691,8 @@
 	  search path segment to be searched after the system class loader unsuccessfully searches
 	  for a class. The segment is typically a directory or JAR file.
 	  <p/>	  
-	  In the live phase the <paramlink id="segment"/> is a platform-dependent path to a <externallink 
-	  id="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html">JAR file</externallink> to be
+	  In the live phase the <paramlink id="segment"/> is a platform-dependent path to a
+	  <externallink id="docs/technotes/guides/jar/jar.html">JAR file</externallink> to be
 	  searched after the system class loader unsuccessfully searches for a class. The agent should
           take care that the JAR file does not contain any classes or resources other than those to be
           defined by the system class loader for the purposes of instrumentation.
@@ -13519,7 +13523,8 @@
       <description>
 	Typedef for the JNI function table <code>JNINativeInterface</code>
 	defined in the 
-	<externallink id="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html#wp23720">JNI Specification</externallink>.
+	<externallink id="docs/technotes/guides/jni/spec/functions.html#interface_function_table">
+          JNI Specification</externallink>.
 	The JNI reference implementation defines this with an underscore.
       </description>
     </basetype>
diff -r f4b39e85487d -r 2d3bde7569e0 hotspot/src/share/vm/prims/jvmti.xsl
--- a/hotspot/src/share/vm/prims/jvmti.xsl	Wed Dec 07 23:38:37 2016 +0100
+++ b/hotspot/src/share/vm/prims/jvmti.xsl	Wed Dec 07 23:45:31 2016 +0000
@@ -1033,6 +1033,10 @@
 <xsl:template match="externallink">
   <a>
     <xsl:attribute name="href">
+      <!-- All external links start from the same prefix -->
+      <xsl:text>http://docs.oracle.com/javase/</xsl:text>
+      <xsl:value-of select="//specification/@majorversion"/>
+      <xsl:text>/</xsl:text>
       <xsl:value-of select="@id"/>
     </xsl:attribute>
     <xsl:value-of select="."/>