diff --git a/appserver/admin/template/src/main/resources/config/domain.xml b/appserver/admin/template/src/main/resources/config/domain.xml index 0532fb18668..b29c5e4500e 100644 --- a/appserver/admin/template/src/main/resources/config/domain.xml +++ b/appserver/admin/template/src/main/resources/config/domain.xml @@ -405,7 +405,6 @@ -Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true - -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED diff --git a/appserver/distributions/glassfish/src/main/assembly/glassfish.xml b/appserver/distributions/glassfish/src/main/assembly/glassfish.xml index 80a3626a3e6..743a0f2ae89 100644 --- a/appserver/distributions/glassfish/src/main/assembly/glassfish.xml +++ b/appserver/distributions/glassfish/src/main/assembly/glassfish.xml @@ -327,7 +327,6 @@ 640 glassfish-jul-extension.jar - grizzly-npn-api.jar ${install.dir.name}/glassfish/lib/bootstrap @@ -379,7 +378,6 @@ nucleus-domain.jar appserver-domain.jar glassfish-jul-extension.jar - grizzly-npn-api.jar cli-optional.jar appserver-cli.jar cluster-cli.jar diff --git a/appserver/distributions/web/src/main/assembly/web.xml b/appserver/distributions/web/src/main/assembly/web.xml index f9ac29a0acd..f89863ccecb 100644 --- a/appserver/distributions/web/src/main/assembly/web.xml +++ b/appserver/distributions/web/src/main/assembly/web.xml @@ -201,7 +201,6 @@ 640 glassfish-jul-extension.jar - grizzly-npn-api.jar ${install.dir.name}/glassfish/lib/bootstrap @@ -253,7 +252,6 @@ nucleus-domain.jar appserver-domain.jar glassfish-jul-extension.jar - grizzly-npn-api.jar cli-optional.jar appserver-cli.jar cluster-cli.jar diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index 3c5977e0933..b7eff9c156d 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -588,18 +588,6 @@ ${project.version} true - - org.glassfish.grizzly - grizzly-npn-api - ${grizzly.npn.version} - true - - - org.glassfish.grizzly - grizzly-npn-osgi - ${grizzly.npn.version} - true - diff --git a/appserver/extras/embedded/nucleus/pom.xml b/appserver/extras/embedded/nucleus/pom.xml index f0ed222188e..58df62e8528 100644 --- a/appserver/extras/embedded/nucleus/pom.xml +++ b/appserver/extras/embedded/nucleus/pom.xml @@ -147,18 +147,6 @@ ${project.version} true - - org.glassfish.grizzly - grizzly-npn-api - ${grizzly.npn.version} - true - - - org.glassfish.grizzly - grizzly-npn-osgi - ${grizzly.npn.version} - true - org.glassfish.main.admin diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml index 52a3d96bff4..df68bca5119 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml @@ -36,7 +36,8 @@ ../../../javadb/lib ${path.derby}/derby.jar ${path.derby}/derbyclient.jar ${path.derby}/derbynet.jar ${path.derby}/derbytools.jar ${path.derby}/derbyrun.jar ../bootstrap - ${path.bootstrap}/grizzly-npn-api.jar ${path.bootstrap}/glassfish-jul-extension.jar + ${path.bootstrap}/glassfish-jul-extension.jar + @@ -475,18 +476,6 @@ ${project.version} true - - org.glassfish.grizzly - grizzly-npn-api - ${grizzly.npn.version} - true - - - org.glassfish.grizzly - grizzly-npn-osgi - ${grizzly.npn.version} - true - org.glassfish.main.connectors diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml index 799d6ed335a..5acdbe4104f 100644 --- a/appserver/extras/embedded/web/pom.xml +++ b/appserver/extras/embedded/web/pom.xml @@ -157,18 +157,6 @@ ${project.version} true - - org.glassfish.grizzly - grizzly-npn-api - ${grizzly.npn.version} - true - - - org.glassfish.grizzly - grizzly-npn-osgi - ${grizzly.npn.version} - true - org.glassfish.main.grizzly diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml index 54c3f7a541e..0e84f452c73 100644 --- a/appserver/featuresets/debug/pom.xml +++ b/appserver/featuresets/debug/pom.xml @@ -88,6 +88,10 @@ org.glassfish.grizzly grizzly-http2 + + org.glassfish.grizzly + grizzly-npn-api + org.glassfish.grizzly grizzly-http-server diff --git a/nucleus/admin/template/src/main/resources/config/domain.xml b/nucleus/admin/template/src/main/resources/config/domain.xml index 00e97ed0c43..7383a811599 100644 --- a/nucleus/admin/template/src/main/resources/config/domain.xml +++ b/nucleus/admin/template/src/main/resources/config/domain.xml @@ -328,7 +328,6 @@ -Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true - -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/cp/GlassfishBootstrapClassLoader.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/cp/GlassfishBootstrapClassLoader.java index f2c9c481c8a..480594306f9 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/cp/GlassfishBootstrapClassLoader.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/cp/GlassfishBootstrapClassLoader.java @@ -72,7 +72,6 @@ private static URL[] createUrls(final File glassfishDir) throws IOException { final List urls = new ArrayList<>(); final File libDir = glassfishDir.toPath().resolve(Paths.get("lib", "bootstrap")).toFile(); urls.add(getURL(libDir, "glassfish-jul-extension")); - urls.add(getURL(libDir, "grizzly-npn-api")); return urls.toArray(new URL[urls.size()]); } diff --git a/nucleus/distributions/atomic/src/main/assembly/atomic.xml b/nucleus/distributions/atomic/src/main/assembly/atomic.xml index cf937af3d9f..54e0c73b433 100644 --- a/nucleus/distributions/atomic/src/main/assembly/atomic.xml +++ b/nucleus/distributions/atomic/src/main/assembly/atomic.xml @@ -75,7 +75,6 @@ ${temp.dir} glassfish-jul-extension.jar - grizzly-npn-api.jar ${install.dir.name}/lib/bootstrap @@ -142,7 +141,6 @@ felix.jar nucleus-domain.jar glassfish-jul-extension.jar - grizzly-npn-api.jar ${install.dir.name}/modules diff --git a/nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml b/nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml index a443a6e19fa..6dfda6eb9bb 100644 --- a/nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml +++ b/nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml @@ -100,7 +100,6 @@ ${temp.dir} glassfish-jul-extension.jar - grizzly-npn-api.jar ${install.dir.name}/lib/bootstrap @@ -145,7 +144,6 @@ org.osgi.util.function.jar org.osgi.util.promise.jar glassfish-jul-extension.jar - grizzly-npn-api.jar felix.jar nucleus-domain.jar cluster-cli.jar diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml index 23dc411f7ac..0ebde45c323 100644 --- a/nucleus/featuresets/atomic/pom.xml +++ b/nucleus/featuresets/atomic/pom.xml @@ -419,28 +419,6 @@ - - org.glassfish.grizzly - grizzly-npn-api - ${grizzly.npn.version} - - - * - * - - - - - org.glassfish.grizzly - grizzly-npn-osgi - ${grizzly.npn.version} - - - * - * - - - diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml index 28be256fe07..cf737dc9b6e 100644 --- a/nucleus/grizzly/config/pom.xml +++ b/nucleus/grizzly/config/pom.xml @@ -31,6 +31,10 @@ grizzly-config + + org.glassfish.main.jul.GlassFishLogManager + + org.glassfish.hk2 @@ -54,6 +58,10 @@ org.glassfish.grizzly grizzly-http2 + + org.glassfish.grizzly + grizzly-npn-api + org.glassfish.grizzly grizzly-portunif @@ -74,12 +82,6 @@ grizzly-websockets test - - org.glassfish.grizzly - grizzly-npn-api - ${grizzly.npn.version} - test - jakarta.servlet jakarta.servlet-api @@ -93,6 +95,11 @@ org.hamcrest hamcrest + + org.glassfish.main + glassfish-jul-extension + test + diff --git a/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java b/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java index 7492f824e9d..c7c1659af6e 100644 --- a/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java +++ b/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java @@ -1,6 +1,6 @@ /* + * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2021 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -134,7 +134,7 @@ public void testDefaultBufferConfiguration() throws Exception { assertEquals("heap", bufferType); GenericGrizzlyListener genericGrizzlyListener = (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-1"); - MemoryManager mm = genericGrizzlyListener.getTransport().getMemoryManager(); + MemoryManager mm = genericGrizzlyListener.getTransport().getMemoryManager(); assertEquals(HeapMemoryManager.class.getName(), mm.getClass().getName()); } finally { if (grizzlyConfig != null) { @@ -175,7 +175,7 @@ public void testDirectBufferConfiguration() throws Exception { assertEquals("direct", bufferType); GenericGrizzlyListener genericGrizzlyListener = (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-1"); - MemoryManager mm = genericGrizzlyListener.getTransport().getMemoryManager(); + MemoryManager mm = genericGrizzlyListener.getTransport().getMemoryManager(); assertEquals(ByteBufferManager.class.getName(), mm.getClass().getName()); assertTrue(((ByteBufferManager) mm).isDirect()); } finally { @@ -193,27 +193,24 @@ public void testSocketBufferConfiguration() throws Exception { configure(); grizzlyConfig = new GrizzlyConfig("grizzly-config-socket.xml"); grizzlyConfig.setupNetwork(); - GenericGrizzlyListener genericGrizzlyListener = - (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-1"); + GenericGrizzlyListener genericGrizzlyListener = (GenericGrizzlyListener) getListener(grizzlyConfig, + "http-listener-1"); Transport t = genericGrizzlyListener.getTransport(); assertEquals(-1, t.getReadBufferSize()); assertEquals(-1, t.getWriteBufferSize()); - genericGrizzlyListener = - (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-2"); + genericGrizzlyListener = (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-2"); t = genericGrizzlyListener.getTransport(); assertEquals(8192, t.getReadBufferSize()); assertEquals(-1, t.getWriteBufferSize()); - genericGrizzlyListener = - (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-3"); + genericGrizzlyListener = (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-3"); t = genericGrizzlyListener.getTransport(); assertEquals(-1, t.getReadBufferSize()); assertEquals(8000, t.getWriteBufferSize()); - genericGrizzlyListener = - (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-4"); + genericGrizzlyListener = (GenericGrizzlyListener) getListener(grizzlyConfig, "http-listener-4"); t = genericGrizzlyListener.getTransport(); assertEquals(6000, t.getReadBufferSize()); assertEquals(5000, t.getWriteBufferSize()); diff --git a/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/PUGrizzlyConfigTest.java b/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/PUGrizzlyConfigTest.java index 8d93316ae74..583544614e6 100644 --- a/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/PUGrizzlyConfigTest.java +++ b/nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/PUGrizzlyConfigTest.java @@ -66,7 +66,7 @@ public void puConfig() throws Exception { } @Test - public void puHttpHttpsSamePortConfig() throws IOException, InstantiationException { + public void puHttpHttpsSamePortConfig() throws Exception { GrizzlyConfig grizzlyConfig = null; try { grizzlyConfig = new GrizzlyConfig("grizzly-config-pu-http-https-same-port.xml"); @@ -80,9 +80,6 @@ public void puHttpHttpsSamePortConfig() throws IOException, InstantiationExcepti HttpsURLConnection.setDefaultSSLSocketFactory(helper.getSSLSocketFactory()); final String httpContent2 = helper.getContent(new URL("https://localhost:38082").openConnection()); assertEquals("You've found the server on port 38082", httpContent2); - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e.getMessage()); } finally { if (grizzlyConfig != null) { grizzlyConfig.shutdownNetwork(); diff --git a/nucleus/grizzly/nucleus-grizzly-all/pom.xml b/nucleus/grizzly/nucleus-grizzly-all/pom.xml index 6b83677086f..39744e951df 100644 --- a/nucleus/grizzly/nucleus-grizzly-all/pom.xml +++ b/nucleus/grizzly/nucleus-grizzly-all/pom.xml @@ -61,6 +61,11 @@ org.glassfish.grizzly grizzly-http2 + + + org.glassfish.grizzly + grizzly-npn-api + org.glassfish.grizzly grizzly-http-server diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index faf623f6f25..41b40ffc711 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -401,6 +401,12 @@ pom import + + org.glassfish.grizzly + grizzly-npn-api + + ${grizzly.npn.version} +