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

QACI-406 Websockets tck failure fix: Grizzly #24

Merged
merged 10 commits into from
Sep 23, 2020
Merged

QACI-406 Websockets tck failure fix: Grizzly #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d48b862
QACI-406 Possibility to run tests with different JSSE implementations
dmatej Sep 2, 2020
8a0ae64
QACI-406 Logging in tests
dmatej Sep 2, 2020
cdbf50f
QACI-406 Fixed dependency artifactId
dmatej Sep 2, 2020
d8f7915
QACI-406 Fixed Tyrus dependency on HandshakeListener interface
dmatej Sep 4, 2020
dbc3f1a
QACI-406 Fixed TrailersTest - missing lock
dmatej Sep 4, 2020
09c8e3e
QACI-406 Better compatibility detection
dmatej Sep 6, 2020
255b55a
QACI-406 Removed incorrect FIXME
dmatej Sep 7, 2020
5c371fb
QACI-406 Better logging, reliable locking, variable names, but ...
dmatej Sep 22, 2020
bb55a72
QACI-406 Released grizzly 2.4.4.payara-p4
dmatej Sep 7, 2020
3a956e5
Remove SNAPSHOT BOM dependency
MattGill98 Sep 23, 2020
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
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<artifactId>grizzly-bom</artifactId>
<packaging>pom</packaging>
<name>grizzly-bom</name>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>

<description>Grizzly Bill of Materials (BOM)</description>

Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/grizzly-httpservice-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>Grizzly OSGi HttpService Bundle</name>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice-bundle</artifactId>
<build>
Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-extra-bundles</artifactId>
<packaging>pom</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-extra-bundles</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions extras/connection-pool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connection-pool</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>connection-pool</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/grizzly-httpservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>Grizzly OSGi HttpService</name>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice</artifactId>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-jaxws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-jaxws</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-http-server-jaxws</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-multipart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-multipart</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-http-server-multipart</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-servlet-extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet-extras</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-http-servlet-extras</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-extras</artifactId>
<packaging>pom</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-extras</name>
<profiles>
<profile>
Expand Down
4 changes: 2 additions & 2 deletions extras/tls-sni/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tls-sni</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>tls-sni</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-comet-server</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-comet-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-core</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-core</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-all</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-all</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet-server</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-http-servlet-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
6 changes: 3 additions & 3 deletions modules/bundles/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-core</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-http-server-core</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down Expand Up @@ -171,7 +171,7 @@
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-npn-api</artifactId>
<version>${grizzly.alpn.version}</version>
<version>${grizzly.npn.api.version}</version>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the start I wasn't sure which property is for which dependency.

</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-bundles</artifactId>
<packaging>pom</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-bundles</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/websockets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-websockets-server</artifactId>
<packaging>jar</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-websockets-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-comet</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-comet</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/grizzly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-framework</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p4-SNAPSHOT</version>
<version>2.4.4.payara-p4</version>
<name>grizzly-framework</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/grizzly/src/main/java/org/glassfish/grizzly/filterchain/DefaultFilterChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,14 @@ protected NextAction executeFilter(final FilterExecutor executor,
NextAction nextNextAction;
do {
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.log(Level.FINE, "Execute filter. filter={0} context={1}",
LOGGER.log(Level.FINE, "before filter execution. filter={0} context={1}",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Symmetric logging is easier to find/grep and to understand

new Object[]{currentFilter, ctx});
}
// execute the task
nextNextAction = executor.execute(currentFilter, ctx);

if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.log(Level.FINE, "after execute filter. filter={0} context={1} nextAction={2}",
LOGGER.log(Level.FINE, "after filter execution. filter={0} context={1} nextAction={2}",
new Object[]{currentFilter, ctx, nextNextAction});
}
} while (nextNextAction.type() == RerunFilterAction.TYPE);
Expand Down
12 changes: 0 additions & 12 deletions modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/HandshakeListener.java
View file
Open in desktop

This file was deleted.

Loading