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

Xbootclasspath removed from templates #25175

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Xbootclasspath removed from templates #25175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da669ff
Xbootclasspath removed from templates
dmatej Oct 6, 2024
1bbcbaa
The grizzly-npn-api doesn't need to be on boot classpath any more
dmatej Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion appserver/admin/template/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@
<!-- For ORB compatibility with JDK11+ JDKs see https://github.com/eclipse-ee4j/orb-gmbal/issues/22 -->
<jvm-options>-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true</jvm-options>

<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
<jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
Expand Down
2 changes: 0 additions & 2 deletions appserver/distributions/glassfish/src/main/assembly/glassfish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@
<fileMode>640</fileMode>
<includes>
<include>glassfish-jul-extension.jar</include>
<include>grizzly-npn-api.jar</include>
</includes>
<outputDirectory>${install.dir.name}/glassfish/lib/bootstrap</outputDirectory>
</fileSet>
Expand Down Expand Up @@ -379,7 +378,6 @@
<exclude>nucleus-domain.jar</exclude>
<exclude>appserver-domain.jar</exclude>
<exclude>glassfish-jul-extension.jar</exclude>
<exclude>grizzly-npn-api.jar</exclude>
<exclude>cli-optional.jar</exclude>
<exclude>appserver-cli.jar</exclude>
<exclude>cluster-cli.jar</exclude>
Expand Down
2 changes: 0 additions & 2 deletions appserver/distributions/web/src/main/assembly/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@
<fileMode>640</fileMode>
<includes>
<include>glassfish-jul-extension.jar</include>
<include>grizzly-npn-api.jar</include>
</includes>
<outputDirectory>${install.dir.name}/glassfish/lib/bootstrap</outputDirectory>
</fileSet>
Expand Down Expand Up @@ -253,7 +252,6 @@
<exclude>nucleus-domain.jar</exclude>
<exclude>appserver-domain.jar</exclude>
<exclude>glassfish-jul-extension.jar</exclude>
<exclude>grizzly-npn-api.jar</exclude>
<exclude>cli-optional.jar</exclude>
<exclude>appserver-cli.jar</exclude>
<exclude>cluster-cli.jar</exclude>
Expand Down
12 changes: 0 additions & 12 deletions appserver/extras/embedded/all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,18 +588,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-osgi</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>

<!-- additional grizzly modules package which includes websockets -->
<dependency>
Expand Down
12 changes: 0 additions & 12 deletions appserver/extras/embedded/nucleus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-osgi</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<!-- glassfish-nucleus -->
<dependency>
<groupId>org.glassfish.main.admin</groupId>
Expand Down
15 changes: 2 additions & 13 deletions appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
<path.derby>../../../javadb/lib</path.derby>
<classpath.derby>${path.derby}/derby.jar ${path.derby}/derbyclient.jar ${path.derby}/derbynet.jar ${path.derby}/derbytools.jar ${path.derby}/derbyrun.jar</classpath.derby>
<path.bootstrap>../bootstrap</path.bootstrap>
<classpath.bootstrap>${path.bootstrap}/grizzly-npn-api.jar ${path.bootstrap}/glassfish-jul-extension.jar</classpath.bootstrap> </properties>
<classpath.bootstrap>${path.bootstrap}/glassfish-jul-extension.jar</classpath.bootstrap>
</properties>

<dependencies>
<dependency>
Expand Down Expand Up @@ -475,18 +476,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-osgi</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<!-- glassfish-jca -->
<dependency>
<groupId>org.glassfish.main.connectors</groupId>
Expand Down
12 changes: 0 additions & 12 deletions appserver/extras/embedded/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-osgi</artifactId>
<version>${grizzly.npn.version}</version>
<optional>true</optional>
</dependency>
<!-- additional grizzly modules package which includes websockets -->
<dependency>
<groupId>org.glassfish.main.grizzly</groupId>
Expand Down
4 changes: 4 additions & 0 deletions appserver/featuresets/debug/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
Expand Down
1 change: 0 additions & 1 deletion nucleus/admin/template/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@
<!-- For ORB compatibility with JDK11+ JDKs see https://github.com/eclipse-ee4j/orb-gmbal/issues/22 -->
<jvm-options>-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true</jvm-options>

<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
<jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/java/com/sun/enterprise/glassfish/bootstrap/cp/GlassfishBootstrapClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ private static URL[] createUrls(final File glassfishDir) throws IOException {
final List<URL> 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()]);
}

Expand Down
2 changes: 0 additions & 2 deletions nucleus/distributions/atomic/src/main/assembly/atomic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
<directory>${temp.dir}</directory>
<includes>
<include>glassfish-jul-extension.jar</include>
<include>grizzly-npn-api.jar</include>
</includes>
<outputDirectory>${install.dir.name}/lib/bootstrap</outputDirectory>
</fileSet>
Expand Down Expand Up @@ -142,7 +141,6 @@
<exclude>felix.jar</exclude>
<exclude>nucleus-domain.jar</exclude>
<exclude>glassfish-jul-extension.jar</exclude>
<exclude>grizzly-npn-api.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}/modules</outputDirectory>
</fileSet>
Expand Down
2 changes: 0 additions & 2 deletions nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<directory>${temp.dir}</directory>
<includes>
<include>glassfish-jul-extension.jar</include>
<include>grizzly-npn-api.jar</include>
</includes>
<outputDirectory>${install.dir.name}/lib/bootstrap</outputDirectory>
</fileSet>
Expand Down Expand Up @@ -145,7 +144,6 @@
<exclude>org.osgi.util.function.jar</exclude>
<exclude>org.osgi.util.promise.jar</exclude>
<exclude>glassfish-jul-extension.jar</exclude>
<exclude>grizzly-npn-api.jar</exclude>
<exclude>felix.jar</exclude>
<exclude>nucleus-domain.jar</exclude>
<exclude>cluster-cli.jar</exclude>
Expand Down
22 changes: 0 additions & 22 deletions nucleus/featuresets/atomic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,28 +419,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.npn.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-osgi</artifactId>
<version>${grizzly.npn.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- nucleus -->
<dependency>
Expand Down
19 changes: 13 additions & 6 deletions nucleus/grizzly/config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@

<name>grizzly-config</name>

<properties>
<test.logManager>org.glassfish.main.jul.GlassFishLogManager</test.logManager>
</properties>

<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
Expand All @@ -54,6 +58,10 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-portunif</artifactId>
Expand All @@ -74,12 +82,6 @@
<artifactId>grizzly-websockets</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.npn.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand All @@ -93,6 +95,11 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-jul-extension</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
19 changes: 8 additions & 11 deletions nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/GrizzlyConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand All @@ -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());
Expand Down
5 changes: 1 addition & 4 deletions nucleus/grizzly/config/src/test/java/org/glassfish/grizzly/config/PUGrizzlyConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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("<html><body>You've found the server on port 38082</body></html>", httpContent2);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage());
} finally {
if (grizzlyConfig != null) {
grizzlyConfig.shutdownNetwork();
Expand Down
5 changes: 5 additions & 0 deletions nucleus/grizzly/nucleus-grizzly-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
</dependency>
<!-- To provide AlpnServerNegotiator interface for grizzly-http2 -->
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions nucleus/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<!-- To provide AlpnServerNegotiator interface for grizzly-http2 -->
<version>${grizzly.npn.version}</version>
</dependency>

<!-- GlassFish Management API -->
<dependency>
Expand Down