Updating various old/moved URL references found across project (`jetty-10.0.x`) #10098

joakime · 2023-07-11T20:53:29Z

Now that the migration of https://eclipse.org/jetty/ to https://eclipse.dev/jetty/ has occurred, it is time to review the URI use in our project

Updated URLs in poms
Added more URIs to XmlConfiguration
Updated URLs in module files
Updated URLs in documentation
Updated URLs in HTML
Correcting bad double-scheme URLs (eg: http://https://www.eclipse...)

…lipse.dev/jetty/` has occurred, it is time to review the URI use in our project + Updated URLs in poms + Added more URIs to XmlConfiguration + Updated URLs in module files + Updated URLs in documentation + Updated URLs in HTML + Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

gregw

mostly good, just a small change to language needed.

gregw · 2023-07-12T08:15:10Z

apache-jsp/src/main/config/modules/apache-jsp.mod

@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - Use start modules correctly - See: https://eclipse.dev/jetty/documentation/


I think the "Use start modules correctly" is a bit scolding. Let's keep it factual:

Suggested change

# DO NOT EDIT THIS FILE - Use start modules correctly - See: https://eclipse.dev/jetty/documentation/

# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

We removed the reference to /current/startup-modules.html as that is no longer a valid URL.

Pointing to the documentation alone is insufficient. (what do they look for?)
Perhaps it should read ...

# DO NOT EDIT THIS FILE - See startup modules documentation at https://eclipse.dev/jetty/documentation/

Or ...

# DO NOT EDIT THIS FILE - See Jetty Start Mechanism in Operations Guide at https://eclipse.dev/jetty/documentation/

Or ...

# DO NOT EDIT THIS FILE # See https://eclipse.dev/jetty/documentation/ > Operations Guide > Jetty Start Mechanism

'/current' under the documentation is really old and not a maintained documentation URL atm (last updated 3 yrs ago)

Look here for current exposed layout.

That is how things are currently structured, talking with @sbordet and @lorban yesterday we agreed we should remove the content under '/current' and just provide a redirect to '/documentation'

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

This reverts commit 4a02e22.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

jmcc0nn3ll

Fine to commit, though I do prefer the more descriptive language in an earlier suggestion of yours. Gives people some direction on where to go regardless of major Jetty version.

See https://eclipse.dev/jetty/documentation/ > Operations Guide > Jetty Start Mechanism

demos/embedded/src/main/resources/demo/webdefault.xml

jetty-webapp/src/main/config/etc/webdefault.xml

sbordet · 2023-07-13T12:15:10Z

jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java

@@ -1896,7 +1896,7 @@ else if (arg.toLowerCase(Locale.ENGLISH).endsWith(".properties"))
        }
    }

-    private static class ConfigurationParser extends XmlParser implements AutoCloseable
+    protected static class ConfigurationParser extends XmlParser implements AutoCloseable


I think this could go back to private, and modify getParser() to return XmlParser which is a public class. See also comment in XmlConfigurationTest.

Done.
Since ConfigurationParser was closeable, and XmlParser isn't, I had to juggle that requirement too.

sbordet · 2023-07-13T12:24:09Z

jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java

+    {
+        // empty raw xml, just to instantiate XmlConfiguration, so we can access the ConfigurationParser.
+        XmlConfiguration xmlConfiguration = asXmlConfiguration("<Configure class=\"org.eclipse.jetty.xml.TestConfiguration\" />");
+        XmlConfiguration.ConfigurationParser configurationProcessor = xmlConfiguration.getParser();


I would rename getParser() to getXmlParser() and return type to be XmlParser, which is already a public class.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime

Found a few more things to correct

demos/demo-jaas-webapp/src/main/webapp/login.html

demos/demo-jetty-webapp/src/main/webapp/auth.html

demos/demo-jetty-webapp/src/main/webapp/index.html

demos/demo-jetty-webapp/src/main/webapp/remote.html

demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html

demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html

demos/demo-template/src/main/resources/index.html

documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc

jetty-deploy/src/test/resources/jetty.xml

jetty-home/src/main/resources/modules/demo.d/root/index.html

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

sbordet · 2023-07-13T20:13:42Z

documentation/jetty-documentation/pom.xml

@@ -72,7 +72,7 @@
            <version>${project.version}</version>
            <prog-guide>../programming-guide/index.html</prog-guide>
            <op-guide>../operations-guide/index.html</op-guide>
-            <javadoc-url>https://www.eclipse.org/jetty/javadoc/jetty-10</javadoc-url>
+            <javadoc-url>https://eclipse.dev/jetty/javadoc/jetty-12</javadoc-url>


Should be /jetty-10 at the end (and changed during merging forward).

Yeah, I caught the other one I changed too early, missed this one.

#10098 (comment)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime · 2023-07-13T20:41:16Z

Notes for merging:

These version references need to be updated in each merge.

https://github.com/eclipse/jetty.project/blob/17d69ee75120d2002228902268f225a7e42a9c55/documentation/jetty-documentation/pom.xml#L75

https://github.com/eclipse/jetty.project/blob/50eaa8164fbe18b79de384f31dd299d44889119d/pom.xml#L842-L845

https://github.com/eclipse/jetty.project/blob/50eaa8164fbe18b79de384f31dd299d44889119d/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml#L16

joakime · 2023-07-13T20:42:11Z

@sbordet sorry, I found a few more bad jetty version in URL references, fixed in commit 50eaa81

Your last approval got dismissed because of it.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime · 2023-07-13T20:57:43Z

documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc

+| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | End of Community Support | Servlet 3.1 | Java 8
+| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | End of Life | Servlet 3.1 | Java 8
+| jetty-8 | Historical | Servlet 3.1 | Java 6
+| jetty-7 | Mythical | Servlet 2.5 | Java 5


The title of this table is "Active Eclipse Jetty Branches".

I don't think jetty-8 and jetty-7 make the grade for this table.

And even jetty-9.3.x isn't considered "Active" anymore.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Stale review - requested changes have been applied, this is holding up the ability to merge.

…w-eclipse.dev-uris

* Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098) + Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project + Updated URLs in poms + Added more URIs to XmlConfiguration + Updated URLs in module files + Updated URLs in documentation + Updated URLs in HTML + Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`) + Updating text in *.mod files + Removing `/current/` from path `/jetty/documentation/current/` + Fixing mailing list URL + Fixing github URL references in jsps --------- Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…y-10.0.x`) (#10098) * Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project + Added more URIs to XmlConfiguration --------- Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…er` in `XmlParser` (#10299) Backports of * Issue #10066 - Allow customization of `SAXParserFactory` and `SAXParser` in `XmlParser` (#10067) * Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098) Consisting of * Allow customization of SAXParserFactory / SAXParser in XmlParser * Introduce method `.getSAXParser()` * Prepending doctype in testcases * More comprehensive changes to redirectEntity config * Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098) * Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project * Added more URIs to XmlConfiguration * Better SAXParseException handling to report resource that is causing the problem * Add missing DOCTYPE declarations * Enforcing unique XML ids --------- Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Co-authored-by: Greg Wilkins <gregw@webtide.com>

joakime added the Build label Jul 11, 2023

joakime added this to the 10.0.x milestone Jul 11, 2023

joakime requested review from jmcc0nn3ll, sbordet and lorban July 11, 2023 20:53

joakime self-assigned this Jul 11, 2023

gregw previously requested changes Jul 12, 2023

View reviewed changes

lorban previously approved these changes Jul 12, 2023

View reviewed changes

lorban mentioned this pull request Jul 12, 2023

Updating various old/moved URL references found across project (jetty-12.0.x) #10096

Closed

Updating text in *.mod files

4a02e22

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime dismissed lorban’s stale review via 4a02e22 July 12, 2023 21:17

joakime added 2 commits July 12, 2023 17:32

Revert "Updating text in *.mod files"

97befa1

This reverts commit 4a02e22.

Updating text in *.mod files

e904a9e

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime requested review from gregw and lorban July 13, 2023 09:41

jmcc0nn3ll reviewed Jul 13, 2023

View reviewed changes

sbordet requested changes Jul 13, 2023

View reviewed changes

joakime added 2 commits July 13, 2023 13:26

More www.eclipse.org to eclipse.dev changes

7f0d3d9

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Applying changes from review

6a6ace9

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime requested a review from sbordet July 13, 2023 18:36

joakime commented Jul 13, 2023

View reviewed changes

joakime added 2 commits July 13, 2023 14:14

Removing /current/ from path /jetty/documentation/current/

dfd85d5

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Fixing mailing list URL

3406817

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

sbordet requested changes Jul 13, 2023

View reviewed changes

Revert change back to javadoc/jetty-10

17d69ee

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime requested a review from sbordet July 13, 2023 20:35

sbordet previously approved these changes Jul 13, 2023

View reviewed changes

Use jetty-10 references

50eaa81

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime dismissed sbordet’s stale review via 50eaa81 July 13, 2023 20:40

joakime requested a review from sbordet July 13, 2023 20:41

sbordet previously approved these changes Jul 13, 2023

View reviewed changes

Updating 3-source.adoc

25d1b3a

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

joakime dismissed sbordet’s stale review via 25d1b3a July 13, 2023 20:56

joakime commented Jul 13, 2023

View reviewed changes

joakime requested a review from sbordet July 13, 2023 21:10

Updates from review

d5ba4de

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

sbordet approved these changes Jul 14, 2023

View reviewed changes

Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/10.0.x/ne…

1c28500

…w-eclipse.dev-uris

joakime merged commit a9c596e into jetty-10.0.x Jul 14, 2023
4 checks passed

joakime deleted the fix/10.0.x/new-eclipse.dev-uris branch July 14, 2023 17:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updating various old/moved URL references found across project (`jetty-10.0.x`) #10098

Updating various old/moved URL references found across project (`jetty-10.0.x`) #10098

joakime commented Jul 11, 2023

gregw left a comment

gregw Jul 12, 2023

joakime Jul 12, 2023

joakime Jul 12, 2023

joakime Jul 12, 2023

jmcc0nn3ll Jul 12, 2023

jmcc0nn3ll left a comment

sbordet Jul 13, 2023

joakime Jul 13, 2023

sbordet Jul 13, 2023

joakime Jul 13, 2023

joakime left a comment

sbordet Jul 13, 2023

joakime Jul 13, 2023

joakime Jul 13, 2023

joakime commented Jul 13, 2023

joakime commented Jul 13, 2023 •

edited

joakime Jul 13, 2023

joakime Jul 13, 2023

		@@ -1,4 +1,4 @@
		# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
		# DO NOT EDIT THIS FILE - Use start modules correctly - See: https://eclipse.dev/jetty/documentation/

	# DO NOT EDIT THIS FILE - Use start modules correctly - See: https://eclipse.dev/jetty/documentation/
	# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/

Updating various old/moved URL references found across project (jetty-10.0.x) #10098

Updating various old/moved URL references found across project (jetty-10.0.x) #10098

Conversation

joakime commented Jul 11, 2023

gregw left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jmcc0nn3ll left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joakime left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joakime commented Jul 13, 2023

joakime commented Jul 13, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Updating various old/moved URL references found across project (`jetty-10.0.x`) #10098

Updating various old/moved URL references found across project (`jetty-10.0.x`) #10098

joakime commented Jul 13, 2023 •

edited