Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10165 from eclipse/jetty-12.0.x-javaxSourceRename 

rename JAVAX_API to JAKARTA_API in ee9 and ee10 Source
This commit is contained in:
Lachlan 2023-08-01 11:22:44 +10:00 committed by GitHub
parent f15e4a152f 627f9f7321
commit 55e107447b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-ee10/jetty-ee10-annotations/src/test/java/org/eclipse/jetty/ee10/annotations/TestAnnotationIntrospector.java
View File

@ -51,8 +51,8 @@ public class TestAnnotationIntrospector
holder.setHeldClass(ServletE.class); holder.setHeldClass(ServletE.class);
assertTrue(introspector.isIntrospectable(new ServletE(), holder)); assertTrue(introspector.isIntrospectable(new ServletE(), holder));
//a JAVAX API sourced servlet can be introspected //a JAKARTA API sourced servlet can be introspected
holder = new ServletHolder(Source.JAVAX_API); holder = new ServletHolder(Source.JAKARTA_API);
holder.setHeldClass(ServletE.class); holder.setHeldClass(ServletE.class);
assertTrue(introspector.isIntrospectable(new ServletE(), holder)); assertTrue(introspector.isIntrospectable(new ServletE(), holder));

16
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
View File

@ -2141,7 +2141,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new filter //new filter
holder = handler.newFilterHolder(Source.JAVAX_API); holder = handler.newFilterHolder(Source.JAKARTA_API);
holder.setName(filterName); holder.setName(filterName);
holder.setHeldClass(filterClass); holder.setHeldClass(filterClass);
handler.addFilter(holder); handler.addFilter(holder);
@ -2170,7 +2170,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new filter //new filter
holder = handler.newFilterHolder(Source.JAVAX_API); holder = handler.newFilterHolder(Source.JAKARTA_API);
holder.setName(filterName); holder.setName(filterName);
holder.setClassName(className); holder.setClassName(className);
handler.addFilter(holder); handler.addFilter(holder);
@ -2199,7 +2199,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new filter //new filter
holder = handler.newFilterHolder(Source.JAVAX_API); holder = handler.newFilterHolder(Source.JAKARTA_API);
holder.setName(filterName); holder.setName(filterName);
holder.setFilter(filter); holder.setFilter(filter);
handler.addFilter(holder); handler.addFilter(holder);
@ -2229,7 +2229,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new servlet //new servlet
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setHeldClass(servletClass); holder.setHeldClass(servletClass);
handler.addServlet(holder); handler.addServlet(holder);
@ -2259,7 +2259,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new servlet //new servlet
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setClassName(className); holder.setClassName(className);
handler.addServlet(holder); handler.addServlet(holder);
@ -2288,7 +2288,7 @@ public class ServletContextHandler extends ContextHandler
ServletHolder holder = handler.getServlet(servletName); ServletHolder holder = handler.getServlet(servletName);
if (holder == null) if (holder == null)
{ {
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setServlet(servlet); holder.setServlet(servlet);
handler.addServlet(holder); handler.addServlet(holder);
@ -2315,7 +2315,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new servlet //new servlet
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setForcedPath(jspFile); holder.setForcedPath(jspFile);
handler.addServlet(holder); handler.addServlet(holder);
@ -2600,7 +2600,7 @@ public class ServletContextHandler extends ContextHandler
checkListener(t.getClass()); checkListener(t.getClass());
ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAVAX_API); ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAKARTA_API);
holder.setListener(t); holder.setListener(t);
addProgrammaticListener(t); addProgrammaticListener(t);
getServletHandler().addListener(holder); getServletHandler().addListener(holder);

8
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
View File

@ -1070,7 +1070,7 @@ public class ServletHandler extends Handler.Wrapper
if (_filterMappings.isEmpty()) if (_filterMappings.isEmpty())
{ {
_filterMappings.add(mapping); _filterMappings.add(mapping);
if (source == Source.JAVAX_API) if (source == Source.JAKARTA_API)
_matchAfterIndex = 0; _matchAfterIndex = 0;
} }
else else
@ -1078,7 +1078,7 @@ public class ServletHandler extends Handler.Wrapper
//there are existing entries. If this is a programmatic filtermapping, it is added at the end of the list. //there are existing entries. If this is a programmatic filtermapping, it is added at the end of the list.
//If this is a normal filtermapping, it is inserted after all the other filtermappings (matchBefores and normals), //If this is a normal filtermapping, it is inserted after all the other filtermappings (matchBefores and normals),
//but before the first matchAfter filtermapping. //but before the first matchAfter filtermapping.
if (Source.JAVAX_API == source) if (Source.JAKARTA_API == source)
{ {
_filterMappings.add(mapping); _filterMappings.add(mapping);
if (_matchAfterIndex < 0) if (_matchAfterIndex < 0)
@ -1116,12 +1116,12 @@ public class ServletHandler extends Handler.Wrapper
if (_filterMappings.isEmpty()) if (_filterMappings.isEmpty())
{ {
_filterMappings.add(mapping); _filterMappings.add(mapping);
if (Source.JAVAX_API == source) if (Source.JAKARTA_API == source)
_matchBeforeIndex = 0; _matchBeforeIndex = 0;
} }
else else
{ {
if (Source.JAVAX_API == source) if (Source.JAKARTA_API == source)
{ {
//programmatically defined filter mappings are prepended to mapping list in the order //programmatically defined filter mappings are prepended to mapping list in the order
//in which they were defined. In other words, insert this mapping at the tail of the //in which they were defined. In other words, insert this mapping at the tail of the

2
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java
View File

@ -943,7 +943,7 @@ public class ServletHolder extends Holder<Servlet> implements Comparable<Servlet
return clash; return clash;
//otherwise apply all of them //otherwise apply all of them
ServletMapping mapping = new ServletMapping(Source.JAVAX_API); ServletMapping mapping = new ServletMapping(Source.JAKARTA_API);
mapping.setServletName(ServletHolder.this.getName()); mapping.setServletName(ServletHolder.this.getName());
mapping.setPathSpecs(urlPatterns); mapping.setPathSpecs(urlPatterns);
getServletHandler().addServletMapping(mapping); getServletHandler().addServletMapping(mapping);

2
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/Source.java
View File

@ -23,7 +23,7 @@ import org.eclipse.jetty.util.resource.Resource;
public class Source public class Source
{ {
public static final Source EMBEDDED = new Source(Origin.EMBEDDED); public static final Source EMBEDDED = new Source(Origin.EMBEDDED);
public static final Source JAVAX_API = new Source(Origin.JAKARTA_API); public static final Source JAKARTA_API = new Source(Origin.JAKARTA_API);
public enum Origin public enum Origin
{ {

14
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletHandlerTest.java
View File

@ -55,13 +55,13 @@ public class ServletHandlerTest
FilterHolder fh2 = new FilterHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml")); FilterHolder fh2 = new FilterHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml"));
FilterMapping fm2 = new FilterMapping(); FilterMapping fm2 = new FilterMapping();
FilterHolder fh3 = new FilterHolder(Source.JAVAX_API); FilterHolder fh3 = new FilterHolder(Source.JAKARTA_API);
FilterMapping fm3 = new FilterMapping(); FilterMapping fm3 = new FilterMapping();
FilterHolder fh4 = new FilterHolder(Source.JAVAX_API); FilterHolder fh4 = new FilterHolder(Source.JAKARTA_API);
FilterMapping fm4 = new FilterMapping(); FilterMapping fm4 = new FilterMapping();
FilterHolder fh5 = new FilterHolder(Source.JAVAX_API); FilterHolder fh5 = new FilterHolder(Source.JAKARTA_API);
FilterMapping fm5 = new FilterMapping(); FilterMapping fm5 = new FilterMapping();
ServletHolder sh1 = new ServletHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml")); ServletHolder sh1 = new ServletHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml"));
@ -538,7 +538,7 @@ public class ServletHandlerTest
assertThat(mappings[4], is(fm3)); //isMatchAfter = true; assertThat(mappings[4], is(fm3)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=true //add a programmatic one, isMatchAfter=true
FilterHolder pf = new FilterHolder(Source.JAVAX_API); FilterHolder pf = new FilterHolder(Source.JAKARTA_API);
pf.setName("programmaticA"); pf.setName("programmaticA");
FilterMapping pfm = new FilterMapping(); FilterMapping pfm = new FilterMapping();
pfm.setFilterHolder(pf); pfm.setFilterHolder(pf);
@ -556,7 +556,7 @@ public class ServletHandlerTest
assertThat(mappings[5], is(pfm)); //isMatchAfter = true; assertThat(mappings[5], is(pfm)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=false //add a programmatic one, isMatchAfter=false
FilterHolder pf2 = new FilterHolder(Source.JAVAX_API); FilterHolder pf2 = new FilterHolder(Source.JAKARTA_API);
pf2.setName("programmaticB"); pf2.setName("programmaticB");
FilterMapping pfm2 = new FilterMapping(); FilterMapping pfm2 = new FilterMapping();
pfm2.setFilterHolder(pf2); pfm2.setFilterHolder(pf2);
@ -638,7 +638,7 @@ public class ServletHandlerTest
assertThat(mappings[4].getFilterHolder(), is(fh3)); //isMatchAfter = true; assertThat(mappings[4].getFilterHolder(), is(fh3)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=true //add a programmatic one, isMatchAfter=true
FilterHolder pf = new FilterHolder(Source.JAVAX_API); FilterHolder pf = new FilterHolder(Source.JAKARTA_API);
pf.setServletHandler(handler); pf.setServletHandler(handler);
pf.setName("programmaticA"); pf.setName("programmaticA");
handler.addFilter(pf); handler.addFilter(pf);
@ -655,7 +655,7 @@ public class ServletHandlerTest
assertThat(mappings[5].getFilterHolder(), is(pf)); //isMatchAfter = true; assertThat(mappings[5].getFilterHolder(), is(pf)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=false //add a programmatic one, isMatchAfter=false
FilterHolder pf2 = new FilterHolder(Source.JAVAX_API); FilterHolder pf2 = new FilterHolder(Source.JAKARTA_API);
pf2.setServletHandler(handler); pf2.setServletHandler(handler);
pf2.setName("programmaticB"); pf2.setName("programmaticB");
handler.addFilter(pf2); handler.addFilter(pf2);

2
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletHolderTest.java
View File

@ -43,7 +43,7 @@ public class ServletHolderTest
@Test @Test
public void testInitParams() throws Exception public void testInitParams() throws Exception
{ {
ServletHolder holder = new ServletHolder(Source.JAVAX_API); ServletHolder holder = new ServletHolder(Source.JAKARTA_API);
ServletRegistration reg = holder.getRegistration(); ServletRegistration reg = holder.getRegistration();
assertThrows(IllegalArgumentException.class, () -> reg.setInitParameter(null, "foo")); assertThrows(IllegalArgumentException.class, () -> reg.setInitParameter(null, "foo"));

6
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java
View File

@ -136,13 +136,13 @@ public class JakartaClientClassLoaderTest
{ {
WSServer.WebApp app = server.createWebApp(contextName); WSServer.WebApp app = server.createWebApp(contextName);
// Exclude the Javax WebSocket configuration from the webapp (so we use versions from the webapp). // Exclude the Jakarta WebSocket configuration from the webapp (so we use versions from the webapp).
Configuration[] configurations = Configurations.getKnown().stream() Configuration[] configurations = Configurations.getKnown().stream()
.filter(configuration -> !(configuration instanceof JakartaWebSocketConfiguration)) .filter(configuration -> !(configuration instanceof JakartaWebSocketConfiguration))
.toArray(Configuration[]::new); .toArray(Configuration[]::new);
app.getWebAppContext().setConfigurations(configurations); app.getWebAppContext().setConfigurations(configurations);
// Copy over the individual jars required for Javax WebSocket. // Copy over the individual jars required for Jakarta WebSocket.
app.createWebInf(); app.createWebInf();
app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar"); app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar");
app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar"); app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar");
@ -197,7 +197,7 @@ public class JakartaClientClassLoaderTest
app1.copyClass(EchoSocket.class); app1.copyClass(EchoSocket.class);
app1.deploy(); app1.deploy();
// Do not exclude JavaxWebSocketConfiguration for this webapp (we need the websocket server classes). // Do not exclude JakartaWebSocketConfiguration for this webapp (we need the websocket server classes).
WSServer.WebApp app2 = server.createWebApp("echo"); WSServer.WebApp app2 = server.createWebApp("echo");
app2.createWebInf(); app2.createWebInf();
app2.copyClass(EchoSocket.class); app2.copyClass(EchoSocket.class);

2
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java
View File

@ -161,7 +161,7 @@ public class JettyClientClassLoaderTest
{ {
WebAppTester.WebApp app = webAppTester.createWebApp(contextName); WebAppTester.WebApp app = webAppTester.createWebApp(contextName);
// Copy over the individual jars required for Javax WebSocket. // Copy over the individual jars required for Jetty WebSocket.
app.createWebInf(); app.createWebInf();
app.copyLib(Configurable.class, "jetty-websocket-jetty-api.jar"); app.copyLib(Configurable.class, "jetty-websocket-jetty-api.jar");
app.copyLib(WebSocketClient.class, "jetty-websocket-jetty-client.jar"); app.copyLib(WebSocketClient.class, "jetty-websocket-jetty-client.jar");

4
jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationIntrospector.java
View File

@ -51,8 +51,8 @@ public class TestAnnotationIntrospector
holder.setHeldClass(ServletE.class); holder.setHeldClass(ServletE.class);
assertTrue(introspector.isIntrospectable(new ServletE(), holder)); assertTrue(introspector.isIntrospectable(new ServletE(), holder));
//a JAVAX API sourced servlet can be introspected //a JAKARTA API sourced servlet can be introspected
holder = new ServletHolder(Source.JAVAX_API); holder = new ServletHolder(Source.JAKARTA_API);
holder.setHeldClass(ServletE.class); holder.setHeldClass(ServletE.class);
assertTrue(introspector.isIntrospectable(new ServletE(), holder)); assertTrue(introspector.isIntrospectable(new ServletE(), holder));

16
jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java
View File

@ -1050,7 +1050,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new filter //new filter
holder = handler.newFilterHolder(Source.JAVAX_API); holder = handler.newFilterHolder(Source.JAKARTA_API);
holder.setName(filterName); holder.setName(filterName);
holder.setHeldClass(filterClass); holder.setHeldClass(filterClass);
handler.addFilter(holder); handler.addFilter(holder);
@ -1079,7 +1079,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new filter //new filter
holder = handler.newFilterHolder(Source.JAVAX_API); holder = handler.newFilterHolder(Source.JAKARTA_API);
holder.setName(filterName); holder.setName(filterName);
holder.setClassName(className); holder.setClassName(className);
handler.addFilter(holder); handler.addFilter(holder);
@ -1108,7 +1108,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new filter //new filter
holder = handler.newFilterHolder(Source.JAVAX_API); holder = handler.newFilterHolder(Source.JAKARTA_API);
holder.setName(filterName); holder.setName(filterName);
holder.setFilter(filter); holder.setFilter(filter);
handler.addFilter(holder); handler.addFilter(holder);
@ -1138,7 +1138,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new servlet //new servlet
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setHeldClass(servletClass); holder.setHeldClass(servletClass);
handler.addServlet(holder); handler.addServlet(holder);
@ -1168,7 +1168,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new servlet //new servlet
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setClassName(className); holder.setClassName(className);
handler.addServlet(holder); handler.addServlet(holder);
@ -1197,7 +1197,7 @@ public class ServletContextHandler extends ContextHandler
ServletHolder holder = handler.getServlet(servletName); ServletHolder holder = handler.getServlet(servletName);
if (holder == null) if (holder == null)
{ {
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setServlet(servlet); holder.setServlet(servlet);
handler.addServlet(holder); handler.addServlet(holder);
@ -1224,7 +1224,7 @@ public class ServletContextHandler extends ContextHandler
if (holder == null) if (holder == null)
{ {
//new servlet //new servlet
holder = handler.newServletHolder(Source.JAVAX_API); holder = handler.newServletHolder(Source.JAKARTA_API);
holder.setName(servletName); holder.setName(servletName);
holder.setForcedPath(jspFile); holder.setForcedPath(jspFile);
handler.addServlet(holder); handler.addServlet(holder);
@ -1488,7 +1488,7 @@ public class ServletContextHandler extends ContextHandler
checkListener(t.getClass()); checkListener(t.getClass());
ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAVAX_API); ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAKARTA_API);
holder.setListener(t); holder.setListener(t);
addProgrammaticListener(t); addProgrammaticListener(t);
getServletHandler().addListener(holder); getServletHandler().addListener(holder);

8
jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java
View File

@ -1147,7 +1147,7 @@ public class ServletHandler extends ScopedHandler
if (_filterMappings.isEmpty()) if (_filterMappings.isEmpty())
{ {
_filterMappings.add(mapping); _filterMappings.add(mapping);
if (source == Source.JAVAX_API) if (source == Source.JAKARTA_API)
_matchAfterIndex = 0; _matchAfterIndex = 0;
} }
else else
@ -1155,7 +1155,7 @@ public class ServletHandler extends ScopedHandler
//there are existing entries. If this is a programmatic filtermapping, it is added at the end of the list. //there are existing entries. If this is a programmatic filtermapping, it is added at the end of the list.
//If this is a normal filtermapping, it is inserted after all the other filtermappings (matchBefores and normals), //If this is a normal filtermapping, it is inserted after all the other filtermappings (matchBefores and normals),
//but before the first matchAfter filtermapping. //but before the first matchAfter filtermapping.
if (Source.JAVAX_API == source) if (Source.JAKARTA_API == source)
{ {
_filterMappings.add(mapping); _filterMappings.add(mapping);
if (_matchAfterIndex < 0) if (_matchAfterIndex < 0)
@ -1193,12 +1193,12 @@ public class ServletHandler extends ScopedHandler
if (_filterMappings.isEmpty()) if (_filterMappings.isEmpty())
{ {
_filterMappings.add(mapping); _filterMappings.add(mapping);
if (Source.JAVAX_API == source) if (Source.JAKARTA_API == source)
_matchBeforeIndex = 0; _matchBeforeIndex = 0;
} }
else else
{ {
if (Source.JAVAX_API == source) if (Source.JAKARTA_API == source)
{ {
//programmatically defined filter mappings are prepended to mapping list in the order //programmatically defined filter mappings are prepended to mapping list in the order
//in which they were defined. In other words, insert this mapping at the tail of the //in which they were defined. In other words, insert this mapping at the tail of the

2
jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHolder.java
View File

@ -972,7 +972,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentityScope,
return clash; return clash;
//otherwise apply all of them //otherwise apply all of them
ServletMapping mapping = new ServletMapping(Source.JAVAX_API); ServletMapping mapping = new ServletMapping(Source.JAKARTA_API);
mapping.setServletName(ServletHolder.this.getName()); mapping.setServletName(ServletHolder.this.getName());
mapping.setPathSpecs(urlPatterns); mapping.setPathSpecs(urlPatterns);
getServletHandler().addServletMapping(mapping); getServletHandler().addServletMapping(mapping);

2
jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/Source.java
View File

@ -25,7 +25,7 @@ import org.eclipse.jetty.util.resource.Resource;
public class Source public class Source
{ {
public static final Source EMBEDDED = new Source(Origin.EMBEDDED); public static final Source EMBEDDED = new Source(Origin.EMBEDDED);
public static final Source JAVAX_API = new Source(Origin.JAKARTA_API); public static final Source JAKARTA_API = new Source(Origin.JAKARTA_API);
public enum Origin public enum Origin
{ {

14
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHandlerTest.java
View File

@ -55,13 +55,13 @@ public class ServletHandlerTest
FilterHolder fh2 = new FilterHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml")); FilterHolder fh2 = new FilterHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml"));
FilterMapping fm2 = new FilterMapping(); FilterMapping fm2 = new FilterMapping();
FilterHolder fh3 = new FilterHolder(Source.JAVAX_API); FilterHolder fh3 = new FilterHolder(Source.JAKARTA_API);
FilterMapping fm3 = new FilterMapping(); FilterMapping fm3 = new FilterMapping();
FilterHolder fh4 = new FilterHolder(Source.JAVAX_API); FilterHolder fh4 = new FilterHolder(Source.JAKARTA_API);
FilterMapping fm4 = new FilterMapping(); FilterMapping fm4 = new FilterMapping();
FilterHolder fh5 = new FilterHolder(Source.JAVAX_API); FilterHolder fh5 = new FilterHolder(Source.JAKARTA_API);
FilterMapping fm5 = new FilterMapping(); FilterMapping fm5 = new FilterMapping();
ServletHolder sh1 = new ServletHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml")); ServletHolder sh1 = new ServletHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml"));
@ -538,7 +538,7 @@ public class ServletHandlerTest
assertThat(mappings[4], is(fm3)); //isMatchAfter = true; assertThat(mappings[4], is(fm3)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=true //add a programmatic one, isMatchAfter=true
FilterHolder pf = new FilterHolder(Source.JAVAX_API); FilterHolder pf = new FilterHolder(Source.JAKARTA_API);
pf.setName("programmaticA"); pf.setName("programmaticA");
FilterMapping pfm = new FilterMapping(); FilterMapping pfm = new FilterMapping();
pfm.setFilterHolder(pf); pfm.setFilterHolder(pf);
@ -556,7 +556,7 @@ public class ServletHandlerTest
assertThat(mappings[5], is(pfm)); //isMatchAfter = true; assertThat(mappings[5], is(pfm)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=false //add a programmatic one, isMatchAfter=false
FilterHolder pf2 = new FilterHolder(Source.JAVAX_API); FilterHolder pf2 = new FilterHolder(Source.JAKARTA_API);
pf2.setName("programmaticB"); pf2.setName("programmaticB");
FilterMapping pfm2 = new FilterMapping(); FilterMapping pfm2 = new FilterMapping();
pfm2.setFilterHolder(pf2); pfm2.setFilterHolder(pf2);
@ -638,7 +638,7 @@ public class ServletHandlerTest
assertThat(mappings[4].getFilterHolder(), is(fh3)); //isMatchAfter = true; assertThat(mappings[4].getFilterHolder(), is(fh3)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=true //add a programmatic one, isMatchAfter=true
FilterHolder pf = new FilterHolder(Source.JAVAX_API); FilterHolder pf = new FilterHolder(Source.JAKARTA_API);
pf.setServletHandler(handler); pf.setServletHandler(handler);
pf.setName("programmaticA"); pf.setName("programmaticA");
handler.addFilter(pf); handler.addFilter(pf);
@ -655,7 +655,7 @@ public class ServletHandlerTest
assertThat(mappings[5].getFilterHolder(), is(pf)); //isMatchAfter = true; assertThat(mappings[5].getFilterHolder(), is(pf)); //isMatchAfter = true;
//add a programmatic one, isMatchAfter=false //add a programmatic one, isMatchAfter=false
FilterHolder pf2 = new FilterHolder(Source.JAVAX_API); FilterHolder pf2 = new FilterHolder(Source.JAKARTA_API);
pf2.setServletHandler(handler); pf2.setServletHandler(handler);
pf2.setName("programmaticB"); pf2.setName("programmaticB");
handler.addFilter(pf2); handler.addFilter(pf2);

2
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHolderTest.java
View File

@ -44,7 +44,7 @@ public class ServletHolderTest
@Test @Test
public void testInitParams() throws Exception public void testInitParams() throws Exception
{ {
ServletHolder holder = new ServletHolder(Source.JAVAX_API); ServletHolder holder = new ServletHolder(Source.JAKARTA_API);
ServletRegistration reg = holder.getRegistration(); ServletRegistration reg = holder.getRegistration();
assertThrows(IllegalArgumentException.class, () -> reg.setInitParameter(null, "foo")); assertThrows(IllegalArgumentException.class, () -> reg.setInitParameter(null, "foo"));

6
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java
View File

@ -136,13 +136,13 @@ public class JakartaClientClassLoaderTest
{ {
WSServer.WebApp app = server.createWebApp(contextName); WSServer.WebApp app = server.createWebApp(contextName);
// Exclude the Javax WebSocket configuration from the webapp (so we use versions from the webapp). // Exclude the Jakarta WebSocket configuration from the webapp (so we use versions from the webapp).
Configuration[] configurations = Configurations.getKnown().stream() Configuration[] configurations = Configurations.getKnown().stream()
.filter(configuration -> !(configuration instanceof JakartaWebSocketConfiguration)) .filter(configuration -> !(configuration instanceof JakartaWebSocketConfiguration))
.toArray(Configuration[]::new); .toArray(Configuration[]::new);
app.getWebAppContext().setConfigurations(configurations); app.getWebAppContext().setConfigurations(configurations);
// Copy over the individual jars required for Javax WebSocket. // Copy over the individual jars required for Jakarta WebSocket.
app.createWebInf(); app.createWebInf();
app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar"); app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar");
app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar"); app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar");
@ -197,7 +197,7 @@ public class JakartaClientClassLoaderTest
app1.copyClass(EchoSocket.class); app1.copyClass(EchoSocket.class);
app1.deploy(); app1.deploy();
// Do not exclude JavaxWebSocketConfiguration for this webapp (we need the websocket server classes). // Do not exclude JakartaWebSocketConfiguration for this webapp (we need the websocket server classes).
WSServer.WebApp app2 = server.createWebApp("echo"); WSServer.WebApp app2 = server.createWebApp("echo");
app2.createWebInf(); app2.createWebInf();
app2.copyClass(EchoSocket.class); app2.copyClass(EchoSocket.class);

2
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java
View File

@ -160,7 +160,7 @@ public class JettyClientClassLoaderTest
{ {
WebAppTester.WebApp app = webAppTester.createWebApp(contextName); WebAppTester.WebApp app = webAppTester.createWebApp(contextName);
// Copy over the individual jars required for Javax WebSocket. // Copy over the individual jars required for Jetty WebSocket.
app.createWebInf(); app.createWebInf();
app.copyLib(WebSocketPolicy.class, "jetty-ee9-websocket-jetty-api.jar"); app.copyLib(WebSocketPolicy.class, "jetty-ee9-websocket-jetty-api.jar");
app.copyLib(WebSocketClient.class, "jetty-ee9-websocket-jetty-client.jar"); app.copyLib(WebSocketClient.class, "jetty-ee9-websocket-jetty-client.jar");