Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Servlet 6.x (EE11) demos #12678

Merged
merged 24 commits into from
Jan 18, 2025
Merged

Servlet 6.x (EE11) demos #12678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
532a3c6
Fix servlet 6.x demos
gregw Jan 8, 2025
d97e865
Fix servlet 6.x demos
gregw Jan 8, 2025
76afaa3
Fix servlet 6.x demos
gregw Jan 8, 2025
4b5e187
Fix servlet 6.x demos
gregw Jan 8, 2025
b6619f0
Fix servlet 6.x demos
gregw Jan 8, 2025
e5529d6
Fix servlet 6.x demos
gregw Jan 9, 2025
9a6d14c
Fix servlet 6.x demos
gregw Jan 9, 2025
90cff59
Fix servlet 6.x demos
gregw Jan 11, 2025
0630c48
Fix servlet 6.x demos
gregw Jan 11, 2025
7ccb621
spotless
gregw Jan 11, 2025
10324ad
Fix servlet 6.x demos
gregw Jan 11, 2025
cb1a76a
Fix servlet 6.x demos
gregw Jan 12, 2025
35d58fc
#12681 atomically retain the buffer with a check that it still is in …
lorban Jan 13, 2025
c074a30
#12681 remove invalid comment
lorban Jan 13, 2025
00c249f
#12681 add tests
lorban Jan 13, 2025
f6dc52e
Fix servlet 6.x demos
gregw Jan 13, 2025
0d5038a
Merge branch 'jetty-12.1.x' into fix/jetty-12.1.x/serlvet6-demos
gregw Jan 13, 2025
5744f05
Merge remote-tracking branch 'origin/fix/jetty-12.1.x/12681-cached-co…
gregw Jan 13, 2025
f3f8f80
Merge remote-tracking branch 'origin/fix/jetty-12.1.x/12681-cached-co…
gregw Jan 13, 2025
cf18662
rename
gregw Jan 14, 2025
b5b1074
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/jetty-12.…
gregw Jan 15, 2025
313114b
fix module
gregw Jan 15, 2025
93b1c57
fix module
gregw Jan 16, 2025
8a9c1f2
updates from review
gregw Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion ...re/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ private void shrinkCache()
});
sorted.addAll(_cache.values());

// TODO: Can we remove the buffers from the content before evicting.
// Invalidate least recently used first
for (CachingHttpContent content : sorted)
{
Expand Down
114 changes: 32 additions & 82 deletions ...11-demos/jetty-ee11-demo-embedded/pom.xml → ...emos/jetty-servlet6-demo-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,151 +2,101 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demos</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet6-demos</artifactId>
<version>12.1.0-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee11-demo-embedded</artifactId>
<name>EE11 :: Demo :: Embedded Jetty</name>
<description>Embedded Jetty Demos</description>
<artifactId>jetty-servlet6-demo-embedded</artifactId>
<packaging>war</packaging>
<name>Servlet 6 :: Demo :: Embedded</name>
<description>Embedded Jetty Servlet 6 Demos</description>
<properties>
<bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<scope>compile</scope>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${ee11.jakarta.servlet.api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<artifactId>jetty-alpn-java-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<artifactId>jetty-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-annotations</artifactId>
<artifactId>jetty-slf4j-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-apache-jsp</artifactId>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-servlet6-demo-mock-resources</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-glassfish-jstl</artifactId>
<artifactId>jetty-ee11-annotations</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-plus</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-proxy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-servlets</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demo-mock-resources</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demo-simple-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.demos</groupId>
<artifactId>jetty-ee11-demo-spec-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jakarta-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-servlet</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-jetty-client</artifactId>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
0 ...etty-ee10-demo-embedded/prodDb.properties → ...-servlet6-demo-embedded/prodDb.properties
View file
Open in desktop
File renamed without changes.
0 ...os/jetty-ee10-demo-embedded/prodDb.script → ...etty-servlet6-demo-embedded/prodDb.script
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...pse/jetty/ee9/demos/AsyncEchoServlet.java → ...y/servlet6/embedded/AsyncEchoServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// ========================================================================
//

package org.eclipse.jetty.ee9.demos;
package org.eclipse.jetty.servlet6.embedded;

import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down
2 changes: 1 addition & 1 deletion .../eclipse/jetty/ee9/demos/DumpServlet.java → .../jetty/servlet6/embedded/DumpServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// ========================================================================
//

package org.eclipse.jetty.ee9.demos;
package org.eclipse.jetty.servlet6.embedded;

import java.io.IOException;
import java.io.PrintWriter;
Expand Down
Loading
Loading