Skip to content

Commit

Permalink
Update URLs for new jetty locations
Browse files Browse the repository at this point in the history
  • Loading branch information
joakime committed Jun 21, 2024
1 parent 25bb6a2 commit e0dd454
Show file tree
Hide file tree
Showing 22 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand All @@ -21,7 +21,7 @@
</center>
<h1>JAAS Demo</h1>
<p>
This is a demo webapp for the <a href="http://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://jetty.org/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.

It uses a simple login module that stores its configuration in a properties file.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand All @@ -20,7 +20,7 @@
</center>
<h1>Eclipse Jetty Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://jetty.org/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>

<h2>Jetty Tests:</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<!-- Change source to suit -->
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<!-- Change source to suit -->
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* Note that the same java compiler will be used as for on-the-fly compiled
* jsps, which will be the Eclipse java compiler.
* <p>
* See <a href="https://eclipse.dev/jetty/documentation/">Usage Guide</a> for
* See <a href="https://jetty.org/docs/">Usage Guide</a> for
* instructions on using this plugin.
* </p>
* Runs jspc compiler to produce .java and .class files
Expand Down
2 changes: 1 addition & 1 deletion jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l
Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion.

To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception:
https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-ee11-osgi/jetty-ee11-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163
https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-ee11-osgi/jetty-ee11-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163

When you do this, you get output like the following:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ public static void main(String[] args)
{
System.err.println("WARNING: jetty-runner is deprecated.");
System.err.println(" See Jetty Documentation for startup options");
System.err.println(" https://eclipse.dev/jetty/documentation/");
System.err.println(" https://jetty.org/docs/");

Runner runner = new Runner();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void testEncoderDecoder() throws Exception
}

@Test
@Disabled("See issue https://github.com/eclipse/jetty.project/issues/6174")
@Disabled("See issue https://github.com/jetty/jetty.project/issues/6174")
public void testHttpSessionInjection() throws Exception
{
start((servletContext, wsContainer) -> wsContainer.addEndpoint(CdiHttpSessionSocket.class));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* A SCI that tosses an Error to intentionally to cause issues with the DeploymentManager
*
* @see <a href="https://github.com/eclipse/jetty.project/issues/1602">Issue #1602</a>
* @see <a href="https://github.com/jetty/jetty.project/issues/1602">Issue #1602</a>
*/
public class DeploymentErrorInitializer implements ServletContainerInitializer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ public void test81() throws Exception
*
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206
@Disabled //TODO https://github.com/jetty/jetty.project/issues/9206
@Test
public void test82ExpectInvalid() throws Exception
{
Expand All @@ -690,7 +690,7 @@ public void test82ExpectInvalid() throws Exception
*
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206
@Disabled //TODO https://github.com/jetty/jetty.project/issues/9206
@Test
public void test82ExpectWithBody() throws Exception
{
Expand Down Expand Up @@ -719,7 +719,7 @@ public void test82ExpectWithBody() throws Exception
* @throws Exception failure
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206
@Disabled //TODO https://github.com/jetty/jetty.project/issues/9206
@Test
public void test82UnexpectWithBody() throws Exception
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<!-- Change source to suit -->
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-12.0.x/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/">Source</a>
<a class="menu" href="https://jetty.org/">Jetty Project Home</a>
<a class="menu" href="https://jetty.org/docs/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void testReloadWebAppWithLog4j2() throws Exception
Path webappsDir = distribution.getJettyBase().resolve("webapps");
String warXml = """
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
<Set name="contextPath">/test</Set>
<Set name="war"><Property name="jetty.webapps"/>/test.war</Set>
Expand Down

0 comments on commit e0dd454

Please sign in to comment.