# HG changeset patch
# User weijun
# Date 1488898536 -28800
# Node ID 4d25a0bb7426a16b3b36129a257a8c67fa0ed7e9
# Parent  762e807bfac17ae9fe2071a1a0bcd856e106e950
8175846: Provide javadoc descriptions for jdk.policytool and jdk.crypto.* modules
Reviewed-by: vinnie

diff -r 762e807bfac1 -r 4d25a0bb7426 jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java
--- a/jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java	Tue Mar 07 22:42:11 2017 +0800
+++ b/jdk/src/jdk.crypto.cryptoki/share/classes/module-info.java	Tue Mar 07 22:55:36 2017 +0800
@@ -23,6 +23,11 @@
  * questions.
  */
 
+/**
+ * The SunPKCS11 security provider.
+ *
+ * @since 9
+ */
 module jdk.crypto.cryptoki {
     // Depends on SunEC provider for EC related functionality
     requires jdk.crypto.ec;
diff -r 762e807bfac1 -r 4d25a0bb7426 jdk/src/jdk.crypto.ec/share/classes/module-info.java
--- a/jdk/src/jdk.crypto.ec/share/classes/module-info.java	Tue Mar 07 22:42:11 2017 +0800
+++ b/jdk/src/jdk.crypto.ec/share/classes/module-info.java	Tue Mar 07 22:55:36 2017 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -23,6 +23,11 @@
  * questions.
  */
 
+/**
+ * The SunEC security provider.
+ *
+ * @since 9
+ */
 module jdk.crypto.ec {
     provides java.security.Provider with sun.security.ec.SunEC;
 }
diff -r 762e807bfac1 -r 4d25a0bb7426 jdk/src/jdk.crypto.mscapi/windows/classes/module-info.java
--- a/jdk/src/jdk.crypto.mscapi/windows/classes/module-info.java	Tue Mar 07 22:42:11 2017 +0800
+++ b/jdk/src/jdk.crypto.mscapi/windows/classes/module-info.java	Tue Mar 07 22:55:36 2017 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -23,6 +23,11 @@
  * questions.
  */
 
+/**
+ * The SunMSCAPI security provider.
+ *
+ * @since 9
+ */
 module jdk.crypto.mscapi {
     provides java.security.Provider with sun.security.mscapi.SunMSCAPI;
 }
diff -r 762e807bfac1 -r 4d25a0bb7426 jdk/src/jdk.crypto.ucrypto/solaris/classes/module-info.java
--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/module-info.java	Tue Mar 07 22:42:11 2017 +0800
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/module-info.java	Tue Mar 07 22:55:36 2017 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -23,6 +23,11 @@
  * questions.
  */
 
+/**
+ * The OracleUCrypto security provider.
+ *
+ * @since 9
+ */
 module jdk.crypto.ucrypto {
     provides java.security.Provider with com.oracle.security.ucrypto.UcryptoProvider;
 }
diff -r 762e807bfac1 -r 4d25a0bb7426 jdk/src/jdk.policytool/share/classes/module-info.java
--- a/jdk/src/jdk.policytool/share/classes/module-info.java	Tue Mar 07 22:42:11 2017 +0800
+++ b/jdk/src/jdk.policytool/share/classes/module-info.java	Tue Mar 07 22:55:36 2017 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -23,6 +23,14 @@
  * questions.
  */
 
+/**
+ * GUI tool for managing policy files.
+ *
+ * @since 9
+ * @deprecated The policytool tool has been deprecated and
+ * is planned to be removed in a future release.
+ */
+@Deprecated
 module jdk.policytool {
     requires java.desktop;
     requires java.logging;