changeset 10484:ceb6024c48e2 jdk-9+170

Merge
author kcr
date Thu, 11 May 2017 11:02:47 -0700
parents 52fb8496133d 299f06e156e2
children 92ff226d7b61 7b9fe9fa6ab9
files
diffstat 29 files changed, 151 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/modules/javafx.base/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/javafx.base/src/main/java/javafx/beans/WeakListener.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/WeakListener.java	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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,7 +27,7 @@
 
 /**
  * {@code WeakListener} is the super interface of all weak listener implementations
- * JavaFX runtime. Usually it should not be used directly, but instead one of the
+ * in the JavaFX API. Usually it should not be used directly, but instead one of the
  * sub-interfaces will be used.
  *
  * @see WeakInvalidationListener
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/Binding.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/Binding.java	Thu May 11 11:02:47 2017 -0700
@@ -48,9 +48,9 @@
  * classes already provide most of the needed functionality. See
  * {@link DoubleBinding} for an example.
  *
+ * @param <T> the type of the wrapped value
  * @see DoubleBinding
  *
- *
  * @since JavaFX 2.0
  */
 public interface Binding<T> extends ObservableValue<T> {
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/package.html	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/package.html	Thu May 11 11:02:47 2017 -0700
@@ -5,6 +5,8 @@
 <title>javafx.beans.binding</title>
 </head>
 <body>
+    <p>Provides classes that create and operate on a {@link Binding Binding}
+        that calculates a value that depends on one or more sources.</p>
 	<h1>Characteristics of Bindings</h1>
 	<p>Bindings are assembled from one or more sources, usually called
 		their dependencies. A binding observes its dependencies for changes
@@ -57,4 +59,4 @@
 </code>
 </pre>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanProperty.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanProperty.java	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -28,10 +28,10 @@
 import javafx.beans.property.Property;
 
 /**
- * {@code JavaBeanProperty&lt;T&gt;} is the super interface of all adapters between
+ * {@code JavaBeanProperty} is the super interface of all adapters between
  * writable Java Bean properties and JavaFX properties.
  *
- * @param T The type of the wrapped property
+ * @param <T> The type of the wrapped property
  * @since JavaFX 2.1
  */
 public interface JavaBeanProperty<T> extends ReadOnlyJavaBeanProperty<T>, Property<T> {
--- a/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanProperty.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanProperty.java	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -28,10 +28,10 @@
 import javafx.beans.property.ReadOnlyProperty;
 
 /**
- * {@code JavaBeanProperty&lt;T&gt;} is the super interface of all adapters between
+ * {@code JavaBeanProperty} is the super interface of all adapters between
  * readonly Java Bean properties and JavaFX properties.
  *
- * @param T The type of the wrapped property
+ * @param <T> The type of the wrapped property
  * @since JavaFX 2.1
  */
 public interface ReadOnlyJavaBeanProperty<T> extends ReadOnlyProperty<T> {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/adapter/package.html	Thu May 11 11:02:47 2017 -0700
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>javafx.beans.property.adapter</title>
+</head>
+<body>
+<p>Provides various classes that act as adapters between a regular Java Bean
+property and a corresponding {@link javafx.beans.property.Property JavaFX
+Property}.</p>
+</body>
+</html>
--- a/modules/javafx.base/src/main/java/javafx/collections/transformation/TransformationList.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/collections/transformation/TransformationList.java	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -32,8 +32,8 @@
 import javafx.collections.WeakListChangeListener;
 
 /**
- * A base class for all lists that wraps other lists in a way that changes the list's
- * elements, order, size or generally it's structure.
+ * A base class for all lists that wrap another list in a way that changes
+ * (transforms) the wrapped list's elements, order, size, or structure.
  *
  * If the source list is observable, a listener is automatically added to it
  * and the events are delegated to {@link #sourceChanged(javafx.collections.ListChangeListener.Change)}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/javafx.base/src/main/java/javafx/collections/transformation/package.html	Thu May 11 11:02:47 2017 -0700
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>javafx.collections.transformation</title>
+</head>
+<body>
+<p>Provides JavaFX collections that wrap and transform (for example, sort
+or filter) other JavaFX collections.</p>
+</body>
+</html>
--- a/modules/javafx.controls/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.controls/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/Dialog.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/Dialog.java	Thu May 11 11:02:47 2017 -0700
@@ -344,7 +344,8 @@
     }
 
     /**
-     * Hides the dialog.
+     * Closes this {@code Dialog}.
+     * This call is equivalent to {@link #hide}.
      */
     public final void close() {
         if (isClosing) return;
@@ -416,7 +417,7 @@
     }
 
     /**
-     * closes the dialog.
+     * Hides this {@code Dialog}.
      */
     public final void hide() {
         close();
--- a/modules/javafx.fxml/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.fxml/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/javafx.graphics/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/javafx.graphics/src/main/java/javafx/animation/Timeline.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/animation/Timeline.java	Thu May 11 11:02:47 2017 -0700
@@ -35,7 +35,7 @@
 
 /**
  * A {@code Timeline} can be used to define a free form animation of any
- * {@link javafx.beans.value.WritableValue}, e.g. all
+ * {@link javafx.beans.value.WritableValue}, for example, all
  * {@link javafx.beans.property.Property JavaFX Properties}.
  * <p>
  * A {@code Timeline}, defined by one or more {@link KeyFrame}s, processes
--- a/modules/javafx.graphics/src/main/java/javafx/application/Application.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/application/Application.java	Thu May 11 11:02:47 2017 -0700
@@ -87,20 +87,18 @@
  * Otherwise, an exception will be thrown when the application is launched.
  * This means that
  * in addition to the class itself being declared public, the module must
- * {@link Module#isExported(String,Module) export} the containing package to
- * at least the {@code javafx.graphics} module, either in its
- * {@code module-info.class} or by calling
- * {@link Module#addExports}.
+ * {@link Module#isExported(String,Module) export}
+ * (or {@link Module#isOpen(String,Module) open}) the containing package to
+ * at least the {@code javafx.graphics} module.
  * </p>
  * <p>
- * For example, if the {@code Application} subclass is in the {@code com.foo}
- * package in the {@code foo.app} module, the {@code module-info.java} might
- * look like this:
+ * For example, if {@code com.foo.MyApplication} is in the {@code foo.app}
+ * module, the {@code module-info.java} might look like this:
  * </p>
- * <pre>{@code module foo.app {
- *     exports com.foo to javafx.graphics;
- * }}</pre>
- *
+<pre>{@code module foo.app {
+    exports com.foo to javafx.graphics;
+}}</pre>
+*
  * <p><b>Parameters</b></p>
  * <p>
  * Application parameters are available by calling the {@link #getParameters}
@@ -194,6 +192,12 @@
      * The launch method does not return until the application has exited,
      * either via a call to Platform.exit or all of the application windows
      * have been closed.
+     * The class specified by the {@code appClass} argument must be
+     * a public subclass of {@code Application}
+     * with a public no-argument constructor, in a package that is
+     * {@link Module#isExported(String,Module) exported}
+     * (or {@link Module#isOpen(String,Module) open}) to at least the
+     * {@code javafx.graphics} module, or a RuntimeException will be thrown.
      *
      * <p>
      * Typical usage is:
@@ -227,12 +231,13 @@
      * Launch a standalone application. This method is typically called
      * from the main method(). It must not be called more than once or an
      * exception will be thrown.
-     * This is equivalent to launch(TheClass.class, args) where TheClass is the
-     * immediately enclosing class of the method that called launch. It must
-     * be a public subclass of Application with a public no-argument
-     * constructor, in a package that is
+     * This is equivalent to {@code launch(TheClass.class, args)} where
+     * {@code TheClass} is the
+     * immediately enclosing class of the method that called launch.
+     * It must be a public subclass of {@code Application}
+     * with a public no-argument constructor, in a package that is
      * {@link Module#isExported(String,Module) exported}
-     * (or {@link Module#isOpen(String,Module) opened}) to at least the
+     * (or {@link Module#isOpen(String,Module) open}) to at least the
      * {@code javafx.graphics} module, or a RuntimeException will be thrown.
      *
      * <p>
--- a/modules/javafx.graphics/src/main/java/javafx/css/ParsedValue.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/css/ParsedValue.java	Thu May 11 11:02:47 2017 -0700
@@ -31,7 +31,7 @@
  * A representation of a parsed CSS value. {@code V} is the type of the parsed
  * value, {@code T} is the {@code StyleableProperty} type of the converted value.
  * Instances of {@code ParsedValue} are created by the CSS parser. For example,
- * the parser creates a {@code ParsedValue&lt;String,Color&gt;} when it parses a
+ * the parser creates a {@code ParsedValue<String,Color>} when it parses a
  * web Color.
  * <p>
  * A ParsedValue is meaningful to the code that calculates actual values from
--- a/modules/javafx.graphics/src/main/java/javafx/css/StyleablePropertyFactory.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/css/StyleablePropertyFactory.java	Thu May 11 11:02:47 2017 -0700
@@ -624,7 +624,7 @@
      * <pre><code>
      * {@literal
      *     private static final StyleablePropertyFactory<MyControl> FACTORY = new StyleablePropertyFactory<>();
-     *     StyleableProperty&lt;Orientation&gt; orientation =
+     *     StyleableProperty<Orientation> orientation =
      *         FACTORY.createStyleableEnumProperty(
      *             this,
      *             "orientation",
--- a/modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java	Thu May 11 11:02:47 2017 -0700
@@ -44,7 +44,7 @@
 /**
  * Converts a parsed value representing  URL to a URL string that is
  * resolved relative to the location of the stylesheet.
- * The input value is in the form: {@code url("&lt;path&gt;")}.
+ * The input value is in the form: {@code url("<path>")}.
  *
  * @since 9
  */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/javafx.graphics/src/main/java/javafx/css/converter/package.html	Thu May 11 11:02:47 2017 -0700
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>javafx.css.converter</title>
+</head>
+<body>
+<p>Provides various {@link javafx.css.StyleConverter StyleConverter} classes
+that convert CSS parsed values.</p>
+</body>
+</html>
--- a/modules/javafx.graphics/src/main/java/javafx/css/package.html	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/css/package.html	Thu May 11 11:02:47 2017 -0700
@@ -26,7 +26,7 @@
 <dd>Defines the CSS property and provides a link back to the 
     {@link javafx.css.StyleableProperty StyleableProperty}.
     By convention, classes that have CssMetaData implement a 
-    {@code public static List&lt;CssMetaData&lt;? extends Styleable, ?&gt;&gt; getClassCssMetaData()} method that
+    {@code public static List<CssMetaData<? extends Styleable>> getClassCssMetaData()} method that
     allows other classes to include CssMetaData from an inherited class. The
     method {@link javafx.scene.Node#getCssMetaData() getCssMetaData()} should 
     be overridden to return {@code getClassCssMetaData()}. The CSS implementation
--- a/modules/javafx.graphics/src/main/java/javafx/scene/input/KeyEvent.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/input/KeyEvent.java	Thu May 11 11:02:47 2017 -0700
@@ -113,7 +113,7 @@
             new EventType<KeyEvent>(KeyEvent.ANY, "KEY_TYPED");
 
     /**
-     * Constructs new KeyEvent event with null source and target and KeyCode object directly specified.
+     * Constructs a new {@code KeyEvent} event from the specified parameters.
      * @param source the source of the event. Can be null.
      * @param target the target of the event. Can be null.
      * @param eventType The type of the event.
@@ -142,7 +142,8 @@
     }
 
     /**
-     * Constructs new KeyEvent event with null source and target and KeyCode object directly specified.
+     * Constructs a new {@code KeyEvent} event from the specified parameters,
+     * with a {@code null} source and target.
      * @param eventType The type of the event.
      * @param character The character or sequence of characters associated with the event
      * @param text A String describing the key code
--- a/modules/javafx.graphics/src/main/java/javafx/scene/paint/RadialGradient.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/paint/RadialGradient.java	Thu May 11 11:02:47 2017 -0700
@@ -164,8 +164,8 @@
     private CycleMethod cycleMethod;
 
     /**
-     * Defines which of the follwing cycle method is applied
-     * to the {@code RadialGradient}: {@code CycleMethod.NO_CYCLE},
+     * Defines the cycle method applied
+     * to the {@code RadialGradient}. One of: {@code CycleMethod.NO_CYCLE},
      * {@code CycleMethod.REFLECT}, or {@code CycleMethod.REPEAT}.
      *
      * @return the cycle method applied to this radial gradient
--- a/modules/javafx.graphics/src/main/java/javafx/scene/shape/Circle.java	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/shape/Circle.java	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -42,20 +42,20 @@
 
 /**
  * The {@code Circle} class creates a new circle
- * with the specified radius and center location measured in pixels
+ * with the specified radius and center location measured in pixels.
+ * <p>
+ * Example usage. The following code creates a circle with radius of 50 pixels
+ * centered at (100,100).
+ * </p>
  *
- * Example usage. The following code creates a circle with radius 50px centered
- * at (100,100)px.
- *
-<PRE>
-import javafx.scene.shape.*;
+<pre>{@code
+import javafx.scene.shape.Circle;
 
 Circle circle = new Circle();
 circle.setCenterX(100.0f);
 circle.setCenterY(100.0f);
 circle.setRadius(50.0f);
-}
-</PRE>
+}</pre>
  * @since JavaFX 2.0
  */
 public class Circle extends Shape {
--- a/modules/javafx.media/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.media/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/javafx.swing/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.swing/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/javafx.web/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/javafx.web/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=true
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=ext
--- a/modules/jdk.packager.services/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/jdk.packager.services/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=false
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=true
 classloader=app
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/jdk.packager.services/src/main/java/jdk/packager/services/package.html	Thu May 11 11:02:47 2017 -0700
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<!--
+/*
+ * Copyright (c) 2017, 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.
+ */
+-->
+
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>jdk.packager.services</title>
+</head>
+<body>
+<p>Defines the services used by the Java packager tool. This package is
+not typically available in the Java Runtime, you must explicitly include
+the 'jdk.packager.services' module from the jmod directory of
+the JDK as part of your application bundle.</p>
+</body>
+</html>
--- a/modules/jdk.packager/make/build.properties	Sat May 06 11:01:44 2017 -0700
+++ b/modules/jdk.packager/make/build.properties	Thu May 11 11:02:47 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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
@@ -28,4 +28,5 @@
 include_in_jre=false
 include_in_jdk=true
 include_in_jdk_server=false
+include_in_docs=false
 classloader=app