RFR: XXS: JDK-8213102: Oracle Unilinks are [301 Moved Permanently] to https://docs.oracle.com

2018-10-29 Thread Jonathan Gibbons
Please review the following simple fix to change the host for Oracle 
Unilinks from www.oracle.com to docs.oracle.com to avoid unnecessary 
redirects.


JBS: https://bugs.openjdk.java.net/browse/JDK-8213102

The fix was done with the following command:

grep -rl oracle.com/pls open/make | xargs sed --in-place 
's|www.oracle.com/pls|docs.oracle.com/pls|g'


-- Jon


Patch inline:

$ hg diff -R open
diff -r 3152b928769d make/Docs.gmk
--- a/make/Docs.gmk Mon Oct 29 11:05:45 2018 -0700
+++ b/make/Docs.gmk Mon Oct 29 11:45:11 2018 -0700
@@ -61,7 +61,7 @@
 $(SUPPORT_OUTPUTDIR)/rmic/* $(TOPDIR)/src/*/share/doc/stub)

 # URLs
-JAVADOC_BASE_URL := 
https://www.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
+JAVADOC_BASE_URL := 
https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage

 BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
 COPYRIGHT_URL := {@docroot}/../legal/copyright.html
 LICENSE_URL := 
https://www.oracle.com/technetwork/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html

diff -r 3152b928769d make/jdk/src/classes/build/tools/taglet/ExtLink.java
--- a/make/jdk/src/classes/build/tools/taglet/ExtLink.java  Mon Oct 
29 11:05:45 2018 -0700
+++ b/make/jdk/src/classes/build/tools/taglet/ExtLink.java  Mon Oct 
29 11:45:11 2018 -0700

@@ -48,7 +48,7 @@
  * will produce the following html
  * 
  * {@code
- * Please see href="https://www.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
spectacular sight.
+ * Please see href="https://docs.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
spectacular sight.

  * }
  */
 public class ExtLink implements Taglet {
@@ -63,7 +63,7 @@

 static final String TAG_NAME = "extLink";

-    static final String URL = 
"https://www.oracle.com/pls/topic/lookup?ctx=javase"; +
+    static final String URL = 
"https://docs.oracle.com/pls/topic/lookup?ctx=javase"; +

 SPEC_VERSION + "&id=";

 static final Pattern TAG_PATTERN = 
Pattern.compile("(?s)(\\s*)(?\\w+)(\\s+)(?.*)$");




Re: RFR: XXS: JDK-8213102: Oracle Unilinks are [301 Moved Permanently] to https://docs.oracle.com

2018-10-29 Thread Lance Andersen
looks fine jon
> On Oct 29, 2018, at 2:57 PM, Jonathan Gibbons  
> wrote:
> 
> Please review the following simple fix to change the host for Oracle Unilinks 
> from www.oracle.com to docs.oracle.com to avoid unnecessary redirects.
> 
> JBS: https://bugs.openjdk.java.net/browse/JDK-8213102
> 
> The fix was done with the following command:
> 
> grep -rl oracle.com/pls open/make | xargs sed --in-place 
> 's|www.oracle.com/pls|docs.oracle.com/pls|g'
> 
> -- Jon
> 
> 
> Patch inline:
> 
> $ hg diff -R open
> diff -r 3152b928769d make/Docs.gmk
> --- a/make/Docs.gmk Mon Oct 29 11:05:45 2018 -0700
> +++ b/make/Docs.gmk Mon Oct 29 11:45:11 2018 -0700
> @@ -61,7 +61,7 @@
>  $(SUPPORT_OUTPUTDIR)/rmic/* $(TOPDIR)/src/*/share/doc/stub)
> 
>  # URLs
> -JAVADOC_BASE_URL := 
> https://www.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
> +JAVADOC_BASE_URL := 
> https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
>  BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
>  COPYRIGHT_URL := {@docroot}/../legal/copyright.html
>  LICENSE_URL := 
> https://www.oracle.com/technetwork/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
> diff -r 3152b928769d make/jdk/src/classes/build/tools/taglet/ExtLink.java
> --- a/make/jdk/src/classes/build/tools/taglet/ExtLink.java  Mon Oct 29 
> 11:05:45 2018 -0700
> +++ b/make/jdk/src/classes/build/tools/taglet/ExtLink.java  Mon Oct 29 
> 11:45:11 2018 -0700
> @@ -48,7 +48,7 @@
>   * will produce the following html
>   * 
>   * {@code
> - * Please see  href="https://www.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
> spectacular sight.
> + * Please see  href="https://docs.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
> spectacular sight.
>   * }
>   */
>  public class ExtLink implements Taglet {
> @@ -63,7 +63,7 @@
> 
>  static final String TAG_NAME = "extLink";
> 
> -static final String URL = 
> "https://www.oracle.com/pls/topic/lookup?ctx=javase"; +
> +static final String URL = 
> "https://docs.oracle.com/pls/topic/lookup?ctx=javase"; +
>  SPEC_VERSION + "&id=";
> 
>  static final Pattern TAG_PATTERN = 
> Pattern.compile("(?s)(\\s*)(?\\w+)(\\s+)(?.*)$");
> 

 
  

 Lance Andersen| 
Principal Member of Technical Staff | +1.781.442.2037
Oracle Java Engineering 
1 Network Drive 
Burlington, MA 01803
lance.ander...@oracle.com 





Re: RFR: XXS: JDK-8213102: Oracle Unilinks are [301 Moved Permanently] to https://docs.oracle.com

2018-10-29 Thread Mandy Chung

+1

Mandy

On 10/29/18 11:57 AM, Jonathan Gibbons wrote:
Please review the following simple fix to change the host for Oracle 
Unilinks from www.oracle.com to docs.oracle.com to avoid unnecessary 
redirects.


JBS: https://bugs.openjdk.java.net/browse/JDK-8213102

The fix was done with the following command:

grep -rl oracle.com/pls open/make | xargs sed --in-place 
's|www.oracle.com/pls|docs.oracle.com/pls|g'


-- Jon


Patch inline:

$ hg diff -R open
diff -r 3152b928769d make/Docs.gmk
--- a/make/Docs.gmk Mon Oct 29 11:05:45 2018 -0700
+++ b/make/Docs.gmk Mon Oct 29 11:45:11 2018 -0700
@@ -61,7 +61,7 @@
 $(SUPPORT_OUTPUTDIR)/rmic/* $(TOPDIR)/src/*/share/doc/stub)

 # URLs
-JAVADOC_BASE_URL := 
https://www.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
+JAVADOC_BASE_URL := 
https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage

 BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
 COPYRIGHT_URL := {@docroot}/../legal/copyright.html
 LICENSE_URL := 
https://www.oracle.com/technetwork/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html

diff -r 3152b928769d make/jdk/src/classes/build/tools/taglet/ExtLink.java
--- a/make/jdk/src/classes/build/tools/taglet/ExtLink.java Mon Oct 29 
11:05:45 2018 -0700
+++ b/make/jdk/src/classes/build/tools/taglet/ExtLink.java Mon Oct 29 
11:45:11 2018 -0700

@@ -48,7 +48,7 @@
  * will produce the following html
  * 
  * {@code
- * Please see href="https://www.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
spectacular sight.
+ * Please see href="https://docs.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
spectacular sight.

  * }
  */
 public class ExtLink implements Taglet {
@@ -63,7 +63,7 @@

 static final String TAG_NAME = "extLink";

-    static final String URL = 
"https://www.oracle.com/pls/topic/lookup?ctx=javase"; +
+    static final String URL = 
"https://docs.oracle.com/pls/topic/lookup?ctx=javase"; +

 SPEC_VERSION + "&id=";

 static final Pattern TAG_PATTERN = 
Pattern.compile("(?s)(\\s*)(?\\w+)(\\s+)(?.*)$");






Re: RFR: XXS: JDK-8213102: Oracle Unilinks are [301 Moved Permanently] to https://docs.oracle.com

2018-10-29 Thread Erik Joelsson

Looks good.

/Erik


On 2018-10-29 11:57, Jonathan Gibbons wrote:
Please review the following simple fix to change the host for Oracle 
Unilinks from www.oracle.com to docs.oracle.com to avoid unnecessary 
redirects.


JBS: https://bugs.openjdk.java.net/browse/JDK-8213102

The fix was done with the following command:

grep -rl oracle.com/pls open/make | xargs sed --in-place 
's|www.oracle.com/pls|docs.oracle.com/pls|g'


-- Jon


Patch inline:

$ hg diff -R open
diff -r 3152b928769d make/Docs.gmk
--- a/make/Docs.gmk Mon Oct 29 11:05:45 2018 -0700
+++ b/make/Docs.gmk Mon Oct 29 11:45:11 2018 -0700
@@ -61,7 +61,7 @@
 $(SUPPORT_OUTPUTDIR)/rmic/* $(TOPDIR)/src/*/share/doc/stub)

 # URLs
-JAVADOC_BASE_URL := 
https://www.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
+JAVADOC_BASE_URL := 
https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage

 BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
 COPYRIGHT_URL := {@docroot}/../legal/copyright.html
 LICENSE_URL := 
https://www.oracle.com/technetwork/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html

diff -r 3152b928769d make/jdk/src/classes/build/tools/taglet/ExtLink.java
--- a/make/jdk/src/classes/build/tools/taglet/ExtLink.java Mon Oct 29 
11:05:45 2018 -0700
+++ b/make/jdk/src/classes/build/tools/taglet/ExtLink.java Mon Oct 29 
11:45:11 2018 -0700

@@ -48,7 +48,7 @@
  * will produce the following html
  * 
  * {@code
- * Please see href="https://www.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
spectacular sight.
+ * Please see href="https://docs.oracle.com/pls/topic/lookup?ctx=javase10&id=Borealis";>a 
spectacular sight.

  * }
  */
 public class ExtLink implements Taglet {
@@ -63,7 +63,7 @@

 static final String TAG_NAME = "extLink";

-    static final String URL = 
"https://www.oracle.com/pls/topic/lookup?ctx=javase"; +
+    static final String URL = 
"https://docs.oracle.com/pls/topic/lookup?ctx=javase"; +

 SPEC_VERSION + "&id=";

 static final Pattern TAG_PATTERN = 
Pattern.compile("(?s)(\\s*)(?\\w+)(\\s+)(?.*)$");