-The Java Champions Program consists of a unique group of skilled Java technologists and community leaders sponsored by Oracle. Java Champions come from a broad cross-section of the Java community. They are leaders, influencers and enablers who help grow the size of the Java community. Java Champions are active in many ways such as actively participating in Java projects, engaging with Java User Group communities, speaking at conferences, authoring content, teaching other developers, fostering inclusive participation and so much more.
+The Java Champions Program consists of a unique group of skilled Java technologists and community leaders. Java Champions come from a broad cross-section of the Java community. They are leaders, influencers and enablers who help grow the size of the Java community. Java Champions are active in many ways such as actively participating in Java projects, engaging with Java User Group communities, speaking at conferences, authoring content, teaching other developers, fostering inclusive participation and so much more.
-They are technical and community luminaries; some are Java engineers or architects who are relatively skilled and has lots of experience, or are community builders who take time to build personal, long-lasting relationships that go beyond programming. Java Champions are independent-minded and credible, who embody the best virtues of the Java community including honesty, dedication and sincerity.
+They are technical and community luminaries; some are Java engineers or architects who are relatively skilled and have lots of experience, or are community builders who take time to build personal, long-lasting relationships that go beyond programming. Java Champions are independent-minded and credible, who embody the best virtues of the Java community including honesty, dedication and sincerity.
Java Champions are also able to advocate or influence other developers through their own professional activities (via consulting, teaching, writing, speaking, etc.). They have the opportunity to provide independent, constructive feedback and ideas absent of a competitive agenda that will help Oracle continue to move Java forward. This interchange may be in the form of technical discussions and/or community-building activities with Oracle's Java Advocacy Team.
diff --git a/app/pages/future/innovation/index.md b/app/pages/future/innovation/index.md
index e86051e..8825b54 100644
--- a/app/pages/future/innovation/index.md
+++ b/app/pages/future/innovation/index.md
@@ -7,11 +7,11 @@ subheader_select: innovation
## Amber
-The goal of Project Amber is to explore and incubate smaller, productivity-oriented Java language features that have been accepted as candidate JEPs under the [OpenJDK JEP process](https://openjdk.java.net/jeps/1). This Project is sponsored by the [Compiler Group](https://openjdk.java.net/groups/compiler/).
+The goal of Project Amber is to explore and incubate smaller, productivity-oriented Java language features that have been accepted as candidate JEPs under [JDK Enhancement-Proposal & Roadmap Process](jep:1). This Project is sponsored by the [Compiler Group](https://openjdk.org/groups/compiler/).
-Most Project Amber features go through at least one round of Preview before becoming an official part of Java SE. See [JEP 12](https://openjdk.java.net/jeps/12) for an explanation of the Preview process, and [our tutorial](id:new_features.using_preview) on how to use preview features. For a given feature, there are separate JEPs for each round of preview and for final standardization.
+Most Project Amber features go through at least one round of Preview before becoming an official part of Java SE. See [Preview Features](jep:12) for an explanation of the Preview process, and [our tutorial](id:new_features.using_preview) on how to use preview features. For a given feature, there are separate JEPs for each round of preview and for final standardization.
-Learn more at Project Amber's [Wiki](https://openjdk.java.net/projects/amber/), as well as Inside.java's [Amber page](https://inside.java/tag/amber).
+Learn more at Project Amber's [Wiki](https://openjdk.org/projects/amber/), as well as Inside.java's [Amber page](https://inside.java/tag/amber).
## Loom
@@ -23,7 +23,7 @@ Project Loom is to intended to explore, incubate and deliver Java VM features an
This OpenJDK project is sponsored by the HotSpot Group.
-Learn more at Project Loom's [Wiki](https://wiki.openjdk.java.net/display/loom/Main), as well as Inside.java's [Loom page](https://inside.java/tag/loom).
+Learn more at Project Loom's [Wiki](https://wiki.openjdk.org/display/loom/Main), as well as Inside.java's [Loom page](https://inside.java/tag/loom).
## Panama
@@ -43,7 +43,7 @@ To this end, Project Panama will include most or all of these components:
* tooling or wrapper interposition for safety
* exploratory work with difficult-to-integrate native libraries
-Learn more at Project Panama's [Wiki](https://openjdk.java.net/projects/panama/), as well as Inside.java's [Panama page](https://inside.java/tag/panama).
+Learn more at Project Panama's [Wiki](https://openjdk.org/projects/panama/), as well as Inside.java's [Panama page](https://inside.java/tag/panama).
## Valhalla
@@ -58,7 +58,7 @@ The three main goals are:
A number of people describe Valhalla recently as being "primarily about performance". While it is understandable why people might come to that conclusion -- many of the motivations for Valhalla are, in fact, rooted in performance considerations -- this characterization misses something very important. Yes, performance is an important part of the story -- but so are safety, abstraction, encapsulation, expressiveness, maintainability, and compatible library evolution.
-Learn more at the Valhalla Project [Wiki](https://wiki.openjdk.java.net/display/valhalla/Main), as well as Inside.java's [Valhalla page](https://inside.java/tag/valhalla).
+Learn more at the Valhalla Project [Wiki](https://wiki.openjdk.org/display/valhalla/Main), as well as Inside.java's [Valhalla page](https://inside.java/tag/valhalla).
## ZGC
@@ -81,5 +81,5 @@ At a glance, ZGC is:
At its core, ZGC is a concurrent garbage collector, meaning all heavy lifting work is done while Java threads continue to execute. This greatly limits the impact garbage collection will have on your application's response time.
-Learn more at the ZGC [Wiki](https://wiki.openjdk.java.net/display/zgc/Main), as well as Inside.java's [GC page](https://inside.java/tag/gc).
+Learn more at the ZGC [Wiki](https://wiki.openjdk.org/display/zgc/Main), as well as Inside.java's [GC page](https://inside.java/tag/gc).
diff --git a/app/pages/learn/01_tutorial/01_your-first-java-app/01_getting-started-with-java.md b/app/pages/learn/01_tutorial/01_your-first-java-app/01_getting-started-with-java.md
index e0c1c3d..a26a943 100644
--- a/app/pages/learn/01_tutorial/01_your-first-java-app/01_getting-started-with-java.md
+++ b/app/pages/learn/01_tutorial/01_your-first-java-app/01_getting-started-with-java.md
@@ -24,7 +24,6 @@ toc:
- Going Further {going-further}
description: "Downloading and setting up the JDK, writing your first Java class, and creating your first Java application."
last_update: 2022-10-29
-author: ["JoséPaumard"]
---
diff --git a/app/templates/pages/learn/tutorial.html b/app/templates/pages/learn/tutorial.html
index 06943e1..0deb60d 100644
--- a/app/templates/pages/learn/tutorial.html
+++ b/app/templates/pages/learn/tutorial.html
@@ -19,8 +19,7 @@
+ {% include "app/templates/partials/_author_byline.html" %} {% endif %}
{{ file.fm.title_html | safe }}
{% if file.fm.author %} - This page was contributed by {{ file.data.authorsMap[file.fm.author].name }} under the UPL -+ {% include "app/templates/partials/_author_byline.html" %} {% endif %}
diff --git a/app/templates/partials/_author_byline.html b/app/templates/partials/_author_byline.html
new file mode 100644
index 0000000..5f5aee4
--- /dev/null
+++ b/app/templates/partials/_author_byline.html
@@ -0,0 +1,14 @@
+
+This page was contributed by
+
+{% if file.fm.author | length > 0 %}
+ {% for author in file.fm.author %}
+ {{ file.data.authorsMap[author].name }} {% if not loop.last %}and{% endif %}
+ {% endfor %}
+{% else %}
+ {{ file.data.authorsMap[file.fm.author].name }}
+{% endif %}
+
+under the UPL {{ file.fm.byline | safe }}
+
+
\ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index d399ea6..81d9800 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -26,6 +26,9 @@ for (const author of authorsArray) { } var javadoc = require('./app/data/javadoc.json') +var javafxdoc = require('./app/data/javafxdoc.json') +var jep = require('./app/data/jep.json') + function getAuthorID(name) { return name.replace(/\s/g, '') @@ -145,6 +148,14 @@ function pre_process_pages() { "path": processedLink, "title_html": text }) + } else if (link_id != null && javafxdoc[link_id[1]]) { + console.log(javafxdoc[link_id[1]]); + let processedLink = processDocLink(javafxdoc[link_id[1]]["link"]); + let text = javafxdoc[link_id[1]]["text"] + tutorials["tutorials"][group]["doc_links"].push({ + "path": processedLink, + "title_html": text + }) } let page_id = link.match(/related_page:([\w|\.|-]+)/); if (page_id != null && link_map.get(page_id[1])) { @@ -163,7 +174,15 @@ function pre_process_pages() { .pipe(data(function (file) { if (file.fm.author) { - authorsMap[file.fm.author].tutorials.push(file.fm.id); + if (file.fm.author.length > 1) { + console.log("Adding tutorial " + file.fm.id + " to multiple authors: " + file.fm.author); + for (const author of file.fm.author) { + authorsMap[author].tutorials.push(file.fm.id); + } + } else { + console.log("Adding tutorial " + file.fm.id + " to single author: " + file.fm.author); + authorsMap[file.fm.author].tutorials.push(file.fm.id); + } } })) } @@ -205,6 +224,17 @@ function pages() { } } + if (href.includes("javafxdoc:")) { + let javafxdoc_id = href.match(/javafxdoc:([\w\.\-(),]+)/) + if (javafxdoc_id != null) { + processedHref = processJavaFxDocLink(javafxdoc["javafxdoc_root"] + javafxdoc[javafxdoc_id[1]]); + if (processedHref.includes("undefined")) { + console.log("JavaFX Javadoc " + javafxdoc_id[1] + " resolved to undefined"); + } + return `${text}`; + } + } + if (href.includes("doc:")) { let doc_id = href.match(/doc:([\w\.\-(),]+)/); @@ -222,7 +252,37 @@ function pages() { } } + if (href.includes("jep:")) { + let jep_id = href.match(/jep:([\d]+)/); + if (jep_id != null) { + if (jep[jep_id[1]] == undefined) { + console.log("JEP " + jep_id[1] + " is not defined"); + } else { + processedHref = jep["root"] + jep_id[1]; + let anchor = href.match(/#[\w|-]+/); + if (anchor) { + processedHref = processedHref + anchor; + } + if (jep[jep_id[1]]["status"] == "preview" && jep[jep_id[1]]["version"] != javadoc["current_release"]) { + console.log( + "Current release is " + javadoc["current_release"] + ", JEP " + jep_id[1] + + " is a preview of " + jep[jep_id[1]]["version"] + " and still referenced"); + } + if (jep[jep_id[1]]["status"] == "incubator" && jep[jep_id[1]]["version"] != javadoc["current_release"]) { + console.log( + "Current release is " + javadoc["current_release"] + ", JEP " + jep_id[1] + + " is an incubator of " + jep[jep_id[1]]["version"] + " and still referenced"); + } + if (jep[jep_id[1]]["title"]) { + text = "JEP " + jep_id[1] + ": " + jep[jep_id[1]]["title"]; + } else { + text = "JEP " + jep_id[1] + ": " + jep[jep_id[1]]; + } + return `${text}`; + } + } + } if (title) { link = `${text}`; @@ -284,7 +344,7 @@ function pages() { .pipe(data(function (file) { if (file.fm.toc) { - const section_name_regex = /^[\s|\w|/|,]+[^{|^\s{]+/; + const section_name_regex = /^[\s\w.,|]+[^{|^\s{]+/; const anchor_regex = /{([^{|^}]+)}/; file.fm.toc = file.fm.toc .map(entry => ({ @@ -373,6 +433,10 @@ function processDocLink(link) { return link.replace("@@CURRENT_RELEASE@@", javadoc[`current_release`]); } +function processJavaFxDocLink(link) { + return link.replace("@@CURRENT_RELEASE@@", javafxdoc[`current_release`]).replace("@@RELEASE_UUID@@", javafxdoc[`release_uuid`]); +} + function is_tutorial(file) { return file.fm.type == "tutorial" || file.fm.type == "tutorial-group"; @@ -386,10 +450,10 @@ function serve(done) { } }); - watch("app/**/*.md", {}, series(build)); - watch("app/**/*.html", {}, series(build)); - watch("app/scss/*.scss", {}, series(build)); - watch("site/**/", {}, browserSync.reload()); + watch("app/**/*.md", {interval: 1000, usePolling: true}, series(build)); + watch("app/**/*.html", {interval: 1000, usePolling: true}, series(build)); + watch("app/scss/*.scss", {interval: 1000, usePolling: true}, series(build)); + watch("site/**/", {interval: 1000, usePolling: true}, browserSync.reload()); done(); } diff --git a/package-lock.json b/package-lock.json index 7a9c501..6029cab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,8 @@ }, "devDependencies": { "dotenv": "^16.0.3", - "gulp-markdown-toc": "^1.1.0" + "gulp-markdown-toc": "^1.1.0", + "gulp-util": "^3.0.8" } }, "node_modules/-": { diff --git a/package.json b/package.json index 8fa098a..62f4815 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ }, "devDependencies": { "dotenv": "^16.0.3", - "gulp-markdown-toc": "^1.1.0" + "gulp-markdown-toc": "^1.1.0", + "gulp-util": "^3.0.8" } }
\ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index d399ea6..81d9800 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -26,6 +26,9 @@ for (const author of authorsArray) { } var javadoc = require('./app/data/javadoc.json') +var javafxdoc = require('./app/data/javafxdoc.json') +var jep = require('./app/data/jep.json') + function getAuthorID(name) { return name.replace(/\s/g, '') @@ -145,6 +148,14 @@ function pre_process_pages() { "path": processedLink, "title_html": text }) + } else if (link_id != null && javafxdoc[link_id[1]]) { + console.log(javafxdoc[link_id[1]]); + let processedLink = processDocLink(javafxdoc[link_id[1]]["link"]); + let text = javafxdoc[link_id[1]]["text"] + tutorials["tutorials"][group]["doc_links"].push({ + "path": processedLink, + "title_html": text + }) } let page_id = link.match(/related_page:([\w|\.|-]+)/); if (page_id != null && link_map.get(page_id[1])) { @@ -163,7 +174,15 @@ function pre_process_pages() { .pipe(data(function (file) { if (file.fm.author) { - authorsMap[file.fm.author].tutorials.push(file.fm.id); + if (file.fm.author.length > 1) { + console.log("Adding tutorial " + file.fm.id + " to multiple authors: " + file.fm.author); + for (const author of file.fm.author) { + authorsMap[author].tutorials.push(file.fm.id); + } + } else { + console.log("Adding tutorial " + file.fm.id + " to single author: " + file.fm.author); + authorsMap[file.fm.author].tutorials.push(file.fm.id); + } } })) } @@ -205,6 +224,17 @@ function pages() { } } + if (href.includes("javafxdoc:")) { + let javafxdoc_id = href.match(/javafxdoc:([\w\.\-(),]+)/) + if (javafxdoc_id != null) { + processedHref = processJavaFxDocLink(javafxdoc["javafxdoc_root"] + javafxdoc[javafxdoc_id[1]]); + if (processedHref.includes("undefined")) { + console.log("JavaFX Javadoc " + javafxdoc_id[1] + " resolved to undefined"); + } + return `${text}`; + } + } + if (href.includes("doc:")) { let doc_id = href.match(/doc:([\w\.\-(),]+)/); @@ -222,7 +252,37 @@ function pages() { } } + if (href.includes("jep:")) { + let jep_id = href.match(/jep:([\d]+)/); + if (jep_id != null) { + if (jep[jep_id[1]] == undefined) { + console.log("JEP " + jep_id[1] + " is not defined"); + } else { + processedHref = jep["root"] + jep_id[1]; + let anchor = href.match(/#[\w|-]+/); + if (anchor) { + processedHref = processedHref + anchor; + } + if (jep[jep_id[1]]["status"] == "preview" && jep[jep_id[1]]["version"] != javadoc["current_release"]) { + console.log( + "Current release is " + javadoc["current_release"] + ", JEP " + jep_id[1] + + " is a preview of " + jep[jep_id[1]]["version"] + " and still referenced"); + } + if (jep[jep_id[1]]["status"] == "incubator" && jep[jep_id[1]]["version"] != javadoc["current_release"]) { + console.log( + "Current release is " + javadoc["current_release"] + ", JEP " + jep_id[1] + + " is an incubator of " + jep[jep_id[1]]["version"] + " and still referenced"); + } + if (jep[jep_id[1]]["title"]) { + text = "JEP " + jep_id[1] + ": " + jep[jep_id[1]]["title"]; + } else { + text = "JEP " + jep_id[1] + ": " + jep[jep_id[1]]; + } + return `${text}`; + } + } + } if (title) { link = `${text}`; @@ -284,7 +344,7 @@ function pages() { .pipe(data(function (file) { if (file.fm.toc) { - const section_name_regex = /^[\s|\w|/|,]+[^{|^\s{]+/; + const section_name_regex = /^[\s\w.,|]+[^{|^\s{]+/; const anchor_regex = /{([^{|^}]+)}/; file.fm.toc = file.fm.toc .map(entry => ({ @@ -373,6 +433,10 @@ function processDocLink(link) { return link.replace("@@CURRENT_RELEASE@@", javadoc[`current_release`]); } +function processJavaFxDocLink(link) { + return link.replace("@@CURRENT_RELEASE@@", javafxdoc[`current_release`]).replace("@@RELEASE_UUID@@", javafxdoc[`release_uuid`]); +} + function is_tutorial(file) { return file.fm.type == "tutorial" || file.fm.type == "tutorial-group"; @@ -386,10 +450,10 @@ function serve(done) { } }); - watch("app/**/*.md", {}, series(build)); - watch("app/**/*.html", {}, series(build)); - watch("app/scss/*.scss", {}, series(build)); - watch("site/**/", {}, browserSync.reload()); + watch("app/**/*.md", {interval: 1000, usePolling: true}, series(build)); + watch("app/**/*.html", {interval: 1000, usePolling: true}, series(build)); + watch("app/scss/*.scss", {interval: 1000, usePolling: true}, series(build)); + watch("site/**/", {interval: 1000, usePolling: true}, browserSync.reload()); done(); } diff --git a/package-lock.json b/package-lock.json index 7a9c501..6029cab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,8 @@ }, "devDependencies": { "dotenv": "^16.0.3", - "gulp-markdown-toc": "^1.1.0" + "gulp-markdown-toc": "^1.1.0", + "gulp-util": "^3.0.8" } }, "node_modules/-": { diff --git a/package.json b/package.json index 8fa098a..62f4815 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ }, "devDependencies": { "dotenv": "^16.0.3", - "gulp-markdown-toc": "^1.1.0" + "gulp-markdown-toc": "^1.1.0", + "gulp-util": "^3.0.8" } }